commit 791d82b9e35ac587f6315c6af17b1a983dbcd8a3
Author: gyq <875626088@qq.com>
Date:   Fri Apr 25 09:49:53 2025 +0800

    源文件

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e31c20b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+.DS_Store
+.hbuilderx
+*.log
+unpackage
+sitemap.json
+.prettierrc.cjs
+pages/diy/init_data.js
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..7a73a41
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,2 @@
+{
+}
\ No newline at end of file
diff --git a/App.vue b/App.vue
new file mode 100644
index 0000000..714e2ea
--- /dev/null
+++ b/App.vue
@@ -0,0 +1,3160 @@
+<script>
+    import base64 from './common/js/lib/base64.js';
+    // 多语言引入并初始化
+    import i18n from './locale/index';
+    export default {
+        globalData: {
+            data: {
+                // 基础配置
+                // 数据接口请求地址
+                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: 'ShopXO Desc',
+
+                // 默认logo、如 /static/images/common/logo.png
+                application_logo: '',
+
+                // 版本号、如: v1.0.0
+                version: 'v6.5',
+
+                // app版本信息、如: v1.0.0 20180118
+                app_version_info: 'v6.5 20250305',
+
+                // 货币价格符号
+                currency_symbol: '￥',
+
+                // 默认主题        主题颜色
+                // 红色 red       #ff0036
+                // 黄色 yellow    #f6c133
+                // 黑色 black     #333333
+                // 绿色 green     #20a53a
+                // 橙色 orange    #fe6f04
+                // 蓝色 blue      #1677ff
+                // 棕色 brown     #8B4513
+                // 紫色 purple    #623cec
+                default_theme: 'red',
+
+                // 多语言列表
+                // 增加或者减少语言时
+                // 1.新增一个对象，按照当前格式新增
+                // 2.去lang里面各个文件去新增语言翻译
+                default_language: 'zh',
+
+                // 系统tabbar
+                system_tabbar: [
+                    '/pages/index/index',
+                    '/pages/goods-category/goods-category',
+                    '/pages/cart/cart',
+                    '/pages/user/user'
+                ],
+
+                // 公共配置
+                // 是否多商户店铺id
+                plugins_shop_id: null,
+
+                // 是否多门店门店id
+                plugins_realstore_id: null,
+
+                // 是否使用原生菜单（0否, 1是）
+                is_use_native_tabbar: 0,
+
+                // 购物车页面顶部导航强制关闭门店（0否, 1是）
+                is_cart_header_close_realstore: 0,
+
+                // 商品详情页底部导航是否开启购物车功能（0否, 1是）
+                is_goods_bottom_opt_cart: 1,
+
+                // 商品详情页底部导航存在指定返回参数[is_opt_back=1]展示返回按钮（0否, 1是）
+                is_goods_bottom_opt_back: 1,
+
+                // 全站阻止打开商品详情页面（0否, 1是）
+                is_forbid_to_goods_detail: 0,
+
+                // 分享及转发使用页面设置的默认图片及系统默认图片（0否, 1是）
+                is_share_use_image: 1,
+
+                // 开启浮动客服、前提是后台需要开启客服功能（0否, 1是）
+                is_online_service_fixed: 1,
+
+                // 分类页面商品列表模式一级分类使用图标类型（0 实景图, 1 icon图标, 2 大图片）
+                category_goods_model_icon_type: 0,
+
+                // 商品分类页面搜索进入独立搜索页面（0否, 1是）
+                category_goods_is_search_alone: 0,
+
+                // 商品分类页面开启购物车导航（0否, 1是）
+                category_goods_is_show_cart_nav: 1,
+
+                // 用户中心菜单默认展示模式（0 九宫格, 1 列表）
+                user_center_nav_show_model_type: 0,
+
+                // 商品列表是否展示购物车（0否, 1是）
+                is_goods_list_show_cart_opt: 1,
+
+                // 分销页面地图分布是否强制获取当前位置（0否, 1是）
+                is_distribution_map_force_location: 0,
+
+                // 是否开启微信隐私弹窗授权提示、仅微信小程序有效（0否, 1是）
+                is_weixin_privacy_setting: 1,
+                
+                // 弹出获取用户当前位置（0否, 1是）
+                get_user_location_status: 0,
+                get_user_location_timer: null,
+
+                // 微信小程序打开地图使用（0否, 1是）【腾讯位置服务路线规划】插件、（需要到小程序后台设置->第三方设置->插件管理里面添加【腾讯位置服务路线规划】插件，教程 https://mp.weixin.qq.com/wxopen/plugindevdoc?appid=wx50b5593e81dd937a）
+                is_weixin_open_location_use_plugins: 0,
+
+                // 首页搜索框开启扫一扫自动（0否, 1是）仅【小程序、APP】支持
+                is_home_search_scan: 1,
+
+                // 强制使用文字作为logo（默认当前指定logo->后台站点设置手机端图片logo->后台手机管理小程序配置名称->站点设置中的站点名称）
+                is_home_logo_use_text: 0,
+
+                // 首页开启地理位置选择（0否, 1是）优先级高于logo展示
+                is_home_location_choice: 0,
+
+                // 门店详情顶部导航返回按钮（0否, 1是）
+                is_realstore_top_nav_back: 1,
+
+                // 门店详情搜索框内扫码加购（0否, 1是）
+                is_realstore_top_search_scan: 1,
+
+                // 门店详情阻止跳转到商品详情页面去（0否, 1是）
+                is_realstore_forbid_to_goods_detail: 0,
+
+                // 钱包插件货币符号使用当前 currency_symbol 数据的固定值（0否, 1是）
+                is_wallet_use_fixed_currency_symbol: 0,
+
+                // 加载是否使用骨架屏（0否, 1是）
+                is_loading_use_skeleton: 0,
+
+                // 加载动画类型（0logo, 1名称）
+                loading_content_type: 0,
+
+
+                // 数据缓存key
+                // 场景值
+                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',
+
+                // 未登录页面缓存记录key
+                cache_user_no_login_page_status_data_key: 'cache_user_no_login_page_status_data_key',
+
+                // app更新提示缓存记录key
+                cache_app_update_tips_interval_time_key: 'cache_app_update_tips_interval_time_key',
+
+                // app评分提示缓存记录key
+                cache_app_star_tips_interval_time_key: 'cache_app_star_tips_interval_time_key',
+
+                // 首页数据缓存key
+                cache_index_data_key: 'cache_index_data_key',
+
+                // 商品数据缓存key
+                cache_goods_data_key: 'cache_goods_data_key',
+
+                // 页面设计页面数据缓存key
+                cache_design_page_data_key: 'cache_design_page_data_key',
+
+                // 底部菜单选中索引缓存key
+                cache_footer_active_key: 'cache_footer_active_key',
+
+                // diy模块数据缓存key
+                cache_diy_data_key: 'cache_diy_data_key',
+                // diy页面数据缓存key
+                cache_diy_page_data_key: 'cache_diy_page_data_key',
+
+                // apptabbar底部菜单高度
+                cache_app_system_tabbar_height_key: 'cache_app_system_tabbar_height_key',
+
+                // diy底部菜单高度
+                cache_app_diy_tabbar_height_key: 'cache_app_diy_tabbar_height_key',
+
+                // apptabbar底部菜单角标数据
+                cache_tabbar_badge_key: 'cache_tabbar_badge_key',
+
+                // 搜索历史记录
+                cache_search_history_key: 'cache_search_history_key',
+
+                // 门店选择详情缓存
+                cache_realstore_detail_choice_key: 'cache_realstore_detail_choice_key',
+
+                // 互联网医院就诊人选择数据
+                cache_hospital_patient_choice_value_key: 'cache_hospital_patient_choice_value_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',
+
+                // 其他数据
+                // 公共数是否已初始化成功
+                common_data_loading_status: 0,
+                common_data_init_status: 0,
+                common_data_init_back_timer: null,
+                // 网络状态检查
+                network_type_page_record_timer: null,
+                // 位置监听更新页面临时记录数据
+                location_update_page_temp_record_data: [],
+            },
+
+            /**
+             * 启动参数处理
+             */
+            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));
+                }
+                // 如果当前没有邀请id、但是原始缓存有邀请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;
+            },
+
+            /**
+             * 获取设备信息
+             * 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];
+            },
+
+            /**
+             * 设置设备信息
+             */
+            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 client_brand = this.application_client_brand();
+                // 启动参数
+                var params = this.get_launch_cache_info();
+                var referrer = params == null ? null : params.referrer || null;
+                var referrer_params = referrer == null ? '' : '&referrer=' + referrer;
+                // 用户位置
+                var user_location = this.choice_user_location_init();
+                var user_location_params = (user_location || null) != null && (user_location.status || 0) == 1 ? '&user_lng=' + user_location.lng + '&user_lat=' + user_location.lat : '';
+                // 当前语言
+                var lang = this.get_language_value();
+                // 当前主题
+                var theme = this.get_theme_value();
+
+                // 拼接标识
+                var join = url.indexOf('?') == -1 ? '?' : '&';
+                return url + join + 'system_type=' + this.data.system_type + '&application=app&application_client_type=' + client_value + '&application_client_brand=' + client_brand + '&token=' + token + '&uuid=' + uuid + referrer_params + user_location_params + '&lang=' + lang+'&theme='+theme;
+            },
+
+            /**
+             * 获取tab页面切换参数
+             */
+            get_page_tabbar_switch_params() {
+                return uni.getStorageSync(this.data.cache_page_tabbar_switch_params) || null;
+            },
+
+            /**
+             * 删除tab页面切换参数
+             */
+            remove_page_tabbar_switch_params() {
+                uni.removeStorageSync(this.data.cache_page_tabbar_switch_params);
+            },
+
+            /**
+             * 是否需要登录
+             * 是否需要绑定手机号码
+             */
+            user_is_bind_mobile(user, object, method, params, is_to_login = false) {
+                if ((user || null) != null && (user.mobile || null) == null && parseInt(user.is_mandatory_bind_mobile || 0) == 1) {
+                    if(is_to_login) {
+                        this.login_confirm_tips_modal(this, object, method, params);
+                    }
+                    return true;
+                }
+                return false;
+            },
+
+            /**
+             * 获取用户信息,信息不存在则唤醒授权
+             * object     回调操作对象
+             * method     回调操作对象的函数
+             * params     回调操请求参数
+             * return     有用户数据直接返回, 则回调调用者
+             */
+            get_user_info(object, method, params) {
+                var user = this.get_user_cache_info();
+                if (user == null) {
+                    var self = this;
+                    uni.getNetworkType({
+                        success: function (res) {
+                            if (res.networkType != 'none') {
+                                // #ifdef MP
+                                // 小程序唤醒用户授权
+                                self.user_login(object, method, params);
+                                // #endif
+
+                                // #ifdef APP
+                                // app登录注册
+                                self.app_login_handle(self, object, method, params);
+                                // #endif
+
+                                // #ifdef H5
+                                // h5登录注册
+                                self.login_confirm_tips_modal(self, object, method, params);
+                                // #endif
+                            }
+                        },
+                    });
+                    return false;
+                } else {
+                    // 是否需要绑定手机
+                    if(this.user_is_bind_mobile(user, object, method, params, true)) {
+                        return false;
+                    }
+                }
+                return user;
+            },
+
+            // app登录处理
+            app_login_handle(self, object, method, params) {
+                // 是否开启一键登录服务
+                if (self.get_config('plugins_base.thirdpartylogin.data.apponekeyusermobile_is_enable') == 1) {
+                    uni.getProvider({
+                        service: 'oauth',
+                        success: function (res) {
+                            if (res.provider.includes('univerify')) {
+                                // 预登录检查
+                                uni.preLogin({
+                                    provider: 'univerify',
+                                    success(res) {
+                                        // 显示一键登录弹窗
+                                        var theme_color = self.get_theme_color();
+                                        var theme_color_light = self.get_theme_color(null, true);
+                                        uni.login({
+                                            provider: 'univerify',
+                                            univerifyStyle: {
+                                                authButton: {
+                                                    // 授权按钮正常状态背景颜色 默认值：#3479f5
+                                                    normalColor: theme_color,
+                                                    // 授权按钮按下状态背景颜色 默认值：#2861c5（仅ios支持）
+                                                    highlightColor: theme_color_light,
+                                                    // 授权按钮不可点击时背景颜色 默认值：#73aaf5（仅ios支持）
+                                                    disabledColor: theme_color_light,
+                                                    // 授权按钮文案 默认值：“本机号码一键登录”
+                                                    title: i18n.t('shopxo-uniapp.app.5a7r0v'),
+                                                },
+                                                otherLoginButton: {
+                                                    // 其他登录方式按钮文字 默认值：“其他登录方式”
+                                                    title: i18n.t('login.login.9q27d8'),
+                                                },
+                                                privacyTerms: {
+                                                    // 条款前的文案 默认值：“我已阅读并同意”
+                                                    prefix: i18n.t('shopxo-uniapp.app.33k281'),
+                                                    // 条款后的文案 默认值：“并使用本机号码登录”
+                                                    suffix: i18n.t('shopxo-uniapp.app.8l688n'),
+                                                    // 自定义协议条款，最大支持2个，需要同时设置url和title. 否则不生效
+                                                    privacyItems: [
+                                                        {
+                                                            url: self.get_config('config.agreement_userregister_url'),
+                                                            title: i18n.t('shopxo-uniapp.app.28r5dr'),
+                                                        },
+                                                        {
+                                                            url: self.get_config('config.agreement_userprivacy_url'),
+                                                            title: i18n.t('shopxo-uniapp.app.lb493k'),
+                                                        },
+                                                    ],
+                                                },
+                                            },
+                                            success(res) {
+                                                // 在得到access_token和openid后，通过callfunction调用云函数
+                                                uniCloud
+                                                    .callFunction({
+                                                        name: 'getPhoneNumber',
+                                                        data: {
+                                                            access_token: res.authResult.access_token,
+                                                            openid: res.authResult.openid,
+                                                        },
+                                                    })
+                                                    .then((res) => {
+                                                        uni.request({
+                                                            url: self.get_request_url('apponekeyusermobile', 'index', 'thirdpartylogin'),
+                                                            method: 'POST',
+                                                            data: {
+                                                                mobile: res.result,
+                                                            },
+                                                            dataType: 'json',
+                                                            success: (res) => {
+                                                                uni.closeAuthView();
+                                                                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.closeAuthView();
+                                                                self.showToast(i18n.t('common.internet_error_tips'));
+                                                            },
+                                                        });
+                                                    })
+                                                    .catch((err) => {
+                                                        uni.closeAuthView();
+                                                        self.showToast(i18n.t('shopxo-uniapp.app.ch1pd2'));
+                                                    });
+                                            },
+                                            fail(res) {
+                                                // 关闭一键登录弹窗
+                                                uni.closeAuthView();
+                                                // 用户点击了其他登录方式、则进入登录页面
+                                                if (res.errCode == 30002) {
+                                                    // 进入独立登录注册页面
+                                                    uni.navigateTo({
+                                                        url: '/pages/login/login',
+                                                    });
+                                                } else {
+                                                    // 用户不是点击关闭验证界面则提示错误
+                                                    if (res.errCode != 30003) {
+                                                        self.showToast(res.errMsg + '(' + res.errCode + ')');
+                                                    }
+                                                }
+                                            },
+                                        });
+                                    },
+                                    fail(res) {
+                                        self.login_confirm_tips_modal(self, object, method, params);
+                                    },
+                                });
+                            } else {
+                                self.login_confirm_tips_modal(self, object, method, params);
+                            }
+                        },
+                        fail(res) {
+                            self.login_confirm_tips_modal(self, object, method, params);
+                        },
+                    });
+                } else {
+                    self.login_confirm_tips_modal(self, object, method, params);
+                }
+            },
+
+            // 未登录确认处理
+            login_confirm_tips_modal(self, object, method, params) {
+                // 是否tabbar页面
+                var page = self.current_page(false);
+                var is_tabbar = self.is_system_tabbar_pages('/'+page);
+                // 非初始化 并且 非tabbar页面则关闭当前页面并跳转登录页面
+                if(method == 'init' && !is_tabbar) {
+                    uni.redirectTo({
+                        url: '/pages/login/login'
+                    });
+                // 初始化页面并且是tabbar页面
+                } else if(method == 'init' && is_tabbar) {
+                    var key = this.data.cache_user_no_login_page_status_data_key;
+                    var data = uni.getStorageSync(key) || [];
+                    if(data.indexOf(page) == -1) {
+                        data.push(page);
+                        uni.setStorageSync(key, data);
+                        uni.navigateTo({
+                            url: '/pages/login/login'
+                        });
+                    }
+                // 非初始化则直接跳转登录页面
+                } else if(method != 'init') {
+                    uni.navigateTo({
+                        url: '/pages/login/login'
+                    });
+                }
+            },
+
+            /**
+             * 从缓存获取用户信息、可指定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];
+                }
+                return user;
+            },
+
+            /**
+             * 系统参数获取
+             */
+            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;
+            },
+
+            /**
+             * 获取登录授权数据
+             */
+            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     回调操请求参数
+             */
+            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: i18n.t('common.auth_in_text'),
+                });
+                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 = self.application_client_type();
+                                        if ((data.is_user_exist || 0) == 1 || client_type == 'weixin') {
+                                            // 存在数据非微信 或 微信小程序是否强制填写基础信息
+                                            if(((data.is_user_exist || 0) == 1 && client_type != 'weixin') || !self.is_weixin_force_user_base_handle(self, data, object, method, params)) {
+                                                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);
+                                                    }
+                                                } else {
+                                                    self.login_to_auth();
+                                                }
+                                            }
+                                        }
+                                    } else {
+                                        uni.hideLoading();
+                                        self.showToast(res.data.msg);
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    self.showToast(i18n.t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                    fail: (e) => {
+                        uni.hideLoading();
+                        self.showToast(i18n.t('login.login.3nmrg2'));
+                    },
+                });
+            },
+
+            // 微信小程序是否强制填写基础信息
+            is_weixin_force_user_base_handle(self, data, object, method, params) {
+                var status = parseInt(self.get_config('config.common_app_is_weixin_force_user_base', 0));
+                if(status == 1) {
+                    var obj = self.get_page_object();
+                    if((obj.$vm || null) != null && (obj.$vm.$refs || null) != null && (obj.$vm.$refs.common || null) != null && (obj.$vm.$refs.common.$refs || null) != null && (obj.$vm.$refs.common.$refs.user_base || null) != null) {
+                        var user_base = obj.$vm.$refs.common.$refs.user_base;
+                        var res = user_base.form_write_field_check_data(data, true);
+                        if(res.popup_status) {
+                            user_base.user_base_open(object, method, params);
+                        }
+                        return res.popup_status;
+                    }
+                }
+                return false;
+            },
+
+            /**
+             * 跳转到登录页面授权
+             */
+            login_to_auth() {
+                uni.showModal({
+                    title: i18n.t('common.warm_tips'),
+                    content: i18n.t('login.login.jw378f'),
+                    confirmText: i18n.t('common.confirm'),
+                    cancelText: i18n.t('common.not_yet'),
+                    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: i18n.t('common.auth_in_text'),
+                });
+                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(i18n.t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            /**
+             * 字段数据校验
+             * 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);
+            },
+
+            /**
+             * 获取日期
+             * 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;
+            },
+
+            /**
+             * 获取对象、数组的长度、元素个数
+             * 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;
+            },
+
+            /**
+             * url主要部分
+             * url url地址
+             */
+            get_url_main_part(url) {
+                var value = '';
+                if((url || null) != null) {
+                    if (url.indexOf('?') == -1) {
+                        value = url;
+                    } else {
+                        var temp_str = url.split('?');
+                        value = temp_str[0];
+                    }
+                }
+                return value;
+            },
+
+            /**
+             * diy底部菜单高度数据存储
+             * value  高度
+             */
+            app_diy_tabbar_height_save(value) {
+                uni.setStorageSync(this.data.cache_app_diy_tabbar_height_key, value);
+            },
+
+            /**
+             * diy底部菜单高度数据读取
+             */
+            app_diy_tabbar_height_value() {
+                return parseInt(uni.getStorageSync(this.data.cache_app_diy_tabbar_height_key) || 0);
+            },
+
+            /**
+             * 系统底部菜单高度数据存储
+             * value  高度
+             */
+            app_system_tabbar_height_save(value) {
+                uni.setStorageSync(this.data.cache_app_system_tabbar_height_key, value);
+            },
+            
+            /**
+             * 系统底部菜单高度数据读取
+             */
+            app_system_tabbar_height_value() {
+                return parseInt(uni.getStorageSync(this.data.cache_app_system_tabbar_height_key) || 0);
+            },
+
+            /**
+             * 底部菜单页面数、tabbar
+             */
+            app_tabbar_pages() {
+                var temp_tabbar = this.data.system_tabbar;
+                var app_tabbar = this.get_config('app_tabbar') || null;
+                if(app_tabbar != null && (app_tabbar.content || null) != null && (app_tabbar.content.nav_content || null) != null) {
+                    temp_tabbar = app_tabbar.content.nav_content.map(function(v) {
+                        if((v.link || null) != null && (v.link.page || null) != null) {
+                            return v.link.page;
+                        }
+                    });
+                }
+                return temp_tabbar;
+            },
+
+            /**
+             * 当前地址是否存在底部菜单tabbar中
+             */
+            is_tabbar_pages(url = null) {
+                var pages = (this.data.is_use_native_tabbar == 1) ? this.data.system_tabbar : this.app_tabbar_pages();
+                return this.is_tabbar_pages_handle(pages, url);
+            },
+
+            /**
+             * 当前地址是否存在系统tabbar中
+             */
+            is_system_tabbar_pages(url = null) {
+                return this.is_tabbar_pages_handle(this.data.system_tabbar, url);
+            },
+
+            /**
+             * 当前地址是否存在tabbar中
+             * pages  tabbar页面
+             * url    url地址
+             */
+            is_tabbar_pages_handle(pages, url = null) {
+                var value = (url == null) ? '/'+this.current_page() : url;
+                if ((value || null) != null) {
+                    if(pages.indexOf(value) != -1) {
+                        return true;
+                    } else {
+                        // 存在参数，去掉参数再检索是否存在页面的tabbar
+                        if(value.indexOf('?') != -1) {
+                            var temp = value.split('?');
+                            if(pages.indexOf(temp[0]) != -1) {
+                                return true;
+                            }
+                        }
+                    }
+                }
+                return false;
+            },
+
+            /**
+             * 当前地址是否存为首页
+             * url    url地址
+             */
+            is_tabbar_home(url = null) {
+                var pages = this.app_tabbar_pages() || [];
+                if(pages.length > 0) {
+                    var value = (url == null) ? '/'+this.current_page() : url;
+                    if ((value || null) != null) {
+                        if(pages[0] == value) {
+                            return true;
+                        } else {
+                            // 存在参数，去掉参数再检索是否存在页面的tabbar
+                            if(value.indexOf('?') != -1) {
+                                var temp = value.split('?');
+                                if(pages[0] == temp[0]) {
+                                    return true;
+                                }
+                            }
+                        }
+                    }
+                }
+                return false;
+            },
+
+            // 系统底部菜单隐藏
+            system_hide_tabbar() {
+                if(this.data.is_use_native_tabbar != 1) {
+                    uni.hideTabBar();
+                }
+            },
+
+            /**
+             * 事件操作
+             */
+            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_system_tabbar_pages(value)) {
+                                var temp = value.split('?');
+                                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
+                                });
+                                //隐藏系统tabbar
+                                this.system_hide_tabbar();
+                            } 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(i18n.t('shopxo-uniapp.app.5y1c52'));
+                                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地址
+             * is_redirect [boolean] 是否关闭当前页面
+             */
+            open_web_view(value, is_redirect = false) {
+                var url = '/pages/web-view/web-view?url=' + encodeURIComponent(value);
+                if(is_redirect) {
+                    uni.redirectTo({
+                        url: url,
+                    });
+                } else {
+                    uni.navigateTo({
+                        url: url,
+                    });
+                }
+            },
+
+            /**
+             * 默认弱提示方法
+             * msg    [string]  提示信息
+             * status [string]  状态 默认error [正确success, 错误error]
+             */
+            showToast(msg, status) {
+                if ((msg || null) != null) {
+                    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]    回调操作对象的函数
+             * params             [obj]       携带的参数
+             */
+            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 || i18n.t('common.cancel');
+                    var confirm_text = e.confirm_text || i18n.t('common.confirm');
+                    var cancel_color = e.cancel_color || '#000000';
+                    var confirm_color = e.confirm_color || '#576B95';
+                    var params = e.params || {};
+                    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) {
+                                params['alert_status'] = res.confirm ? 1 : 0;
+                                e.object[e.method](params);
+                            }
+                        },
+                    });
+                } else {
+                    self.showToast(i18n.t('shopxo-uniapp.app.t754n6'));
+                }
+            },
+
+            // 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;
+            },
+
+            // 拨打电话
+            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;
+            },
+
+            /**
+             * 读取底部导航badge
+             * type     类型标识（如购物车 cart）
+             */
+            get_tab_bar_badge(type) {
+                if ((type || null) != null) {
+                    return uni.getStorageSync(this.data.cache_tabbar_badge_key+'-'+type) || null;
+                }
+                return null;
+            },
+
+            /**
+             * 设置底部导航badge
+             * type     类型标识（如购物车 cart）
+             * value    显示的文本，超过 4 个字符则显示成 ...（type参数为1的情况下有效）
+             */
+            set_tab_bar_badge(type, value = 0) {
+                // 是否使用原生菜单
+                if(this.data.is_use_native_tabbar == 1) {
+                    if(type == 'cart') {
+                        if ((value || 0) == 0) {
+                            uni.removeTabBarBadge({
+                                index: 2
+                            });
+                        } else {
+                            uni.setTabBarBadge({
+                                index: 2,
+                                text: value.toString()
+                            });
+                        }
+                    }
+                } else {
+                    // 数据处理
+                    if ((type || null) != null) {
+                        var key = this.data.cache_tabbar_badge_key+'-'+type;
+                        if ((value || null) == null) {
+                            uni.removeStorageSync(key);
+                        } else {
+                            uni.setStorageSync(key, value);
+                        }
+                    }
+                    // 更新底部菜单数据
+                    var obj = this.get_page_object() || null;
+                    if(obj != null && (obj.$vm || null) != null && (obj.$vm.$refs || null) != null && (obj.$vm.$refs.common || null) != null) {
+                        obj.$vm.$refs.common.footer_init();
+                    }
+                }
+            },
+
+            // 页面分享处理
+            page_share_handle(share = null) {
+                // 当前页面
+                var pages = getCurrentPages();
+                var obj = pages[pages.length - 1] || null;
+                // 分享信息、是否指定参数
+                if ((share || null) == null) {
+                    share = {};
+                }
+                // 从页面对象获取参数
+                if (obj != null && 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(i18n.t('common.internet_error_tips'));
+                        },
+                    });
+                }
+                // #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和默认值
+             * data             数据
+             * key              数据key（支持多级读取、以 . 分割key名称）
+             * default_value    默认值
+             */
+            get_key_data(data, key, default_value = null) {
+                var value = default_value;
+                if ((data || null) != null) {
+                    var arr = key.split('.');
+                    if (arr.length == 1) {
+                        if(data[key] != undefined) {
+                            value = data[key];
+                        }
+                    } else {
+                        value = data;
+                        for (var i in arr) {
+                            if (value[arr[i]] != undefined) {
+                                value = value[arr[i]];
+                            } else {
+                                value = default_value;
+                                break;
+                            }
+                        }
+                    }
+                }
+                return value;
+            },
+
+            /**
+             * 获取配置信息、可指定key和默认值
+             * key              数据key（支持多级读取、以 . 分割key名称）
+             * default_value    默认值
+             */
+            get_config(key, default_value) {
+                // 获取全部缓存
+                var config = uni.getStorageSync(this.data.cache_config_info_key) || null;
+                if((key || null) == null) {
+                    return config;
+                }
+
+                // key缓存获取
+                var value = 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;
+            },
+
+            /**
+             * 初始化 配置信息
+             * num        读取次数、如果失败+1再次读取
+             * object     回调操作对象
+             * method     回调操作对象的函数
+             * params     回调操请求参数
+             */
+            init_config(num = 0, object, method, params) {
+                var self = this;
+                uni.getNetworkType({
+                    success: function (res) {
+                        if (res.networkType != 'none') {
+                            // 获取配置本地缓存
+                            var config = self.get_config();
+                            if(config != null) {
+                                // 公共配置初始化返回处理
+                                self.init_config_result_handle(config, self);
+                            }
+
+                            // 读取远程配置
+                            if(self.data.common_data_loading_status == 0) {
+                                // 赋值在加载状态
+                                self.data.common_data_loading_status = 1;
+                                uni.request({
+                                    url: self.get_request_url('common', 'base'),
+                                    method: 'POST',
+                                    data: {
+                                        is_key: 1,
+                                    },
+                                    dataType: 'json',
+                                    success: (res) => {
+                                        // 赋值不在加载状态
+                                        self.data.common_data_loading_status = 0;
+                                        if (res.data.code == 0) {
+                                            // 配置存储
+                                            var data = res.data.data;
+                                            uni.setStorageSync(self.data.cache_config_info_key, data);
+
+                                            // 公共配置初始化返回处理
+                                            self.init_config_result_handle(data, self);
+
+                                            // 回调
+                                            if (typeof object === 'object' && (method || null) != null) {
+                                                object[method](params);
+                                            }
+                                        } else {
+                                            self.showToast(res.data.msg);
+                                            // 站点关闭状态则 记录已初始化公共数据状态
+                                            if (res.data.code == -10000) {
+                                                self.data.common_data_init_status = 1;
+                                            }
+                                
+                                            // 首次则再次初始化配置、站点关闭状态则不处理
+                                            if (parseInt(num || 0) <= 20 && self.data.common_data_init_status == 0) {
+                                                self.init_config(num+1, object, method, params);
+                                            }
+                                        }
+                                    },
+                                    fail: () => {
+                                        // 赋值不在加载状态
+                                        self.data.common_data_loading_status = 0;
+                                        // 首次则再次初始化配置
+                                        if (parseInt(num || 0) <= 20) {
+                                            self.init_config(num+1, object, method, params);
+                                        }
+                                    },
+                                });
+                            }
+                        }
+                    },
+                });
+            },
+
+            // 公共配置初始化返回处理
+            init_config_result_handle(data, self) {
+                // 记录已初始化公共数据状态
+                self.data.common_data_init_status = 1;
+
+                // 主题设置
+                self.set_theme_value(data.plugins_themestyle_data);
+
+                // 设置底部菜单
+                self.set_tabbar(data.plugins_themestyle_data);
+
+                // 用户自动登录处理
+                self.user_auto_login_handle();
+            },
+
+            /**
+             * 配置是否有效(100毫秒检验一次、最多检验100次)
+             * object     回调操作对象
+             * method     回调操作对象的函数
+             * params     回调操请求参数
+             */
+            is_config(object, method, params) {
+                var self = this;
+                var count = 0;
+                var is_config_count = 0;
+                var timer = setInterval(function () {
+                    if (self.get_config('status') == 1) {
+                        clearInterval(timer);
+                        if (typeof object === 'object' && (method || null) != null) {
+                            object[method](true, params);
+                        }
+                    }
+                    count++;
+                    if (count >= 2300) {
+                        clearInterval(timer);
+                    }
+                }, 100);
+            },
+
+            /**
+             * 火星坐标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,
+                };
+            },
+
+            /**
+             * 百度坐标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,
+                };
+            },
+
+            /**
+             * 打开地图
+             * lng        经度
+             * lat        纬度
+             * name       地图上面显示的名称
+             * address    地图上面显示的详细地址
+             * scale      缩放比例，范围5~18
+             */
+            open_location(lng, lat, name, address, scale) {
+                // #ifdef MP-KUAISHOU
+                this.showToast(i18n.t('shopxo-uniapp.app.iq66pg'));
+                return false;
+                // #endif
+
+                // 参数判断
+                if (lng == undefined || lat == undefined || lng == '' || lat == '') {
+                    this.showToast(i18n.t('shopxo-uniapp.app.v2j475'));
+                    return false;
+                }
+                lat = parseFloat(lat);
+                lng = parseFloat(lng);
+
+                // #ifdef MP-WEIXIN
+                // 微信小程序使用【腾讯位置服务路线规划】插件
+                if (this.data.is_weixin_open_location_use_plugins == 1) {
+                    var key = this.get_config('config.common_tencent_map_ak') || null;
+                    if (key != null) {
+                        var plugin = requirePlugin('routePlan');
+                        var end_point = JSON.stringify({
+                            name: name || i18n.t('extraction-apply.extraction-apply.47v7m0'),
+                            longitude: lng,
+                            latitude: lat,
+                        });
+                        uni.navigateTo({
+                            url: 'plugin://routePlan/route-plan?key=' + key + '&referer=' + this.get_application_title() + '&endPoint=' + end_point + '&themeColor=' + this.get_theme_color() + '&navigation=1',
+                        });
+                        return false;
+                    }
+                }
+                // #endif
+                // 转换坐标打开位置
+                uni.openLocation({
+                    name: name || i18n.t('extraction-apply.extraction-apply.47v7m0'),
+                    address: address || '',
+                    scale: scale || 18,
+                    longitude: lng,
+                    latitude: lat,
+                });
+            },
+
+            // 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);
+                });
+            },
+
+            // 获取当前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(i18n.t('shopxo-uniapp.app.3m1gbe'));
+                        },
+                    });
+                }
+                return uuid;
+            },
+
+            // 链接地址事件
+            url_event(e) {
+                if((e.currentTarget || null) != null && (e.currentTarget.dataset || null) != null) {
+                    // 需要打开的url地址
+                    var value = e.currentTarget.dataset.value || null;
+
+                    // 是否阻止商品页面打开
+                    if (this.data.is_forbid_to_goods_detail == 1 && value.indexOf('/pages/goods-detail/goods-detail') != -1) {
+                        return false;
+                    }
+
+                    // 是否关闭当前页面
+                    var is_redirect = parseInt(e.currentTarget.dataset.redirect || 0) == 1;
+
+                    // 如果是底部菜单，非系统内置菜单则关闭当前页面并打开
+                    var tabbar = this.app_tabbar_pages();
+                    if(tabbar.indexOf(value) != -1 && this.data.system_tabbar.indexOf(value) == -1) {
+                        var page = this.prev_page();
+                        if(page != null && this.data.system_tabbar.indexOf(page) == -1) {
+                            is_redirect = true;
+                        }
+                    }
+
+                    // 调用打开url方法
+                    this.url_open(value, is_redirect);
+                }
+            },
+
+            // 是否为url地址
+            is_url(value) {
+                var arr = ['http:/', 'https:'];
+                return arr.indexOf(value.substr(0, 6)) != -1;
+            },
+
+            // 是否为page页面地址
+            is_page(value) {
+                var arr = ['/pages', 'pages/'];
+                var status = arr.indexOf(value.substr(0, 6)) != -1;
+                if(!status) {
+                    // 是否打开插件地址
+                    if(value.substr(0, 17) == 'plugin-private://') {
+                        status = true;
+                    }
+                }
+                return status;
+            },
+
+            // url打开
+            url_open(value, is_redirect = false) {
+                if ((value || null) != null) {
+                    // #ifdef MP
+                    // 小程序最多打开10层页面
+                    var pages = getCurrentPages();
+                    if(pages.length >= 10) {
+                        is_redirect = true;
+                    }
+                    // #endif
+
+                    if (this.is_url(value)) {
+                        // web地址
+                        this.open_web_view(value, is_redirect);
+                    } else if (value.substr(0, 8) == 'appid://') {
+                        // 打开外部小程序协议（appid|/pages/index/index?pv=hello|extraData|envVersion）
+                        var values = value.substr(8).split('|');
+                        uni.navigateToMiniProgram({
+                            appId: values[0],
+                            path: values[1] || '',
+                            extraData: values[2] || '',
+                            envVersion: values[3] || 'release'
+                        });
+                    } else if (value.substr(0, 12) == 'shortlink://') {
+                        // 小程序分享链接
+                        uni.navigateToMiniProgram({
+                            shortLink: value.substr(12)
+                        });
+                    } else if (value.substr(0, 6) == 'map://') {
+                        // 地图协议（名称|地址|lng|lat）
+                        var values = value.substr(6).split('|');
+                        if (values.length != 4) {
+                            this.showToast(i18n.t('shopxo-uniapp.app.5y1c52'));
+                            return false;
+                        }
+                        this.open_location(values[2], values[3], values[0], values[1]);
+                    } else if (value.substr(0, 6) == 'tel://') {
+                        // 电话协议
+                        this.call_tel(value.substr(6));
+                    } else if (value.substr(0, 7) == 'scan://') {
+                        // 扫码协议
+                        this.scan_handle();
+                    } else {
+                        // 默认切换或跳转页面
+                        if (this.is_page(value)) {
+                            if (this.is_system_tabbar_pages(value)) {
+                                var temp = value.split('?');
+                                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
+                                });
+                                //隐藏系统tabbar
+                                this.system_hide_tabbar();
+                            } else {
+                                if (is_redirect) {
+                                    uni.redirectTo({
+                                        url: value
+                                    });
+                                } else {
+                                    uni.navigateTo({
+                                        url: value
+                                    });
+                                }
+                            }
+                        } else {
+                            this.url_open('/pages/goods-search/goods-search?keywords='+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_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(i18n.t('shopxo-uniapp.app.r5ts62'), 'success');
+                                },
+                            });
+                        },
+                    });
+                } else {
+                    this.showToast(i18n.t('shopxo-uniapp.app.r539kf'));
+                }
+            },
+
+            // 图片预览
+            image_show_event(e, urls = null) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value != null) {
+                    uni.previewImage({
+                        current: value,
+                        urls: urls || [value],
+                    });
+                } else {
+                    this.showToast(i18n.t('shopxo-uniapp.app.qm8548'));
+                }
+            },
+
+            // 静态文件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/' + type + '/images/';
+                } else {
+                    // 根据配置的静态url地址+主题标识+参数类型组合远程静态文件地址
+                    return this.data.static_url + 'static/app/' + this.get_theme_value() + '/' + type + '/';
+                }
+            },
+
+            // rpx转px
+            rpx_to_px(value) {
+                return (value || 0) == 0 ? 0 : uni.upx2px(value * 2);
+            },
+
+            // px转rpx
+            px_to_rpx(value) {
+                const new_value = value * 2 || 0;
+                // 200 为 100px 的值，后面的两个 100 为计算比例使用
+                var rpx = new_value / (uni.upx2px(value) / value);
+                // 验证上面rpx的值
+                return uni.upx2px(rpx);
+            },
+
+            // 是否pc
+            is_pc() {
+                var arr = ['macos', 'windows'];
+                return arr.indexOf(uni.getSystemInfoSync().platform) != -1;
+            },
+
+            // 终端类型
+            application_client() {
+                var type = '';
+                // #ifdef APP
+                type = 'app';
+                // #endif
+                // #ifdef H5
+                type = 'h5';
+                // #endif
+                // #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
+                // #ifdef APP
+                value = this.get_system_info('platform', null, true);
+                // #endif
+                return value;
+            },
+
+            // app客户端品牌
+            application_client_brand(e) {
+                var value = this.get_system_info('brand', null, true);
+                return (value === null) ? '' : value.toLowerCase();
+            },
+
+            // 授权验证
+            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 || i18n.t('shopxo-uniapp.app.gbiac6'));
+                                    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 > 960) {
+                    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;
+            },
+
+            // 获取当前页面地址
+            // is_whole 完整地址（?后面的参数）
+            get_page_url(is_whole = true) {
+                var url = this.current_page();
+                // #ifdef APP
+                url = this.page_url_protocol(url);
+                // #endif
+                // #ifdef H5
+                url = window.location.href;
+                // #endif
+                if (is_whole == false) {
+                    var temp = url.split('?');
+                    url = temp[0];
+                }
+                return url;
+            },
+
+            // url协议地址处理
+            page_url_protocol(url) {
+                if ((url || null) != null && !this.is_url(url)) {
+                    // 拼接H5地址
+                    var host = this.get_config('config.common_app_h5_url', '');
+                    // #ifdef H5
+                    if(host == '') {
+                        // H5模式下、未指定H5地址则获取当前host
+                        host = window.location.href.split('#')[0]+'#/';
+                    }
+                    // #endif
+                    // 处理中间拼接的斜杠是否重复
+                    url = (host + url).replace('#//', '#/');
+                }
+                return url;
+            },
+
+            // 是否微信环境
+            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, page = null) {
+                // 微信环境判断是否已有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: i18n.t('common.processing_in_text'),
+                            });
+                            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(i18n.t('common.internet_error_tips'));
+                                },
+                            });
+                            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 = (page || null) == null ? this.get_page_url() : this.page_url_protocol(page);
+                            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_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 (type !== null) {
+                    value = this.get_config('config.common_customer_store_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_app') || this.get_config('config.home_site_logo_wap');
+                }
+                return logo;
+            },
+
+            // 正方形logo
+            get_application_logo_square() {
+                return this.get_config('config.home_site_logo_square');
+            },
+
+            // 分享内容处理
+            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.app_tabbar_pages()[0],
+                    query: this.share_query_handle(data.query || ''),
+                    img: data.img || share_config.pic || this.get_application_logo_square(),
+                };
+                result['url'] = this.get_page_url();
+                // #ifdef H5 || APP
+                // 是有效的url地址则通过#号分割处理参数
+                if(this.is_url(result['url'])) {
+                    result['url'] = this.page_url_protocol(result.url.split('#')[0] + '#' + ((result.path || null) != null && result.path.substr(0, 1) == '/' ? '' : '/') + (result.path || '') + (result.query || ''));
+                }
+                // #endif
+                return result;
+            },
+
+            // 分享参数处理
+            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;
+            },
+
+            // 是否朋友圈单页访问提示
+            is_single_page_check() {
+                if (this.is_current_single_page() == 1) {
+                    this.showToast(i18n.t('shopxo-uniapp.app.3eqv71'));
+                    return false;
+                }
+                return true;
+            },
+
+            // 调用页面方法
+            get_page_object(page = null) {
+                var pages = getCurrentPages();
+                if(page == null) {
+                    return pages[pages.length - 1];
+                } else {
+                    var result = [];
+                    for (var i = 0; i < pages.length; i++) {
+                        if (pages[i]['route'] == page) {
+                            result.push(pages[i]);
+                        }
+                    }
+                    return result;
+                }
+            },
+
+            // 当前页面地址
+            // is_whole 完整地址（?后面的参数）
+            current_page(is_whole = true) {
+                // 来源地址、拼接当前小程序页面
+                var pages = getCurrentPages();
+                var page = pages[pages.length - 1];
+                var url = this.page_url_handle(page);
+                if (is_whole == false) {
+                    var temp = url.split('?');
+                    url = temp[0];
+                }
+                return url;
+            },
+
+            // 上一页页面地址
+            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;
+            },
+
+            // 返回上一页、则回到shouy
+            page_back_prev_event() {
+                var prev_page = this.prev_page();
+                if (prev_page == null) {
+                    this.url_open(this.app_tabbar_pages()[0]);
+                } else {
+                    uni.navigateBack();
+                }
+            },
+
+            // 页面地址处理
+            page_url_handle(page) {
+                if ((page || null) == null) {
+                    return '';
+                }
+
+                // 直接获取页面全的路径地址
+                if((page.$page || null) != null && (page.$page.fullPath || null) != null) {
+                    var path = page.$page.fullPath;
+                    return path.substr(0, 1) == '/' ? path.substr(1) : path;
+                }
+
+                // 拼接地址和参数
+                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;
+            },
+
+            // 进入客服
+            chat_entry_handle(url) {
+                if ((url || null) == null) {
+                    this.showToast(i18n.t('shopxo-uniapp.app.08cg8y'));
+                } else {
+                    // 拼接基础参数
+                    url = this.request_params_handle(url);
+                    // 拼接当前页面地址
+                    var route = this.current_page();
+                    url += '&source=' + encodeURIComponent(base64.encode(route).replace(new RegExp(/=/g), ''));
+                    // 打开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);
+                        }
+                        // 跳转登录
+                        window.location.href = url;
+                    }
+                }
+                // #endif
+            },
+
+            // 清除用户缓存
+            remove_user_cache_event(is_remove_user = true) {
+                // 当前平台
+                var client_value = this.application_client();
+                // 是否清除用户登录信息
+                if(is_remove_user) {
+                    // 用户登录缓存
+                    uni.removeStorageSync(this.data.cache_user_login_key);
+                    // 用户信息缓存
+                    uni.removeStorageSync(this.data.cache_user_info_key);
+                }
+                // 未登录提示缓存记录
+                uni.removeStorageSync(this.data.cache_user_no_login_page_status_data_key);
+                // 用户基础资料提示间隔key
+                uni.removeStorageSync(this.data.cache_user_base_personal_interval_time_key);
+                // app更新提示缓存记录key
+                uni.removeStorageSync(this.data.cache_app_update_tips_interval_time_key);
+                // app评分提示缓存记录key
+                uni.removeStorageSync(this.data.cache_app_star_tips_interval_time_key);
+
+                // 非小程序则两秒后回到首页
+                this.showToast(i18n.t('shopxo-uniapp.app.'+((client_value == 'mp' || !is_remove_user) ? '0gwt7z' : '87yghj')), 'success');
+            },
+
+            // 是否站点变灰
+            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;
+            },
+
+            // 价格符号
+            currency_symbol() {
+                return this.get_config('currency_symbol') || this.data.currency_symbol;
+            },
+
+            // 位置权限校验
+            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) => {
+                        self.showToast(i18n.t('shopxo-uniapp.app.di6v5t'));
+                        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
+                self.showToast(i18n.t('shopxo-uniapp.app.nu5058'));
+                if (typeof object === 'object' && (method || null) != null) {
+                    object[method](0);
+                }
+                // #endif
+            },
+
+            // 启动位置监听（0 打开位置实时监听、1小程序后台运行也监听（仅微信、快手）小程序支持）
+            start_location_update(type = 0, object, method) {
+                // 非微信和快手小程序type=1则赋值为0
+                // #ifndef MP-WEIXIN || MP-KUAISHOU
+                if (type == 1) {
+                    type = 0;
+                }
+                // #endif
+
+                // 如果页面已存在位置调用则不重复调用
+                var page = this.current_page(false);
+                var temp_location = this.data.location_update_page_temp_record_data;
+                if (temp_location.indexOf(page) == -1) {
+                    // 根据类型调用api
+                    if (type == 1) {
+                        // 开始监听实时地理位置信息变化事件，小程序进入前后台时均接收实时地理位置信息
+                        // 这个方法仅微信和快手小程序支持
+                        // #ifdef MP-WEIXIN || MP-KUAISHOU
+                        uni.startLocationUpdateBackground({
+                            success: (res) => {
+                                // 增加页面记录
+                                temp_location.push(page);
+                                this.data.location_update_page_temp_record_data = temp_location;
+
+                                // 调用位置监听方法
+                                this.start_location_update_change(object, method);
+                            },
+                            fail: (res) => {
+                                if (typeof object === 'object' && (method || null) != null) {
+                                    object[method]({
+                                        status: 0,
+                                        msg: res.errMsg,
+                                    });
+                                }
+                            },
+                        });
+                        // #endif
+                    } else {
+                        // 打开位置监听
+                        uni.startLocationUpdate({
+                            success: (res) => {
+                                // 增加页面记录
+                                temp_location.push(page);
+                                this.data.location_update_page_temp_record_data = temp_location;
+
+                                // 调用位置监听方法
+                                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,
+                        });
+                    }
+                });
+            },
+
+            // 网络状态检查处理
+            network_type_handle(object, method, params = {}) {
+                // 如果页面已存在位置调用则不重复调用
+                var page = this.current_page(false);
+                var temp_network = this.data.network_type_page_record_timer || {};
+                var temp = temp_network[page] || null;
+                if (temp == null) {
+                    var self = this;
+                    temp_network[page] = {
+                        object: object,
+                        method: method,
+                        params: params,
+                    };
+                    temp_network[page]['timer'] = setInterval(function () {
+                        uni.getNetworkType({
+                            success: function (res) {
+                                if (res.networkType != 'none' && (temp_network[page] || null) != null) {
+                                    // 已初始化则清除定时任务
+                                    if ((temp_network[page]['timer'] || null) != null) {
+                                        clearInterval(temp_network[page]['timer']);
+                                    }
+                                    var pv = temp_network[page];
+                                    delete temp_network[page];
+                                    self.data.network_type_page_record_timer = temp_network;
+                                    // 回调页面
+                                    if (typeof pv.object === 'object' && (pv.method || null) != null) {
+                                        pv.object[pv.method]({ ...(pv.params || {}), ...{ loading: 1 } });
+                                    }
+                                }
+                            },
+                        });
+                    }, 500);
+                    this.data.network_type_page_record_timer = temp_network;
+                }
+            },
+
+            // 获取主题色值
+            // is_light 是否获取浅主色（false, true）
+            get_theme_color(theme, is_light = false) {
+                let color_obj = {
+                    // 主色
+                    red: '#ff0036', // 红色
+                    yellow: '#f6c133', // 黄色
+                    black: '#333333', // 黑色
+                    blue: '#1677ff', // 蓝色
+                    green: '#20a53a', // 绿色
+                    orange: '#fe6f04', // 橙色
+                    brown: '#8B4513', // 棕色
+                    purple: '#623cec', // 紫色
+
+                    // 浅主色
+                    red_light: '#ffdbe2', // 红色
+                    yellow_light: '#ffebd2', // 黄色
+                    black_light: '#dcdcdc', // 黑色
+                    blue_light: '#d1e4ff', // 蓝色
+                    green_light: '#cce8d2', // 绿色
+                    orange_light: '#fde4d1', // 橙色
+                    brown_light: '#eadcd2', // 棕色
+                    purple_light: '#d6cbfb', // 紫色
+                };
+                // 当前主题
+                if ((theme || null) == null) {
+                    theme = this.get_theme_value();
+                }
+                if (is_light) {
+                    theme += '_light';
+                }
+                return color_obj[theme];
+            },
+
+            // 获取主题页面标识
+            get_theme_value_view() {
+                return 'theme-' + this.get_theme_value();
+            },
+
+            // 获取主题
+            get_theme_value() {
+                // 主题类型        主题颜色
+                // 红色 red       #ff0036
+                // 黄色 yellow    #f6c133
+                // 黑色 black     #333333
+                // 绿色 green     #20a53a
+                // 橙色 orange    #fe6f04
+                // 蓝色 blue      #1677ff
+                // 棕色 brown     #8B4513
+                // 紫色 purple    #623cec
+                return uni.getStorageSync('theme') || this.data.default_theme;
+            },
+
+            // 切换主题
+            set_theme_value(value) {
+                // 设置主题缓存
+                uni.setStorageSync('theme', value || this.data.default_theme);
+            },
+
+            // 底部菜单设置
+            set_tabbar(theme) {
+                if(this.data.is_use_native_tabbar == 1) {
+                    // 当前主题
+                    if ((theme || null) == null) {
+                        theme = this.get_theme_value();
+                    }
+
+                    // 整体样式
+                    uni.setTabBarStyle({
+                        selectedColor: this.get_theme_color(theme),
+                        color: '#333',
+                        backgroundColor: '#fff',
+                        borderStyle: 'black'
+                    });
+
+                    // 菜单
+                    uni.setTabBarItem({
+                        index: 0,
+                        iconPath: 'static/images/common/tabbar/home.png',
+                        selectedIconPath: 'static/images/' + theme + '/tabbar/home.png',
+                        text: i18n.t('common.home'),
+                    });
+                    uni.setTabBarItem({
+                        index: 1,
+                        iconPath: 'static/images/common/tabbar/category.png',
+                        selectedIconPath: 'static/images/' + theme + '/tabbar/category.png',
+                        text: i18n.t('common.category'),
+                    });
+                    uni.setTabBarItem({
+                        index: 2,
+                        iconPath: 'static/images/common/tabbar/cart.png',
+                        selectedIconPath: 'static/images/' + theme + '/tabbar/cart.png',
+                        text: i18n.t('common.cart'),
+                    });
+                    uni.setTabBarItem({
+                        index: 3,
+                        iconPath: 'static/images/common/tabbar/user.png',
+                        selectedIconPath: 'static/images/' + theme + '/tabbar/user.png',
+                        text: i18n.t('common.my'),
+                    });
+                }
+            },
+
+            // 数组分组
+            group_arry(arry, sub_group_length) {
+                let index = 0;
+                let new_arry = [];
+                if (arry.length > sub_group_length) {
+                    while (index < arry.length) {
+                        new_arry.push(arry.slice(index, (index += sub_group_length)));
+                    }
+                } else {
+                    new_arry = [arry];
+                }
+                return new_arry;
+            },
+
+            // 数组分组
+            group_arry(arry, sub_group_length) {
+                let index = 0;
+                let new_arry = [];
+                if (arry.length > sub_group_length) {
+                    while (index < arry.length) {
+                        new_arry.push(arry.slice(index, (index += sub_group_length)));
+                    }
+                } else {
+                    new_arry = [arry];
+                }
+                return new_arry;
+            },
+
+            // 颜色转rgba hexValue： 色值  alpha：透明度
+            hex_rgba(hexValue, alpha) {
+                const rgx = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
+                const hex = hexValue.replace(rgx, (m, r, g, b) => r + r + g + g + b + b);
+                const rgb = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+                if (!rgb) {
+                    return hexValue;
+                }
+                const r = parseInt(rgb[1], 16),
+                    g = parseInt(rgb[2], 16),
+                    b = parseInt(rgb[3], 16);
+                return `rgba(${r},${g},${b},${alpha})`;
+            },
+
+            // 判断数组内是否含有相同字段
+            some_arry(arr, val, params) {
+                return arr.some(function (arrVal) {
+                    if (params) {
+                        return val === arrVal[params];
+                    } else {
+                        return val === arrVal;
+                    }
+                });
+            },
+
+            // 更新当前url参数
+            // query:[{key:'',value:''}]
+            update_query_string_parameter(query = []) {
+                // #ifdef H5
+                let url = window.location.href;
+                // 判断没有参数时
+                if (query.length < 1) {
+                    //向当前url添加参数，没有历史记录
+                    window.history.replaceState({ path: url.split('?')[0] }, '', url.split('?')[0]);
+                } else {
+                    query.forEach((item) => {
+                        let re = new RegExp('([?&])' + item.key + '=.*?(&|$)', 'i');
+                        let separator = url.indexOf('?') !== -1 ? '&' : '?';
+                        if (url.match(re)) {
+                            url = url.replace(re, '$1' + item.key + '=' + item.value + '$2');
+                        } else {
+                            url += separator + item.key + '=' + item.value;
+                        }
+                    });
+                    //向当前url添加参数，没有历史记录
+                    window.history.replaceState({ path: url }, '', url);
+                }
+                // #endif
+            },
+
+            // 计算文本宽度
+            string_width(value, max = null) {
+                var width = 0;
+                var reg = /^[A-Za-z0-0]+$/;
+                var arr = value.split('');
+                for (var i in arr) {
+                    width += reg.test(arr[i]) ? 34 : 50;
+                }
+                return max !== null && width > max ? max : width;
+            },
+
+            // weburl地址id值匹配
+            web_url_value_mate(url, rules) {
+                // 匹配成功
+                var status = 0;
+                // 存在数据值
+                var value = null;
+                for (var i in rules) {
+                    if (url.indexOf(rules[i]) != -1) {
+                        var temp = url.split(rules[i]);
+                        if (temp.length > 1) {
+                            temp = temp[1].split('.');
+                            if (temp.length > 0 && (temp[0] || null) != null) {
+                                value = temp[0];
+                            }
+                        }
+                        status = 1;
+                        break;
+                    }
+                }
+                return { status: status, value: value };
+            },
+
+            // 打开权限管理中心
+            open_setting_event() {
+                // #ifdef MP
+                uni.openSetting();
+                // #endif
+                // #ifdef APP
+                uni.openAppAuthorizeSetting();
+                // #endif
+            },
+
+            // 扫码解析处理
+            scan_handle() {
+                // #ifdef H5
+                this.showToast(i18n.t('common.not_supported_scan_tips'));
+                // #endif
+                // #ifndef H5
+                var self = this;
+                uni.scanCode({
+                    success: function (res) {
+                        if (res.result !== '') {
+                            var value = res.result;
+                            // 是否为url地址
+                            if (self.is_url(value)) {
+                                // 是否为商品地址
+                                var goods_arr = ['/goods-', '/goods/index/id/', '=goods/index/id/'];
+                                var goods_ret = self.web_url_value_mate(value, goods_arr);
+                                if (goods_ret.status == 1 && goods_ret.value != null) {
+                                    uni.navigateTo({
+                                        url: '/pages/goods-detail/goods-detail?id=' + goods_ret.value,
+                                    });
+                                    return;
+                                }
+
+                                // 是否为多商户店铺详情地址
+                                var shop_arr = ['/shop-index-detail-', '/plugins/index/pluginsname/shop/pluginscontrol/index/pluginsaction/detail/id/', '=plugins/index/pluginsname/shop/pluginscontrol/index/pluginsaction/detail/id/'];
+                                var shop_ret = self.web_url_value_mate(value, shop_arr);
+                                if (shop_ret.status == 1 && shop_ret.value != null) {
+                                    uni.navigateTo({
+                                        url: '/pages/plugins/shop/detail/detail?id=' + shop_ret.value,
+                                    });
+                                    return;
+                                }
+
+                                // 是否为扫码收款
+                                var scanpay_arr = ['/scanpay-index-index', 'plugins/index/pluginsname/scanpay/pluginscontrol/index/pluginsaction/index', 'plugins/index/pluginsname/scanpay', '/scanpay'];
+                                var scanpay_ret = self.web_url_value_mate(value, scanpay_arr);
+                                if (scanpay_ret.status == 1) {
+                                    var url = '/pages/plugins/scanpay/index/index';
+                                    if (scanpay_ret.value != null) {
+                                        var first = scanpay_ret.value.substr(0, 1);
+                                        if (first == '-') {
+                                            var temp = scanpay_ret.value.substr(1).split('/');
+                                            if (temp.length == 3) {
+                                                url += '?id=' + temp[0] + '&type=' + temp[2];
+                                            }
+                                        } else if (first == '/') {
+                                            var temp = scanpay_ret.value.substr(1).split('/');
+                                            if (temp.length == 4) {
+                                                url += '?id=' + temp[1] + '&type=' + temp[3];
+                                            }
+                                        }
+                                    }
+                                    uni.navigateTo({
+                                        url: url,
+                                    });
+                                    return;
+                                }
+
+                                // 是否为扫码登录
+                                var thirdpartylogin_arr = ['/thirdpartylogin-scan-index-', 'plugins/index/pluginsname/thirdpartylogin/pluginscontrol/scan/pluginsaction/index/id/'];
+                                var thirdpartylogin_ret = self.web_url_value_mate(value, thirdpartylogin_arr);
+                                if (thirdpartylogin_ret.status == 1 && thirdpartylogin_ret.value != null) {
+                                    uni.navigateTo({
+                                        url: '/pages/plugins/thirdpartylogin/index/index?id=' + thirdpartylogin_ret.value,
+                                    });
+                                    return;
+                                }
+
+                                // 默认打开url
+                                self.open_web_view(value);
+                            } else {
+                                self.url_open(value);
+                            }
+                        }
+                    },
+                });
+                // #endif
+            },
+
+            // 获取当前语言
+            get_language_value() {
+                return uni.getLocale() || this.data.default_language;
+            },
+
+            // 选择用户地理位置
+            choose_user_location_event() {
+                // 存在数据则改变状态值
+                var key = this.data.cache_userlocation_key;
+                var result = uni.getStorageSync(key) || null;
+                if(result != null) {
+                    result['status'] = 2;
+                    uni.setStorageSync(key, result);
+                }
+
+                // 进入页面选择位置
+                uni.navigateTo({
+                    url: '/pages/common/open-setting-location/open-setting-location',
+                });
+            },
+
+            // 清除位置缓存信息
+            choice_user_location_remove() {
+                uni.removeStorageSync(this.data.cache_userlocation_key);
+            },
+
+            // 地址信息初始化
+            choice_user_location_init() {
+                // status 0未选择，1已选择，2选择中，3选择失败
+                var result = uni.getStorageSync(this.data.cache_userlocation_key) || null;
+                var user_location = { status: 0 };
+                if (result != null) {
+                    user_location = {
+                        ...user_location,
+                        ...{
+                            name: result.name || null,
+                            address: result.address || null,
+                            lat: result.lat || null,
+                            lng: result.lng || null,
+                            status: result.status || 1,
+                        },
+                    };
+                }
+                // 默认名称
+                var default_name = i18n.t('shopxo-uniapp.app.4v6q86');
+                // 位置选择失败的状态，名称和默认名称不一致则认为是成功的
+                if(user_location.status == 3 && user_location.name != default_name) {
+                    user_location.status = 1;
+                }
+                user_location['text'] = user_location.name || user_location.address || default_name;
+                return user_location;
+            },
+
+            // 获取用户当前位置
+            // object    回调对象
+            // method    回调方法
+            // is_force  强制获取位置
+            get_user_location(object = null, method = null, is_force = false) {
+                if(this.data.get_user_location_status == 1 || is_force) {
+                    var cache_key = this.data.cache_userlocation_key;
+                    var result = uni.getStorageSync(cache_key) || null;
+                    if(result == null) {
+                        // 当前对象
+                        var self = this;
+                        // 当前平台
+                        var client_value = self.application_client_type();
+                        // 微信隐私状态
+                        var is_weixin_privacy = false;
+                        // 是否有网络
+                        var is_network = false;
+                        // 定时验证并获取位置权限
+                        self.data.get_user_location_timer = setInterval(function () {
+                            // 微信环境、协议验证处理
+                            // #ifdef MP-WEIXIN
+                            uni.getPrivacySetting({
+                                success: (res) => {
+                                    if (!res.needAuthorization) {
+                                        is_weixin_privacy = true;
+                                    }
+                                },
+                            });
+                            // #endif
+
+                            // app下先要网络
+                            // #ifdef APP
+                            uni.getNetworkType({
+                                success: function (res) {
+                                    if (res.networkType != 'none') {
+                                        is_network = true;
+                                    }
+                                },
+                            });
+                            // #endif
+
+                            // 是否可以读取位置权限
+                            var status = true;
+                            // 微信环境、必须先同意隐私权限后再弹出获取用户位置权限
+                            if(client_value == 'weixin' && !is_weixin_privacy) {
+                                status = false;
+                            }
+                            // app环境、必须先初始化完成有网络后再弹出获取用户位置权限
+                            if((client_value == 'ios' || client_value == 'android') && !is_network) {
+                                status = false;
+                            }
+                            if(status) {
+                                uni.getLocation({
+                                    type: 'wgs84',
+                                    success: function (res) {
+                                        var address = {
+                                            name: i18n.t('shopxo-uniapp.app.tghyu3'),
+                                            address: '',
+                                            lat: res.latitude || null,
+                                            lng: res.longitude || null,
+                                            status: 1,
+                                        };
+                                        uni.setStorageSync(cache_key, address);
+                                        if (typeof object === 'object' && (method || null) != null) {
+                                            object[method](address);
+                                        }
+                                    }
+                                });
+                                clearInterval(self.data.get_user_location_timer);
+                            }
+                        }, 500);
+                    }
+                }
+            },
+
+            // 清除定时任务
+            clear_interval_handle() {
+                // 清除初始化公共数据回调方法定时任务
+                clearInterval(this.data.common_data_init_back_timer);
+                // 清除网络状态检查方法定时任务
+                var network = this.data.network_type_page_record_timer || null;
+                if (network != null) {
+                    for (var i in network) {
+                        if ((network[i]['timer'] || null) != null) {
+                            clearInterval(network[i]['timer']);
+                        }
+                    }
+                }
+                this.data.network_type_page_record_timer = null;
+                // 清除弹出位置权限提示定时任务
+                clearInterval(this.data.get_user_location_timer);
+            },
+
+            // 商品访问数据存储缓存
+            goods_data_cache_handle(goods_id, goods_data = null) {
+                var key = this.data.cache_goods_data_key;
+                if((goods_data || null) == null) {
+                    var res = uni.getStorageSync(key) || null;
+                    return (res != null && res.id == goods_id) ? res : null;
+                } else {
+                    uni.setStorageSync(key, goods_data);
+                }
+            },
+
+            // 页面导航标题处理
+            set_pages_navigation_bar_title() {
+                // 标题
+                var value = null;
+                // 当前平台
+                var client_value = this.application_client_type();
+                // 当前页面地址
+                var url = this.current_page(false);
+                // 支付宝平台以下条件不增加标题
+                if(client_value == 'alipay') {
+                    // 自定义头页面
+                    var pages_always = [
+                        'pages/plugins/realstore/detail/detail',
+                        'pages/plugins/seckill/index/index',
+                        'pages/plugins/points/index/index',
+                        'pages/plugins/coupon/index/index',
+                        'pages/plugins/signin/detail/detail',
+                        'pages/plugins/membershiplevelvip/index/index',
+                        'pages/plugins/ask/index/index',
+                    ];
+                    // 当前tab页面
+                    if(this.is_system_tabbar_pages('/'+url) != -1 || pages_always.indexOf(url) != -1) {
+                        value = '';
+                    }
+                }
+                // 还没有标题则根据页面自动处理
+                if(value === null) {
+                    // 解析处理key
+                    var arr = url.split('/');
+                        arr = arr.slice(1);
+                        arr = arr.slice(0, -1);
+                    var key = 'pages.'+arr.join('-');
+                    // 读取语言
+                    var value = i18n.t(key);
+                    // 首页则读取当前应用名称
+                    if(this.app_tabbar_pages()[0] == '/'+url) {
+                        value = this.get_application_title();
+                    }
+                }
+                // 设置标题
+                uni.setNavigationBarTitle({
+                    title: value || ''
+                });
+            },
+
+            // 设置导航背景色和颜色
+            set_navigation_bar_color(is_white = null) {
+                var color = '#000000';
+                var bg_color = '#ffffff';
+                var arr = [
+                    'pages/index/index',
+                ];
+                var page = this.current_page(false);
+                if(is_white === true || (is_white === null && arr.indexOf(page) != -1)) {
+                    color = '#ffffff';
+                    bg_color = '#000000';
+                }
+                uni.setNavigationBarColor({
+                    frontColor: color,
+                    backgroundColor: bg_color,
+                });
+            },
+
+            // 底部浮动按钮样式处理
+            bottom_fixed_style_handle() {
+                var obj = this.get_page_object();
+                if(obj != null) {
+                    // undefined值表示未定义则不处理
+                    var temp = obj.bottom_fixed_style == undefined ? ((obj.data || null) == null ? undefined : obj.data.bottom_fixed_style) : '';
+                    if(temp !== undefined && this.is_tabbar_pages()) {
+                        obj.$vm.setData(
+                        {
+                            bottom_fixed_style: 'bottom:'+(((this.app_system_tabbar_height_value()-8)*2)+20)+'rpx'
+                        });
+                    }
+                }
+            },
+
+            // 页面加载事件处理
+            page_event_onload_handle(params) {
+                // 获取用户当前位置
+                this.get_user_location();
+            },
+
+            // 页面展示事件处理
+            page_event_onshow_handle() {
+                //隐藏系统tabbar
+                this.system_hide_tabbar();
+
+                // 底部浮动按钮样式处理
+                this.bottom_fixed_style_handle();
+
+                // 页面顶部导航标题设置
+                this.set_pages_navigation_bar_title();
+
+                // 设置导航背景色和颜色
+                this.set_navigation_bar_color();
+            },
+        },
+
+        // 初始化完成时触发（全局只触发一次）
+        onLaunch(params) {
+            //隐藏系统tabbar
+            this.globalData.system_hide_tabbar();
+        },
+
+        // 启动，或从后台进入前台显示
+        onShow(params) {
+            //隐藏系统tabbar
+            this.globalData.system_hide_tabbar();
+
+            // 公共数据初始化
+            this.globalData.init_config();
+
+            // 设置设备信息
+            this.globalData.set_system_info();
+
+            // 参数处理+缓存
+            this.globalData.set_launch_cache_info(params);
+
+            // 场景值
+            this.globalData.set_scene_data(params);
+        },
+
+        // 从前台进入后台
+        onHide() {
+            this.globalData.clear_interval_handle();
+        },
+
+        // 监听应用退出
+        onExit() {
+            this.globalData.clear_interval_handle();
+        },
+        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/theme.css';
+    @import './common/css/animation.css';
+</style>
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..6610949
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 ShopXO免费开源商城 - uniapp手机端
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..3505d46
--- /dev/null
+++ b/README.md
@@ -0,0 +1,68 @@
+<p align="center">
+<img src="https://shopxoserver.oss-cn-beijing.aliyuncs.com/demo/system/logo.jpg" width="360" />
+</p>
+
+<h3 align="center">ShopXO企业级免费开源电商系统 - uniapp手机端</h3>
+
+<div align="center">
+
+```shell
+如果对您有帮助，您可以点右上角 “Star” 收藏一下 ，获取第一时间更新，谢谢！
+```
+
+</div>
+
+------------------------------------------------------------------------
+
+#### 项目介绍
+* 后端支持依托于ShopXO免费开源电商系统开发的uniapp端主题源码
+* 支持可视化DIY拖拽装修，内置几十种标准组件，热区、魔方、自定义等等...
+* 默认内置8中搭配主色(可自行扩展更多配色)、自由快捷切换适应各大行业需求
+* 已支持小程序（微信、QQ、百度、支付宝、头条&抖音、快手）+ H5 + APP
+
+#### 使用教程
+`程序打包操作需要有一定的编程技术基础、如需帮助请到git平台提issues寻求帮助`
+* 打包教程 [https://doc.shopxo.net/article/1/293727233598554112.html](https://doc.shopxo.net/article/1/293727233598554112.html)
+
+1. 先安装ShopXO免费开源系统 [http://install.shopxo.net/](http://install.shopxo.net/)
+2. 将该源码导入HBuilderX开发工具、顶部工具栏 `运行->运行到小程序模拟器->(根据支持平台自行选择、如 微信开发者工具)`
+3. App.vue中修改 request_url 和 static_url 地址为自己的商城地址即可使用
+4. 主题默认为红色(red)，如更改主题 App.vue文件中修改 default_theme 默认主题标识，也可以到商店搜索【默认主题样式】远程控制主题配色
+5. 发布、HBuilderX开发工具、顶部工具栏 `发行->(根据支持平台自行选择、如 微信开发者工具)`
+
+#### 官方QQ群、答案`shopxo.net`
+* 官方uniapp群：679303149
+
+#### 体验码
+![二维码.jpg](https://shopxoserver.oss-cn-beijing.aliyuncs.com/demo/system/demo-qrcode.jpg)
+
+
+#### 当前项目源代码平台
+* Gitee：[https://gitee.com/zongzhige/shopxo-uniapp](https://gitee.com/zongzhige/shopxo-uniapp)
+* GitHub：[https://github.com/gongfuxiang/shopxo-uniapp](https://github.com/gongfuxiang/shopxo-uniapp)
+* Coding：[https://zongzhige.coding.net/public/shopxo/uniapp/git](https://zongzhige.coding.net/public/shopxo/uniapp/git)
+* GitCode：[https://gitcode.net/zongzhige/shopxo-uniapp](https://gitcode.net/zongzhige/shopxo-uniapp)
+* uni-app：[https://ext.dcloud.net.cn/plugin?id=6380](https://ext.dcloud.net.cn/plugin?id=6380)
+
+#### ShopXO后端源代码平台
+* Gitee：[https://gitee.com/zongzhige/shopxo](https://gitee.com/zongzhige/shopxo)
+* GitHub：[https://github.com/gongfuxiang/shopxo](https://github.com/gongfuxiang/shopxo)
+* Coding：[https://zongzhige.coding.net/public/shopxo/shopxo/git](https://zongzhige.coding.net/public/shopxo/shopxo/git)
+* GitCode：[https://gitcode.net/zongzhige/shopxo](https://gitcode.net/zongzhige/shopxo)
+
+#### DIY装修源代码平台
+* Gitee：[https://gitee.com/zongzhige/shopxo-diy](https://gitee.com/zongzhige/shopxo-diy)
+* GitHub：[https://github.com/gongfuxiang/shopxo-diy](https://github.com/gongfuxiang/shopxo-diy)
+* GitCode：[https://gitcode.net/zongzhige/shopxo-diy](https://gitcode.net/zongzhige/shopxo-diy)
+
+#### API接口文档
+* [https://doc.shopxo.net/article/2.html](https://doc.shopxo.net/article/2.html)
+
+#### 小程序支持多种配色
+![多种配色](https://shopxoserver.oss-cn-beijing.aliyuncs.com/demo/app/color.png "配色.jpg")
+
+#### 小程序效果图片
+![小程序页面](https://shopxoserver.oss-cn-beijing.aliyuncs.com/demo/app/page.png "小程序页面.jpg")
+
+#### 小程序DIY装修
+![DIY图片](https://shopxoserver.oss-cn-beijing.aliyuncs.com/demo/diy/diy.jpg "DIY图片")
\ No newline at end of file
diff --git a/androidPrivacy.json b/androidPrivacy.json
new file mode 100644
index 0000000..1662371
--- /dev/null
+++ b/androidPrivacy.json
@@ -0,0 +1,35 @@
+{
+    "version" : "1",
+    "prompt" : "template",
+    "title" : "服务协议和隐私政策",
+    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://d1.shopxo.vip/?s=agreement/index/document/userregister/is_content/1.html\">《服务协议》</a>和<a href=\"https://d1.shopxo.vip/?s=agreement/index/document/userprivacy/is_content/1.html\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "buttonAccept" : "同意并接受",
+    "buttonRefuse" : "暂不同意",
+    "hrefLoader" : "system|default",
+    "backToExit" : "false",
+    "second" : {
+        "title" : "确认提示",
+        "message" : "　　进入应用前，你需先同意<a href=\"https://d1.shopxo.vip/?s=agreement/index/document/userregister/is_content/1.html\">《服务协议》</a>和<a href=\"https://d1.shopxo.vip/?s=agreement/index/document/userprivacy/is_content/1.html\">《隐私政策》</a>，否则将退出应用。",
+        "buttonAccept" : "同意并继续",
+        "buttonRefuse" : "退出应用"
+    },
+    "disagreeMode" : {
+        "support" : false,
+        "loadNativePlugins" : false,
+        "visitorEntry" : false,
+        "showAlways" : true
+    },
+    "styles" : {
+        "backgroundColor" : "#fff",
+        "borderRadius" : "6px",
+        "title" : {
+            "color" : "#333"
+        },
+        "buttonAccept" : {
+            "color" : "#52C41A"
+        },
+        "buttonRefuse" : {
+            "color" : "#f02720"
+        }
+    }
+}
diff --git a/changelog.md b/changelog.md
new file mode 100644
index 0000000..8b61842
--- /dev/null
+++ b/changelog.md
@@ -0,0 +1,423 @@
+## v6.5.0（2025-03-05）
+1. DIY新增数据选项卡、自定义增强优化
+2. DIY浮动导航支持快捷导航
+3. 订单单号支持复制
+4. 在线客服企业微信客服适配h5处理
+5. 多商户首页支持分类筛选
+6. 商品、文章、活动配置、组合搭配、博客、门店、多商户支持分享图片
+7. 商品详情购买按钮增加链接和复制事件
+8. 门店类型选择优化
+9. 支持同城模式
+10. 新增问诊开方支持购物车
+11. 优惠券新增详情
+
+
+## v6.4.0（2024-12-25）
+1. 支付宝小程序兼容性优化
+2. DIY支持新特性和细节优化
+3. 问答支持富文本
+4. 博客详情无数据错误修复
+5. 门店支持最近选择、地图搜索选择、当前门店切换、支持强制选择门店
+6. 开票支持钱包充值
+7. 用户中心菜单支持未登录展示
+8. 基础信息填写支持授权即提示、并支持手机号码一键绑定
+9. 支付组件优化
+10. 系统扫码默认走商品搜索，门店详情扫码无效修复
+11. 积分商城首页优化
+12. 下单支持填写联系人、联系电话、配送时间
+13. 新增微信小程序收货组件确认
+14. 订单支持订单资源插件
+15. 扫码登录地址解析错误优化
+16. 底部菜单判断优化
+17. app评分优化
+
+
+## v6.3.0（2024-10-22）
+1. 新增DIY装修，可以自由设计模板
+2. 底部菜单后台DIY管理、并保留原生
+3. 商品足迹，增加收藏支持加入购物车
+4. 商品评论优化
+5. 初始化配置优化
+6. 扫码细节优化，适配h5
+7. 多商户支持二级分类、头部分离优化
+8. 全站走大圆角风格
+9. 新增公共commom组件、支持onshow事件
+10. 微信隐私提示、app管理、用户基础使用提到公共层
+11. 定位独立为组件
+12. 新增系统扫码统一接口
+13. 新增协议
+14. 新增送礼插件
+15. 商品详情导航优化
+16. 支付优化
+17. 充值支付方式未选中修复
+18. 文章，门店优化
+19. 多商户和门店新增核销
+20. 礼品卡卡密数据展示优化，新增扫码兑换
+21. 多语言优化
+22. 优惠券细节优化
+
+
+
+## v6.2.0.5（2024-07-11）
+1. 门店基础模式优化支持（基础、商品、基础+商品）
+2. 文章增加封面支持
+
+
+
+## v6.2.0.4（2024-07-10）
+1. 商品详情更多门店追踪商品
+
+
+
+## v6.2.0.3（2024-07-09）
+1. 多商户和门店新增核销
+
+
+
+## v6.2.0.2（2024-07-06）
+1. 礼品卡卡密数据展示优化
+2. 礼品卡新增扫码兑换
+
+
+
+## v6.2.0.1（2024-07-05）
+1. 修复安卓app下多语言切换无效问题
+
+
+
+## v6.2.0（2024-07-04）
+1. 新增礼品卡
+2. 搜索需要登录优化
+3. 登录input优化
+4. 支持多语言
+5. 增加企业微信客服支持
+6. 增加app版本更新
+7. 增加app评分提示
+8. 增加关于我们页面
+9. 钱包提现增加手续费
+10. 首页商品魔方白色模式错误修复
+11. 基础模式支持商品展示
+12. 店铺简介改为富文本编辑器
+13. 商品规格只有一级初始化优化
+14. 购物车页面底部导航高度优化
+15. 支持防伪码扫码
+16. 批量下单商品规格图片支持放大查看
+17. 新增骨架屏
+18. 页面加载层优化
+19. 排序和导航搜索展示加载
+20. 订单售后页面客服优化
+21. 订单开票加载错误修复
+22. 新增获取用户当前位置
+23. 订单售后详情入口地址错误修复
+24. 其他细节优化
+25. 门店和多商户客服展示优化
+26. 门店新增基础模式
+27. 首页中间广告展示优化
+28. 独立购物车页面左上角返回按钮颜色错误修复
+29. 订单和门店订单快递信息未正常展示修复
+30. 钱包优化字段错误修复
+31. 商品详情问答优化展示错误修复，及首页加载优化
+32. 购物车滑动删除收藏数据类型错误修复
+33. 设置页面未登录也可以进入
+34. app新增打开权限控制管理
+
+
+
+## v6.1.0（2024-04-25）
+1. 秒杀首页无数据报错修复
+2. 商品页面批发展示优化
+3. 积分商城首页优
+4. 多商户和多门店客服样式优化
+5. 多商户领券和组合搭配优化
+6. 门店下单优化
+7. 商品页面门店模式下底部操作按钮新增加载
+8. 加载层logo默认读取后台配置
+9. 优化支付宝小程序自定义页面标题
+10. 第三方账户绑定去掉小程序入口
+11. 魔方新增更多样式
+12. 底部名称直接读取站点名称
+13. 商品、博文轮播图片模式优化
+14. 商品页批发属性未定义错误修复
+15. 虚拟币页面加载细节优化
+
+
+
+## v6.0.0（2024-04-15）
+1. 地址导入错误修复
+2. 商品支持指定规格选中
+3. 支付app优化，首页标题优化
+4. 商品规格点击支持展示模式
+5. 积分商城扫码领取积分
+6. 购物车顶部导航优化，适配支付宝小程序
+7. 选择系统地址优化
+8. 购物车，分类优化
+9. 物流查询支持多包裹
+10. 下单运费支持多运费选择
+11. 商品是否展示和符号及单位适配
+12. 多语言切换优化
+13. 首页汇率切换模仿价格不改变原因修复
+14. paypal支付支持
+15. 无网络提示优化
+16. 博客上传图片错误，首页顶部背景色，分享地址优化
+17. 组件优化公共和局部组件
+18. 增加虚拟币插件（可转账、转换、充值、提现、支付）
+19. 登录和手机绑定优化
+20. 支持密码修改
+21. 支持绑定邮箱
+22. 支持绑定第三方登录（微信、qq、支付宝）
+23. 修复店铺布局错乱问题
+24. 分包预加载优化
+25. 打开商品速度优化
+26. 首页打开速度优化
+27. 购物车支持优惠明细查看
+28. 地址一键导入错误修复
+29. 多语言兼容头条/抖音小程序
+30. pages支持多语言切换
+31. 商品支持指定规格选中
+
+
+
+## v5.0.0（2024-01-19）
+1. 支持APP（IOS+Android）
+2. 支持多语言（中文、繁体、英文、西班牙）
+3. 购物车支持优惠预计算展示
+4. 购物车支持门店购物车双向切换
+5. 商品页支持门店购物车展示
+6. 门店详情支持默认下单类型选择提示
+7. 支持博文发布
+8. 新增商品评论
+9. 支持订单商品表单
+10. 新增下单备注预选择
+11. 汇率切换支持图标
+12. 订单再次购买支持回购和加购物车选择
+13. APP登录支持（微信、QQ、苹果、谷歌、本机手机）
+14. 商品分类页面带排序
+15. 订单仅之前的支付方式可支付
+16. 下单积分自定义
+17. 首页支持地理位置选择
+18. h5下首页搜搜框宽度错位优化
+19. 地址复制错别字优化
+20. 问答分享地址优化
+21. 钱包充值页面空修复，问答评论优化
+22. 博客评价开关优化
+23. 用户中心样式优化
+24. 分类页面H5优化
+25. 兼容支付宝小程序样式
+
+
+
+## v4.0.0（2023-11-10）
+1. 手机端全新UI、极致体验优化
+2. 首页轮播支持背景色自动切换
+3. 分配页面支持全部分配查看
+4. 钱包支持转账
+5. 新增扫码登录及付款
+6. 新增商品魔方
+7. 购物车新增商品展示
+8. 问答支持评论和点赞
+9. 客服和快捷导航优化
+10. 商品详情分享和收藏优化
+
+
+## v3.0.3（2023-09-18）
+1. 组合搭配支持展示商品
+2. 商品列表去除封面错误提示
+
+
+## v3.0.2（2023-09-11）
+1. 用户基础信息填写，昵称判断有误修复
+2. 订单售后退货地址错误修复
+3. 新增微信小程序隐私弹窗说明
+
+
+## v3.0.1（2023-09-03）
+1. 用户基础信息web端错误修复
+2. 关闭按钮多端兼容性处理
+3. 下单页面积分使用提示优化
+
+
+## v3.0.0（2023-08-28）
+1. 新增微信小程序可以提示完善头像及昵称
+2. ipad模型下uniapp顶部错位
+3. 分销支持订单信息插件及数据统计GMV维度、我的团队新增搜索条件
+4. 秒杀适配v3.0新版本
+5. 购物车列表默认选中
+6. 购物车抛物线优化、搜索页面新增页面搜索框，分类页面支持搜索进入独立页面
+7. 组合搭配支持首页展示和组建封装
+8. 数据列表读取避免重复请求
+9. 分类页面支持标签展示
+10. 多商户支持评分、资质查看
+11. 开票默认值优化
+12. form表单支付错误处理
+13. 购物车无效商品支持选择删除
+14. 快捷加购错误修复
+15. 批量下单数量更新价格错误修复
+16. 单页打开领取优惠券提示
+17. 分包优化
+
+
+## v2.3.3（2023-04-10）
+* 商品列表使用统一组件
+* 商品参数新增弹窗展示
+* 初始访问登录页面优化
+* 公共url打开支持地图、电话、外部小程序协议方式
+* 适配手机底部横线
+* 轮播兼容iphone圆角失效问题
+* 用户中心菜单支持列表展示样式
+* 搜索页面支持九方格和列表展示样式
+* 分类支持参数指定跳转
+* icon导航图标支持纯图片
+* 分类和门店详情适配规格起购数及限购数
+* 起购数和限购数提升 到商品规格级别
+* 地址新增编号快速搜索选择
+* 订单售后页面新增客服展示
+* 购买和加购分离统一组件
+* 提现初始错误修复
+* 立即购买支持多商品
+* 积分使用兑换不足提示
+* 博客新增评论、点赞
+* 新增组合搭配
+* 新增列表快捷加入购物车
+* 商品列表新增错误提示
+* 商家详情新增搜索全站开关控制
+* 门店详情新增扫码开关控制
+* 新增多规格批量下单
+* 插件分包处理
+
+
+## v2.3.2（2022-11-30）
+* 门店详情支持多规格直接加购
+* 分类页面支持多规格直接加购+购物车操作
+* 新增会员码
+* 新增钱包付款码
+* 新增个人资料修改
+* 新增手机号码修改
+* 新增账号注销
+* 新增条码二维码生成组件
+* 新增用户ID展示
+* 购物车分离优化
+* 适配微信小程序登录新规
+* 可视化新增图文、图片魔方、自定义html组件，商品支持左图右文样式
+* 下单时间优化、支持默认提示
+
+
+## v2.3.1（2022-10-23）
+* 支付宝获取地图权限优化
+* 头条小程序分类不铺满问题修复
+* 优化商品分类滑动方案
+* 位置选择优化
+
+
+## v2.3.0（2022-08-16）
+* 左右滚动最后一个元素显示不全修复
+* 适配paypal支付
+* 会员购买支付优化
+* 去除头条小程序自定义导航
+* 新增虚拟订单快速提交订单
+* 头条小程序支持一键获取手机号码登录
+* 多商户首页支持自动模式
+* 优惠券支持多商户
+* 商品错误情况下新增返回按钮
+* 限时秒杀优化
+* 博客搜索页面分享优化
+
+
+## v2.2.9（2022-07-11）
+* 首页插件数据支持按顺序渲染
+* 商品分类支持商品列表模式展示
+* 商品详情支持默认选中第一个有效规格
+* 商品详情快捷加购自动返回
+* 下单地址限制优化
+* 多商户首页支持多种样式展示
+* 商品url地址使用后端生成、购买导航新增url事件、左侧返回优化
+* 登录绑定手机返回优化
+* 搜索页面优化、避免返回事件重复加载
+
+
+## v2.2.8（2022-05-20）
+* 活动配置首页推荐支持（图文、九方格、左右滚动）样式展示
+* 多商户新增店铺认证资质展示
+* 门店详情支持二级分类
+* 可视化数据处理错误修复
+* 退出仅清除用户信息、微信自动登录强制绑定账号循环修复
+* 主题色样式class错误修复
+* 适配快手小程序
+
+
+## v2.2.7（2022-04-22）
+* 用户地址支持地理位置选择和地址信息智能识别
+* 登录返回上一页，h5支持微信自动登录
+* 门店首页新增地理位置选择弹窗、门店详情优化
+* 商品详情页面导航返回逻辑优化
+* 首页搜索和导航固定控制优化
+* 博客详情新增分享入口
+* 门店详情新增返回按钮关闭开关（适合独立打包）
+
+
+## v2.2.6（2022-04-07）
+* 集成新的客服系统、商品页调整为底部导航入口
+* 下单可直接使用门店次卡消费
+* 门店详情数据改为分页模式、提高效率
+* 商品详情新增相关门店列表入口
+* 商品详情底部导航购物车新增可控开关
+* 商品详情页提示优化
+* 新增可关闭原始购买功能、仅可进入门店购买
+* 标签详情分享地址id为空修复
+* 支持设置默认下单类型
+* 新增商品详情购物车展示开关（App.vue中设置）
+* 新增分享及转发使用页面设置的默认图片及系统默认图片开关（App.vue中设置）
+
+
+## v2.2.5（2022-03-10）
+* 基础组件类库更新
+* 商品详情新增智能工具插件信息提示
+* 订单取消后隐藏支付按钮，细节优化
+* 登录加提现优化
+* 去除微信圈子组件
+* 分享默认地址优化
+* 新增门店独立首页和搜索页
+* 新增分享及转发使用页面设置的图片开关
+
+
+## v2.2.4（2022-02-16）
+* 商品海报配置优化
+* 博客支持首页展示及优化
+* 新增门店列表和详情
+* 商品支持自定义返回
+* 支持自定义购买模式
+* 适配第三方登录插件
+* 下单支持0元不用选择支付方式
+* 下单页面支持指定时间选择
+* 系统参数读取优化
+
+
+## v2.2.3（2021-12-13）
+* 整体适配H5端
+* 订单、钱包、会员等级支付优化适配
+* 支持（账号、手机、邮箱）登录注册方式
+* 分享逻辑优化全局处理
+* 分销新增上级用户、阶梯返佣提示
+* 新增独立新增错误页面
+* 适配第三方登录插件
+* 支持线下支付自定义信息展示
+* 规格切换购买数量错误修复
+* 富文本详情支持视频、超链接、图片预览
+
+
+## v2.2.2（2021-11-23）
+* 限时秒杀插件支持独立首页
+* 活动配置插件支持优惠价格设定
+* 标签插件
+* 中间广告插件
+* 弹屏广告插件
+* 哀悼插件
+* 文章支持分类页面
+* 博客插件
+* 分销、会员等级增强版、钱包全面支持小程序
+* 用户授权获取用户信息API
+* 可视化索引读取错误修复
+* 支持菜鸟物流查询
+
+
+## v2.2.1（2021-10-24）
+* 支持微信小程序（首页、分类、购物车、用户中心、商品搜索、商品详情、订单确认、授权登录、订单管理、订单售后、商品收藏、商品足迹、直播、签到、积分商城、多商户、钱包、批发）
\ No newline at end of file
diff --git a/common/css/animation.css b/common/css/animation.css
new file mode 100644
index 0000000..65f6184
--- /dev/null
+++ b/common/css/animation.css
@@ -0,0 +1,712 @@
+
+/*
+* 垂直放大
+*/
+.scale-up-ver-bottom {
+	-webkit-animation: scale-up-ver-bottom 1s cubic-bezier(0.390, 0.575, 0.565, 1.000) both;
+	        animation: scale-up-ver-bottom 1s cubic-bezier(0.390, 0.575, 0.565, 1.000) both;
+}
+
+.scale-up-ver-bottom-infinite {
+	-webkit-animation: scale-up-ver-bottom 1s cubic-bezier(0.390, 0.575, 0.565, 1.000) infinite both;
+	        animation: scale-up-ver-bottom 1s cubic-bezier(0.390, 0.575, 0.565, 1.000) infinite both;
+}
+@keyframes scale-up-ver-bottom {
+    0% {
+        -webkit-transform: scaleY(0.4);
+                transform: scaleY(0.4);
+        -webkit-transform-origin: 50%;
+                transform-origin: 50%;
+    }
+    80% {
+        -webkit-transform: scaleY(1);
+                transform: scaleY(1);
+        -webkit-transform-origin: 50%;
+                transform-origin: 50%;
+    }
+    85% {
+        -webkit-transform: rotate(-8deg);
+                transform: rotate(-8deg);
+    }
+    95% {
+        -webkit-transform: rotate(8deg);
+                transform: rotate(8deg);
+    }
+    100% {
+        -webkit-transform: rotate(0);
+                transform: rotate(0);
+    }
+}
+/*
+* 交替垂直放大
+*/
+.scale-up-ver-bottom-alternate {
+    -webkit-animation: scale-up-ver-bottom-alternate 1s cubic-bezier(0.390, 0.575, 0.565, 1.000) alternate both;
+	        animation: scale-up-ver-bottom-alternate 1s cubic-bezier(0.390, 0.575, 0.565, 1.000) alternate both;
+}
+.scale-up-ver-bottom-alternate-infinite {
+    -webkit-animation: scale-up-ver-bottom-alternate 1s cubic-bezier(0.390, 0.575, 0.565, 1.000) infinite alternate both;
+	        animation: scale-up-ver-bottom-alternate 1s cubic-bezier(0.390, 0.575, 0.565, 1.000) infinite alternate both;
+}
+@keyframes scale-up-ver-bottom-alternate {
+    0% {
+        -webkit-transform: scaleY(0.4);
+                transform: scaleY(0.4);
+        -webkit-transform-origin: 0% 100%;
+                transform-origin: 0% 100%;
+    }
+    100% {
+        -webkit-transform: scaleY(1);
+                transform: scaleY(1);
+        -webkit-transform-origin: 0% 100%;
+                transform-origin: 0% 100%;
+    }
+}
+/*
+* 中间区域放大
+*/
+.scale-up-ver-center {
+	-webkit-animation: scale-up-ver-center 1s cubic-bezier(0.390, 0.575, 0.565, 1.000) both;
+	        animation: scale-up-ver-center 1s cubic-bezier(0.390, 0.575, 0.565, 1.000) both;
+}
+.scale-up-ver-center-infinite {
+	-webkit-animation: scale-up-ver-center 1s cubic-bezier(0.390, 0.575, 0.565, 1.000) infinite alternate both;
+	        animation: scale-up-ver-center 1s cubic-bezier(0.390, 0.575, 0.565, 1.000) infinite alternate both;
+}
+
+@keyframes scale-up-ver-center {
+    0% {
+      -webkit-transform: scaleY(0.4);
+              transform: scaleY(0.4);
+    }
+    100% {
+      -webkit-transform: scaleY(1);
+              transform: scaleY(1);
+    }
+}
+
+/*
+* 淡出
+.
+*/fade-out-fwd {
+	-webkit-animation: fade-out-fwd 2s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
+	        animation: fade-out-fwd 2s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
+}
+.fade-out-fwd-infinite {
+	-webkit-animation: fade-out-fwd 2s cubic-bezier(0.250, 0.460, 0.450, 0.940) infinite both;
+	        animation: fade-out-fwd 2s cubic-bezier(0.250, 0.460, 0.450, 0.940) infinite both;
+}
+@keyframes fade-out-fwd {
+    0% {
+      -webkit-transform: translateZ(0);
+              transform: translateZ(0);
+      opacity: 1;
+    }
+    100% {
+      -webkit-transform: translateZ(80px);
+              transform: translateZ(80px);
+      opacity: 0;
+    }
+}
+/*
+* 淡入
+*/
+.fade-in-bck {
+	-webkit-animation: fade-in-bck 2s cubic-bezier(0.390, 0.575, 0.565, 1.000) both;
+	        animation: fade-in-bck 2s cubic-bezier(0.390, 0.575, 0.565, 1.000) both;
+}
+.fade-in-bck-infinite {
+	-webkit-animation: fade-in-bck 2s cubic-bezier(0.390, 0.575, 0.565, 1.000) infinite both;
+	        animation: fade-in-bck 2s cubic-bezier(0.390, 0.575, 0.565, 1.000) infinite both;
+}
+/*
+* 淡入淡出
+*/
+.fade-in-bck-alternate {
+    -webkit-animation: fade-in-bck 2s cubic-bezier(0.390, 0.575, 0.565, 1.000) alternate both;
+	        animation: fade-in-bck 2s cubic-bezier(0.390, 0.575, 0.565, 1.000) alternate both;
+}
+.fade-in-bck-alternate-infinite {
+    -webkit-animation: fade-in-bck 2s cubic-bezier(0.390, 0.575, 0.565, 1.000) infinite alternate both;
+	        animation: fade-in-bck 2s cubic-bezier(0.390, 0.575, 0.565, 1.000) infinite alternate both;
+}
+@keyframes fade-in-bck {
+    0% {
+      -webkit-transform: translateZ(80px);
+              transform: translateZ(80px);
+      opacity: 0;
+    }
+    100% {
+      -webkit-transform: translateZ(0);
+              transform: translateZ(0);
+      opacity: 1;
+    }
+}
+/*
+* 文字铺开
+*/
+.tracking-in-expand {
+	-webkit-animation: tracking-in-expand 2s cubic-bezier(0.215, 0.610, 0.355, 1.000) both;
+	        animation: tracking-in-expand 2s cubic-bezier(0.215, 0.610, 0.355, 1.000) both;
+}
+
+.tracking-in-expand-infinite {
+	-webkit-animation: tracking-in-expand 2s cubic-bezier(0.215, 0.610, 0.355, 1.000) infinite both;
+	        animation: tracking-in-expand 2s cubic-bezier(0.215, 0.610, 0.355, 1.000) infinite both;
+}
+
+@keyframes tracking-in-expand {
+    0% {
+      letter-spacing: -0.5em;
+      opacity: 0;
+    }
+    40% {
+      opacity: 0.6;
+    }
+    100% {
+      opacity: 1;
+    }
+}
+
+/*
+* 心跳
+*/
+.heartbeat {
+	-webkit-animation: heartbeat 1s ease-in-out both;
+	        animation: heartbeat 1s ease-in-out both;
+}
+
+.heartbeat-infinite {
+	-webkit-animation: heartbeat 1s ease-in-out infinite both;
+	        animation: heartbeat 1s ease-in-out infinite both;
+}
+
+@keyframes heartbeat {
+    from {
+      -webkit-transform: scale(1);
+              transform: scale(1);
+      -webkit-transform-origin: center center;
+              transform-origin: center center;
+      -webkit-animation-timing-function: ease-out;
+              animation-timing-function: ease-out;
+    }
+    10% {
+      -webkit-transform: scale(0.91);
+              transform: scale(0.91);
+      -webkit-animation-timing-function: ease-in;
+              animation-timing-function: ease-in;
+    }
+    17% {
+      -webkit-transform: scale(0.98);
+              transform: scale(0.98);
+      -webkit-animation-timing-function: ease-out;
+              animation-timing-function: ease-out;
+    }
+    33% {
+      -webkit-transform: scale(0.87);
+              transform: scale(0.87);
+      -webkit-animation-timing-function: ease-in;
+              animation-timing-function: ease-in;
+    }
+    45% {
+      -webkit-transform: scale(1);
+              transform: scale(1);
+      -webkit-animation-timing-function: ease-out;
+              animation-timing-function: ease-out;
+    }
+}
+
+/*
+* 脉动
+*/
+.pulsate-bck {
+	-webkit-animation: pulsate-bck 1s ease-in-out both;
+	        animation: pulsate-bck 1s ease-in-out both;
+}
+
+.pulsate-bck-infinite {
+	-webkit-animation: pulsate-bck 1s ease-in-out infinite both;
+	        animation: pulsate-bck 1s ease-in-out infinite both;
+}
+
+@keyframes pulsate-bck {
+    0% {
+      -webkit-transform: scale(1);
+              transform: scale(1);
+    }
+    50% {
+      -webkit-transform: scale(0.9);
+              transform: scale(0.9);
+    }
+    100% {
+      -webkit-transform: scale(1);
+              transform: scale(1);
+    }
+}
+
+/*
+* 向上弹跳
+*/
+.bounce-top {
+	-webkit-animation: bounce-top 1.5s both;
+	        animation: bounce-top 1.5s both;
+}
+.bounce-top-infinite {
+	-webkit-animation: bounce-top 1.5s infinite both;
+	        animation: bounce-top 1.5s infinite both;
+}
+
+@keyframes bounce-top {
+    0%, 30%, 60%, 100% {
+      -webkit-transform: translateY(0);
+              transform: translateY(0);
+      -webkit-animation-timing-function: ease-out;
+              animation-timing-function: ease-out;
+    }
+    15% {
+      -webkit-transform: translateY(-40px);
+              transform: translateY(-40px);
+      -webkit-animation-timing-function: ease-in;
+              animation-timing-function: ease-in;
+    }
+    45% {
+        -webkit-transform: translateY(-20px);
+                transform: translateY(-20px);
+        -webkit-animation-timing-function: ease-in;
+              animation-timing-function: ease-in;
+    }
+    75% {
+      -webkit-transform: translateY(-8px);
+              transform: translateY(-8px);
+      -webkit-animation-timing-function: ease-in;
+              animation-timing-function: ease-in;
+    }
+}
+
+/*
+* 向下弹跳
+*/
+.bounce-bottom {
+	-webkit-animation: bounce-bottom 1.5s both;
+	        animation: bounce-bottom 1.5s both;
+}
+.bounce-bottom-infinite {
+	-webkit-animation: bounce-bottom 1.5s infinite both;
+	        animation: bounce-bottom 1.5s infinite both;
+}
+
+@keyframes bounce-bottom {
+    0%, 30%, 60%, 100% {
+        -webkit-transform: translateY(0);
+                transform: translateY(0);
+        -webkit-animation-timing-function: ease-out;
+                animation-timing-function: ease-out;
+    }
+    15% {
+        -webkit-transform: translateY(40px);
+                transform: translateY(40px);
+        -webkit-animation-timing-function: ease-in;
+                animation-timing-function: ease-in;
+    }
+    45% {
+        -webkit-transform: translateY(20px);
+                transform: translateY(20px);
+        -webkit-animation-timing-function: ease-in;
+                animation-timing-function: ease-in;
+    }
+    75% {
+        -webkit-transform: translateY(8px);
+                transform: translateY(8px);
+        -webkit-animation-timing-function: ease-in;
+                animation-timing-function: ease-in;
+    }
+}
+
+/*
+* 向左弹跳
+*/
+.bounce-left {
+	-webkit-animation: bounce-left 1.5s both;
+	        animation: bounce-left 1.5s both;
+}
+.bounce-left-infinite {
+	-webkit-animation: bounce-left 1.5s infinite both;
+	        animation: bounce-left 1.5s infinite both;
+}
+
+@keyframes bounce-left {
+    0%, 30%, 60%, 100% {
+        -webkit-transform: translateX(0);
+                transform: translateX(0);
+        -webkit-animation-timing-function: ease-out;
+                animation-timing-function: ease-out;
+    }
+    15% {
+        -webkit-transform: translateX(-40px);
+                transform: translateX(-40px);
+        -webkit-animation-timing-function: ease-in;
+                animation-timing-function: ease-in;
+    }
+    45% {
+        -webkit-transform: translateX(-20px);
+                transform: translateX(-20px);
+        -webkit-animation-timing-function: ease-in;
+                animation-timing-function: ease-in;
+    }
+    75% {
+        -webkit-transform: translateX(-8px);
+                transform: translateX(-8px);
+        -webkit-animation-timing-function: ease-in;
+                animation-timing-function: ease-in;
+    }
+}
+/*
+* 向右弹跳
+*/
+.bounce-right {
+	-webkit-animation: bounce-right 1.5s both;
+	        animation: bounce-right 1.5s both;
+}
+.bounce-right-infinite {
+	-webkit-animation: bounce-right 1.5s infinite both;
+	        animation: bounce-right 1.5s infinite both;
+}
+
+@keyframes bounce-right {
+    0%, 30%, 60%, 100% {
+        -webkit-transform: translateX(0);
+                transform: translateX(0);
+        -webkit-animation-timing-function: ease-out;
+                animation-timing-function: ease-out;
+    }
+    15% {
+        -webkit-transform: translateX(40px);
+                transform: translateX(40px);
+        -webkit-animation-timing-function: ease-in;
+                animation-timing-function: ease-in;
+    }
+    45% {
+        -webkit-transform: translateX(20px);
+                transform: translateX(20px);
+        -webkit-animation-timing-function: ease-in;
+                animation-timing-function: ease-in;
+    }
+    75% {
+        -webkit-transform: translateX(8px);
+                transform: translateX(8px);
+        -webkit-animation-timing-function: ease-in;
+                animation-timing-function: ease-in;
+    }
+}
+/*
+* 左侧弹跳
+*/
+.bounce-in-left {
+	-webkit-animation: bounce-in-left 2s both;
+	        animation: bounce-in-left 2s both;
+}
+.bounce-in-left-infinite {
+	-webkit-animation: bounce-in-left 2s infinite both;
+	        animation: bounce-in-left 2s infinite both;
+}
+
+@keyframes bounce-in-left {
+    0% {
+      -webkit-transform: translateX(-500px);
+              transform: translateX(-500px);
+      -webkit-animation-timing-function: ease-in;
+              animation-timing-function: ease-in;
+      opacity: 0;
+    }
+    38% {
+      -webkit-transform: translateX(0);
+              transform: translateX(0);
+      -webkit-animation-timing-function: ease-out;
+              animation-timing-function: ease-out;
+      opacity: 1;
+    }
+    55% {
+      -webkit-transform: translateX(-68px);
+              transform: translateX(-68px);
+      -webkit-animation-timing-function: ease-in;
+              animation-timing-function: ease-in;
+    }
+    72% {
+      -webkit-transform: translateX(0);
+              transform: translateX(0);
+      -webkit-animation-timing-function: ease-out;
+              animation-timing-function: ease-out;
+    }
+    81% {
+      -webkit-transform: translateX(-28px);
+              transform: translateX(-28px);
+      -webkit-animation-timing-function: ease-in;
+              animation-timing-function: ease-in;
+    }
+    90% {
+      -webkit-transform: translateX(0);
+              transform: translateX(0);
+      -webkit-animation-timing-function: ease-out;
+              animation-timing-function: ease-out;
+    }
+    95% {
+      -webkit-transform: translateX(-8px);
+              transform: translateX(-8px);
+      -webkit-animation-timing-function: ease-in;
+              animation-timing-function: ease-in;
+    }
+    100% {
+      -webkit-transform: translateX(0);
+              transform: translateX(0);
+      -webkit-animation-timing-function: ease-out;
+              animation-timing-function: ease-out;
+    }
+}
+
+/*
+* 翻转
+*/
+.flip-in-diag-2-tl {
+	-webkit-animation: flip-in-diag-2-tl 2s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
+	        animation: flip-in-diag-2-tl 2s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
+}
+.flip-in-diag-2-tl-infinite {
+	-webkit-animation: flip-in-diag-2-tl 2s cubic-bezier(0.250, 0.460, 0.450, 0.940) infinite both;
+	        animation: flip-in-diag-2-tl 2s cubic-bezier(0.250, 0.460, 0.450, 0.940) infinite both;
+}
+
+@keyframes flip-in-diag-2-tl {
+    0% {
+      -webkit-transform: rotate3d(-1, 1, 0, 80deg);
+              transform: rotate3d(-1, 1, 0, 80deg);
+      opacity: 0;
+    }
+    100% {
+      -webkit-transform: rotate3d(1, 1, 0, 0deg);
+              transform: rotate3d(1, 1, 0, 0deg);
+      opacity: 1;
+    }
+}
+
+/*
+* 从左滑动
+*/
+.slide-in-left {
+	-webkit-animation: slide-in-left 2s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
+	        animation: slide-in-left 2s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
+}
+
+.slide-in-left-infinite {
+	-webkit-animation: slide-in-left 2s cubic-bezier(0.250, 0.460, 0.450, 0.940) infinite both;
+	        animation: slide-in-left 2s cubic-bezier(0.250, 0.460, 0.450, 0.940) infinite both;
+}
+
+@keyframes slide-in-left {
+    0% {
+      -webkit-transform: translateX(-500px);
+              transform: translateX(-500px);
+      opacity: 0;
+    }
+    100% {
+      -webkit-transform: translateX(0);
+              transform: translateX(0);
+      opacity: 1;
+    }
+}
+
+/*
+* 在fwd中心滑动
+*/
+.slide-in-fwd-center {
+	-webkit-animation: slide-in-fwd-center 2s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
+	        animation: slide-in-fwd-center 2s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
+}
+
+.slide-in-fwd-center-infinite {
+	-webkit-animation: slide-in-fwd-center 2s cubic-bezier(0.250, 0.460, 0.450, 0.940) infinite both;
+	        animation: slide-in-fwd-center 2s cubic-bezier(0.250, 0.460, 0.450, 0.940) infinite both;
+}
+
+@keyframes slide-in-fwd-center {
+    0% {
+      -webkit-transform: translateZ(-1400px);
+              transform: translateZ(-1400px);
+      opacity: 0;
+    }
+    100% {
+      -webkit-transform: translateZ(0);
+              transform: translateZ(0);
+      opacity: 1;
+    }
+  }
+/*
+* 左前轮旋转
+*/
+.swirl-in-left-fwd {
+	-webkit-animation: swirl-in-left-fwd 2s ease-out both;
+	        animation: swirl-in-left-fwd 2s ease-out both;
+}
+.swirl-in-left-fwd-infinite {
+	-webkit-animation: swirl-in-left-fwd 2s ease-out infinite both;
+	        animation: swirl-in-left-fwd 2s ease-out infinite both;
+}
+@keyframes swirl-in-left-fwd {
+    0% {
+      -webkit-transform: rotate(-540deg) scale(0);
+              transform: rotate(-540deg) scale(0);
+      -webkit-transform-origin: 0 50%;
+              transform-origin: 0 50%;
+      opacity: 0;
+    }
+    100% {
+      -webkit-transform: rotate(0) scale(1);
+              transform: rotate(0) scale(1);
+      -webkit-transform-origin: 0 50%;
+              transform-origin: 0 50%;
+      opacity: 1;
+    }
+}
+/*
+* 摇动
+*/
+.shake-bottom {
+	-webkit-animation: shake-bottom 1s cubic-bezier(0.455, 0.030, 0.515, 0.955) both;
+	        animation: shake-bottom 1s cubic-bezier(0.455, 0.030, 0.515, 0.955) both;
+}
+.shake-bottom-infinite {
+	-webkit-animation: shake-bottom 1s cubic-bezier(0.455, 0.030, 0.515, 0.955) infinite both;
+	        animation: shake-bottom 1s cubic-bezier(0.455, 0.030, 0.515, 0.955) infinite both;
+}
+@keyframes shake-bottom {
+    0% {
+        -webkit-transform: scale(1) rotate(0deg);
+                transform: scale(1) rotate(0deg);
+        -webkit-transform-origin: 50%;
+                transform-origin: 50%;
+    }
+    80% {
+        -webkit-transform: scale(1.2);
+                transform: scale(1.2);
+        -webkit-transform-origin: 50%;
+                transform-origin: 50%;
+    }
+    85% {
+      -webkit-transform: rotate(-16deg);
+              transform: rotate(-16deg);
+    }
+    95% {
+      -webkit-transform: rotate(16deg);
+              transform: rotate(16deg);
+    }
+    100% {
+        -webkit-transform: scale(1);
+                transform: scale(1);
+        -webkit-transform-origin: 50%;
+                transform-origin: 50%;
+    }
+  }
+/*
+* 震动
+*/
+.vibrate {
+	-webkit-animation: vibrate 0.3s linear both;
+	        animation: vibrate 0.3s linear both;
+}
+.vibrate-infinite {
+	-webkit-animation: vibrate 0.3s linear infinite both;
+	        animation: vibrate 0.3s linear infinite both;
+}
+
+@keyframes vibrate {
+    0% {
+      -webkit-transform: translate(0);
+              transform: translate(0);
+    }
+    20% {
+      -webkit-transform: translate(2px, -2px);
+              transform: translate(2px, -2px);
+    }
+    40% {
+      -webkit-transform: translate(2px, 2px);
+              transform: translate(2px, 2px);
+    }
+    60% {
+      -webkit-transform: translate(-2px, 2px);
+              transform: translate(-2px, 2px);
+    }
+    80% {
+      -webkit-transform: translate(-2px, -2px);
+              transform: translate(-2px, -2px);
+    }
+    100% {
+      -webkit-transform: translate(0);
+              transform: translate(0);
+    }
+}
+/*
+* 模糊显示
+*/
+.text-focus-in {
+	-webkit-animation: text-focus-in 2s cubic-bezier(0.550, 0.085, 0.680, 0.530) both;
+	        animation: text-focus-in 2s cubic-bezier(0.550, 0.085, 0.680, 0.530) both;
+}
+.text-focus-in-infinite {
+	-webkit-animation: text-focus-in 2s cubic-bezier(0.550, 0.085, 0.680, 0.530) infinite both;
+	        animation: text-focus-in 2s cubic-bezier(0.550, 0.085, 0.680, 0.530) infinite both;
+}
+
+@keyframes text-focus-in {
+    0% {
+      -webkit-filter: blur(12px);
+              filter: blur(12px);
+      opacity: 0;
+    }
+    100% {
+      -webkit-filter: blur(0px);
+              filter: blur(0px);
+      opacity: 1;
+    }
+}
+  
+/*
+* 果冻
+*/
+.jello-horizontal {
+	-webkit-animation: jello-horizontal 0.9s both;
+	        animation: jello-horizontal 0.9s both;
+}
+.jello-horizontal-infinite {
+	-webkit-animation: jello-horizontal 0.9s infinite both;
+	        animation: jello-horizontal 0.9s infinite both;
+}
+@keyframes jello-horizontal {
+    0% {
+      -webkit-transform: scale3d(1, 1, 1);
+              transform: scale3d(1, 1, 1);
+    }
+    30% {
+      -webkit-transform: scale3d(1.25, 0.75, 1);
+              transform: scale3d(1.25, 0.75, 1);
+    }
+    40% {
+      -webkit-transform: scale3d(0.75, 1.25, 1);
+              transform: scale3d(0.75, 1.25, 1);
+    }
+    50% {
+      -webkit-transform: scale3d(1.15, 0.85, 1);
+              transform: scale3d(1.15, 0.85, 1);
+    }
+    65% {
+      -webkit-transform: scale3d(0.95, 1.05, 1);
+              transform: scale3d(0.95, 1.05, 1);
+    }
+    75% {
+      -webkit-transform: scale3d(1.05, 0.95, 1);
+              transform: scale3d(1.05, 0.95, 1);
+    }
+    100% {
+      -webkit-transform: scale3d(1, 1, 1);
+              transform: scale3d(1, 1, 1);
+    }
+  }
+  
\ No newline at end of file
diff --git a/common/css/business.css b/common/css/business.css
new file mode 100644
index 0000000..3f4fbcb
--- /dev/null
+++ b/common/css/business.css
@@ -0,0 +1,55 @@
+/*
+* 面板信息 - 文本
+*/
+.panel-item .panel-content .item:last-child {
+    border: 0 !important;
+    padding-bottom: 0 !important;
+}
+.panel-item .panel-content .item .title {
+    width: 25%;
+}
+.panel-item .panel-content .item .content {
+    width: calc(75% - 52rpx);
+    min-height: 46rpx;
+    word-wrap: break-word;
+    word-break: normal;
+}
+.panel-item .panel-content .item .title,
+.panel-item .panel-content .item .content {
+    line-height: 46rpx;
+}
+.panel-item-only .panel-content .item .content {
+    width: 100%;
+}
+
+/*
+* 面板信息 - 图片
+*/
+.panel-item .panel-content-images .item {
+    margin: 20rpx 20rpx 0 0;
+}
+.panel-item .panel-content-images .item:last-child {
+    margin-right: 0;
+}
+.panel-item .panel-content-images .item image {
+    width: 120rpx;
+    height: 120rpx !important;
+}
+
+/**
+ * 地址边线
+ */
+.address-divider {
+    height: 4px;
+    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD4AAAAECAYAAADWIIyPAAAAkklEQVR42mP4jwR+7tr1/4OzM1Xwt46O/6SA3Yd//HeLeU0V3DXjE0H7GGCMvw8f/v/o5UUVT39KTPz/78cPoj398Omf/75Jb6ji6ZSyd/9//PxHnMdBjvyUlEQVT4MC7++DB0R7GuTIlPJ3VPE0KPAePvlDlL1gj3/r6qJaEv+5YwdJSbxn5meqJfGdh74TbS8A1dn662xhNdIAAAAASUVORK5CYII=");
+    background-repeat-y: no-repeat;
+}
+
+/**
+ * 支付html弹窗
+ */
+.popup-pay-html-content {
+    max-height: 80vh;
+    overflow-y: scroll;
+    overflow-x: hidden;
+}
\ No newline at end of file
diff --git a/common/css/lib.css b/common/css/lib.css
new file mode 100644
index 0000000..9e8302e
--- /dev/null
+++ b/common/css/lib.css
@@ -0,0 +1,1267 @@
+/**
+ * 公共类样式
+ */
+.margin-0 {
+    margin: 0 !important;
+}
+
+.margin-xsss {
+    margin: 2rpx;
+}
+
+.margin-xss {
+    margin: 4rpx;
+}
+
+.margin-xs {
+    margin: 6rpx;
+}
+
+.margin-sm {
+    margin: 12rpx;
+}
+
+.margin,
+.margin-default {
+    margin: 24rpx;
+}
+
+.margin-lg {
+    margin: 32rpx;
+}
+
+.margin-xl {
+    margin: 36rpx;
+}
+
+.margin-xxl {
+    margin: 40rpx;
+}
+
+.margin-xxxl {
+    margin: 48rpx;
+}
+
+.margin-xxxxl {
+    margin: 56rpx;
+}
+
+.margin-top-xsss {
+    margin-top: 2rpx;
+}
+
+.margin-top-xss {
+    margin-top: 4rpx;
+}
+
+.margin-top-xs {
+    margin-top: 6rpx;
+}
+
+.margin-top-sm {
+    margin-top: 12rpx;
+}
+
+.margin-top,
+.margin-top-default {
+    margin-top: 24rpx;
+}
+
+.margin-top-lg {
+    margin-top: 32rpx;
+}
+
+.margin-top-xl {
+    margin-top: 36rpx;
+}
+
+.margin-top-xxl {
+    margin-top: 40rpx;
+}
+
+.margin-top-xxxl {
+    margin-top: 48rpx;
+}
+
+.margin-top-xxxxl {
+    margin-top: 56rpx;
+}
+
+.margin-right-xsss {
+    margin-right: 2rpx;
+}
+
+.margin-right-xss {
+    margin-right: 4rpx;
+}
+
+.margin-right-xs {
+    margin-right: 6rpx;
+}
+
+.margin-right-sm {
+    margin-right: 12rpx;
+}
+
+.margin-right,
+.margin-right-default {
+    margin-right: 24rpx;
+}
+
+.margin-right-lg {
+    margin-right: 32rpx;
+}
+
+.margin-right-xl {
+    margin-right: 36rpx;
+}
+
+.margin-right-xxl {
+    margin-right: 40rpx;
+}
+
+.margin-right-xxxl {
+    margin-right: 48rpx;
+}
+
+.margin-right-xxxxl {
+    margin-right: 56rpx;
+}
+
+.margin-left-xsss {
+    margin-left: 2rpx;
+}
+
+.margin-left-xss {
+    margin-left: 4rpx;
+}
+
+.margin-left-xs {
+    margin-left: 6rpx;
+}
+
+.margin-left-sm {
+    margin-left: 12rpx;
+}
+
+.margin-left,
+.margin-left-default {
+    margin-left: 24rpx;
+}
+
+.margin-left-lg {
+    margin-left: 32rpx;
+}
+
+.margin-left-xl {
+    margin-left: 36rpx;
+}
+
+.margin-left-xxl {
+    margin-left: 40rpx;
+}
+
+.margin-left-xxxl {
+    margin-left: 48rpx;
+}
+
+.margin-left-xxxxl {
+    margin-left: 56rpx;
+}
+
+.margin-bottom-xsss {
+    margin-bottom: 2rpx;
+}
+
+.margin-bottom-xss {
+    margin-bottom: 4rpx;
+}
+
+.margin-bottom-xs {
+    margin-bottom: 6rpx;
+}
+
+.margin-bottom-sm {
+    margin-bottom: 12rpx;
+}
+
+.margin-bottom,
+.margin-bottom-default {
+    margin-bottom: 24rpx;
+}
+
+.margin-bottom-lg {
+    margin-bottom: 32rpx;
+}
+
+.margin-bottom-xl {
+    margin-bottom: 36rpx;
+}
+
+.margin-bottom-xxl {
+    margin-bottom: 40rpx;
+}
+
+.margin-bottom-xxxl {
+    margin-bottom: 48rpx;
+}
+
+.margin-bottom-xxxxl {
+    margin-bottom: 56rpx;
+}
+
+.margin-vertical-0 {
+    margin-top: 0 !important;
+    margin-bottom: 0 !important;
+}
+
+.margin-vertical-xsss {
+    margin-top: 2rpx;
+    margin-bottom: 2rpx;
+}
+
+.margin-vertical-xss {
+    margin-top: 4rpx;
+    margin-bottom: 4rpx;
+}
+
+.margin-vertical-xs {
+    margin-top: 6rpx;
+    margin-bottom: 6rpx;
+}
+
+.margin-vertical-sm {
+    margin-top: 12rpx;
+    margin-bottom: 12rpx;
+}
+
+.margin-vertical,
+.margin-vertical-default {
+    margin-top: 24rpx;
+    margin-bottom: 24rpx;
+}
+
+.margin-vertical-lg {
+    margin-top: 32rpx;
+    margin-bottom: 32rpx;
+}
+
+.margin-vertical-xl {
+    margin-top: 36rpx;
+    margin-bottom: 36rpx;
+}
+
+.margin-vertical-xxl {
+    margin-top: 40rpx;
+    margin-bottom: 40rpx;
+}
+
+.margin-vertical-xxxl {
+    margin-top: 48rpx;
+    margin-bottom: 48rpx;
+}
+
+.margin-vertical-xxxxl {
+    margin-top: 56rpx;
+    margin-bottom: 56rpx;
+}
+
+.margin-horizontal-0 {
+    margin-left: 0 !important;
+    margin-right: 0 !important;
+}
+
+.margin-horizontal-xsss {
+    margin-left: 2rpx;
+    margin-right: 2rpx;
+}
+
+.margin-horizontal-xss {
+    margin-left: 4rpx;
+    margin-right: 4rpx;
+}
+
+.margin-horizontal-xs {
+    margin-left: 6rpx;
+    margin-right: 6rpx;
+}
+
+.margin-horizontal-sm {
+    margin-left: 12rpx;
+    margin-right: 12rpx;
+}
+
+.margin-horizontal,
+.margin-horizontal-default {
+    margin-left: 24rpx;
+    margin-right: 24rpx;
+}
+
+.margin-horizontal-lg {
+    margin-left: 32rpx;
+    margin-right: 32rpx;
+}
+
+.margin-horizontal-xl {
+    margin-left: 36rpx;
+    margin-right: 36rpx;
+}
+
+.margin-horizontal-xxl {
+    margin-left: 40rpx;
+    margin-right: 40rpx;
+}
+
+.margin-horizontal-xxxl {
+    margin-left: 48rpx;
+    margin-right: 48rpx;
+}
+
+.margin-horizontal-xxxxl {
+    margin-left: 56rpx;
+    margin-right: 56rpx;
+}
+
+.padding-0 {
+    padding: 0 !important;
+}
+
+.padding-xsss {
+    padding: 2rpx;
+}
+
+.padding-xss {
+    padding: 4rpx;
+}
+
+.padding-xs {
+    padding: 6rpx;
+}
+
+.padding-sm {
+    padding: 12rpx;
+}
+
+.padding,
+.padding-default {
+    padding: 24rpx;
+}
+
+.padding-lg {
+    padding: 32rpx;
+}
+
+.padding-xl {
+    padding: 36rpx;
+}
+
+.padding-xxl {
+    padding: 40rpx;
+}
+
+.padding-xxxl {
+    padding: 48rpx;
+}
+
+.padding-xxxxl {
+    padding: 56rpx;
+}
+
+.padding-top-0 {
+    padding-top: 0 !important;
+}
+
+.padding-top-xsss {
+    padding-top: 2rpx;
+}
+
+.padding-top-xss {
+    padding-top: 4rpx;
+}
+
+.padding-top-xs {
+    padding-top: 6rpx;
+}
+
+.padding-top-sm {
+    padding-top: 12rpx;
+}
+
+.padding-top,
+.padding-top-default {
+    padding-top: 24rpx;
+}
+
+.padding-top-lg {
+    padding-top: 32rpx;
+}
+
+.padding-top-xl {
+    padding-top: 36rpx;
+}
+
+.padding-top-xxl {
+    padding-top: 40rpx;
+}
+
+.padding-top-xxxl {
+    padding-top: 48rpx;
+}
+
+.padding-top-xxxxl {
+    padding-top: 56rpx;
+}
+
+.padding-right-0 {
+    padding-right: 0 !important;
+}
+
+.padding-right-xsss {
+    padding-right: 2rpx;
+}
+
+.padding-right-xss {
+    padding-right: 4rpx;
+}
+
+.padding-right-xs {
+    padding-right: 6rpx;
+}
+
+.padding-right-sm {
+    padding-right: 12rpx;
+}
+
+.padding-right,
+.padding-right-default {
+    padding-right: 24rpx;
+}
+
+.padding-right-lg {
+    padding-right: 32rpx;
+}
+
+.padding-right-xl {
+    padding-right: 36rpx;
+}
+
+.padding-right-xxl {
+    padding-right: 40rpx;
+}
+
+.padding-right-xxxl {
+    padding-right: 48rpx;
+}
+
+.padding-right-xxxxl {
+    padding-right: 56rpx;
+}
+
+.padding-left-0 {
+    padding-left: 0 !important;
+}
+
+.padding-left-xsss {
+    padding-left: 2rpx;
+}
+
+.padding-left-xss {
+    padding-left: 4rpx;
+}
+
+.padding-left-xs {
+    padding-left: 6rpx;
+}
+
+.padding-left-sm {
+    padding-left: 12rpx;
+}
+
+.padding-left,
+.padding-left-default {
+    padding-left: 24rpx;
+}
+
+.padding-left-lg {
+    padding-left: 32rpx;
+}
+
+.padding-left-xl {
+    padding-left: 36rpx;
+}
+
+.padding-left-xxl {
+    padding-left: 40rpx;
+}
+
+.padding-left-xxxl {
+    padding-left: 48rpx;
+}
+
+.padding-left-xxxxl {
+    padding-left: 56rpx;
+}
+
+.padding-bottom-0 {
+    padding-bottom: 0 !important;
+}
+
+.padding-bottom-xsss {
+    padding-bottom: 2rpx;
+}
+
+.padding-bottom-xss {
+    padding-bottom: 4rpx;
+}
+
+.padding-bottom-xs {
+    padding-bottom: 6rpx;
+}
+
+.padding-bottom-sm {
+    padding-bottom: 12rpx;
+}
+
+.padding-bottom,
+.padding-bottom-default {
+    padding-bottom: 24rpx;
+}
+
+.padding-bottom-lg {
+    padding-bottom: 32rpx;
+}
+
+.padding-bottom-xl {
+    padding-bottom: 36rpx;
+}
+
+.padding-bottom-xxl {
+    padding-bottom: 40rpx;
+}
+
+.padding-bottom-xxxl {
+    padding-bottom: 48rpx;
+}
+
+.padding-bottom-xxxxl {
+    padding-bottom: 56rpx;
+}
+
+.padding-vertical-0 {
+    padding-top: 0 !important;
+    padding-bottom: 0 !important;
+}
+
+.padding-vertical-xsss {
+    padding-top: 2rpx;
+    padding-bottom: 2rpx;
+}
+
+.padding-vertical-xss {
+    padding-top: 4rpx;
+    padding-bottom: 4rpx;
+}
+
+.padding-vertical-xs {
+    padding-top: 6rpx;
+    padding-bottom: 6rpx;
+}
+
+.padding-vertical-sm {
+    padding-top: 12rpx;
+    padding-bottom: 12rpx;
+}
+
+.padding-vertical,
+.padding-vertical-default {
+    padding-top: 24rpx;
+    padding-bottom: 24rpx;
+}
+
+.padding-vertical-lg {
+    padding-top: 32rpx;
+    padding-bottom: 32rpx;
+}
+
+.padding-vertical-xl {
+    padding-top: 36rpx;
+    padding-bottom: 36rpx;
+}
+
+.padding-vertical-xxl {
+    padding-top: 40rpx;
+    padding-bottom: 40rpx;
+}
+
+.padding-vertical-xxxl {
+    padding-top: 48rpx;
+    padding-bottom: 48rpx;
+}
+
+.padding-vertical-xxxxl {
+    padding-top: 56rpx;
+    padding-bottom: 56rpx;
+}
+
+.padding-horizontal-0 {
+    padding-left: 0 !important;
+    padding-right: 0 !important;
+}
+
+.padding-horizontal-xsss {
+    padding-left: 2rpx;
+    padding-right: 2rpx;
+}
+
+.padding-horizontal-xss {
+    padding-left: 4rpx;
+    padding-right: 4rpx;
+}
+
+.padding-horizontal-xs {
+    padding-left: 6rpx;
+    padding-right: 6rpx;
+}
+
+.padding-horizontal-sm {
+    padding-left: 12rpx;
+    padding-right: 12rpx;
+}
+
+.padding-horizontal,
+.padding-horizontal-default {
+    padding-left: 24rpx;
+    padding-right: 24rpx;
+}
+
+.padding-horizontal-lg {
+    padding-left: 32rpx;
+    padding-right: 32rpx;
+}
+
+.padding-horizontal-xl {
+    padding-left: 36rpx;
+    padding-right: 36rpx;
+}
+
+.padding-horizontal-xxl {
+    padding-left: 40rpx;
+    padding-right: 40rpx;
+}
+
+.padding-horizontal-xxxl {
+    padding-left: 48rpx;
+    padding-right: 48rpx;
+}
+
+.padding-horizontal-xxxxl {
+    padding-left: 56rpx;
+    padding-right: 56rpx;
+}
+
+/**
+ * 字体大小
+ */
+.text-size-xsss {
+    font-size: 18rpx !important;
+}
+
+.text-size-xss {
+    font-size: 20rpx !important;
+}
+
+.text-size-xs {
+    font-size: 24rpx !important;
+}
+
+.text-size-sm {
+    font-size: 26rpx !important;
+}
+
+.text-size-md {
+    font-size: 28rpx !important;
+}
+
+.text-size,
+.text-size-default {
+    font-size: 32rpx !important;
+}
+
+.text-size-lg {
+    font-size: 36rpx !important;
+}
+
+.text-size-xl {
+    font-size: 48rpx !important;
+}
+
+.text-size-xxl {
+    font-size: 64rpx !important;
+}
+
+.text-size-xxxl {
+    font-size: 84rpx !important;
+}
+
+.text-size-40 {
+    font-size: 80rpx !important;
+}
+
+/**
+ * 高度
+ */
+.ht-auto {
+    height: auto;
+}
+
+.ht-0 {
+    height: 0 !important;
+}
+
+.ht-xs {
+    height: 24rpx;
+}
+
+.ht-sm {
+    height: 26rpx;
+}
+
+.ht-md {
+    height: 28rpx;
+}
+
+.ht,
+.ht-default {
+    height: 32rpx;
+}
+
+.ht-lg {
+    height: 36rpx;
+}
+
+.ht-xl {
+    height: 48rpx;
+}
+
+.ht-xxl {
+    height: 64rpx;
+}
+
+.ht-xxxl {
+    height: 84rpx;
+}
+
+/**
+ * 行间距
+ */
+.lh-il {
+    line-height: initial;
+}
+
+.lh-0 {
+    line-height: 0 !important;
+}
+
+.lh-xs {
+    line-height: 24rpx;
+}
+
+.lh-sm {
+    line-height: 26rpx;
+}
+
+.lh-md {
+    line-height: 28rpx;
+}
+
+.lh,
+.lh-default {
+    line-height: 32rpx;
+}
+
+.lh-lg {
+    line-height: 36rpx;
+}
+
+.lh-xl {
+    line-height: 48rpx;
+}
+
+.lh-xxl {
+    line-height: 64rpx;
+}
+
+.lh-xxxl {
+    line-height: 84rpx;
+}
+
+/**
+ * 细微偏移量
+ */
+.top-0-xs {
+    top: -2rpx;
+}
+.top-0-sm {
+    top: -4rpx;
+}
+.top-0-md {
+    top: -6rpx;
+}
+.top-0-lg {
+    top: -8rpx;
+}
+
+.top-0-xl {
+    top: -10rpx;
+}
+
+.top-0-xxl {
+    top: -12rpx;
+}
+
+.top-0-xxxl {
+    top: -16rpx;
+}
+
+.top-0-xxxxl {
+    top: -20rpx;
+}
+
+.top-0-xxxxxl {
+    top: -24rpx;
+}
+.top-0 {
+    top: 0;
+}
+
+.top-xs {
+    top: 2rpx;
+}
+
+.top-sm {
+    top: 4rpx;
+}
+
+.top-md {
+    top: 6rpx;
+}
+
+.top-lg {
+    top: 8rpx;
+}
+
+.top-xl {
+    top: 10rpx;
+}
+
+.top-xxl {
+    top: 12rpx;
+}
+
+.top-xxxl {
+    top: 16rpx;
+}
+
+.top-xxxxl {
+    top: 20rpx;
+}
+
+.top-xxxxxl {
+    top: 24rpx;
+}
+
+.left-0-xs {
+    left: -2rpx;
+}
+
+.left-0-sm {
+    left: -4rpx;
+}
+
+.left-0-md {
+    left: -6rpx;
+}
+
+.left-0-lg {
+    left: -8rpx;
+}
+
+.left-0-xl {
+    left: -10rpx;
+}
+
+.left-0-xxl {
+    left: -12rpx;
+}
+
+.left-0-xxxl {
+    left: -16rpx;
+}
+
+.left-0-xxxxl {
+    left: -20rpx;
+}
+
+.left-0-xxxxxl {
+    left: 24rpx;
+}
+.left-0 {
+    left: 0;
+}
+
+.left-xs {
+    left: 2rpx;
+}
+
+.left-sm {
+    left: 4rpx;
+}
+
+.left-md {
+    left: 6rpx;
+}
+
+.left-lg {
+    left: 8rpx;
+}
+
+.left-xl {
+    left: 10rpx;
+}
+
+.left-xxl {
+    left: 12rpx;
+}
+
+.left-xxxl {
+    left: 16rpx;
+}
+
+.left-xxxxl {
+    left: 20rpx;
+}
+
+.left-xxxxxl {
+    left: 24rpx;
+}
+
+.bottom-0-xs {
+    bottom: -2rpx;
+}
+
+.bottom-0-sm {
+    bottom: -4rpx;
+}
+
+.bottom-0-md {
+    bottom: -6rpx;
+}
+
+.bottom-0-lg {
+    bottom: -8rpx;
+}
+
+.bottom-0-xl {
+    bottom: -10rpx;
+}
+
+.bottom-0-xxl {
+    bottom: -12rpx;
+}
+
+.bottom-0-xxxl {
+    bottom: -16rpx;
+}
+
+.bottom-0-xxxxl {
+    bottom: -20rpx;
+}
+
+.bottom-0-xxxxxl {
+    bottom: -24rpx;
+}
+
+.bottom-0 {
+    bottom: 0;
+}
+
+.bottom-xs {
+    bottom: 2rpx;
+}
+
+.bottom-sm {
+    bottom: 4rpx;
+}
+
+.bottom-md {
+    bottom: 6rpx;
+}
+
+.bottom-lg {
+    bottom: 8rpx;
+}
+
+.bottom-xl {
+    bottom: 10rpx;
+}
+
+.bottom-xxl {
+    bottom: 12rpx;
+}
+
+.bottom-xxxl {
+    bottom: 16rpx;
+}
+
+.bottom-xxxxl {
+    bottom: 20rpx;
+}
+
+.bottom-xxxxxl {
+    bottom: 24rpx;
+}
+
+.right-0-xs {
+    right: -2rpx;
+}
+
+.right-0-sm {
+    right: -4rpx;
+}
+
+.right-0-md {
+    right: -6rpx;
+}
+
+.right-0-lg {
+    right: -8rpx;
+}
+
+.right-0-xl {
+    right: -10rpx;
+}
+
+.right-0-xxl {
+    right: -12rpx;
+}
+
+.right-0-xxxl {
+    right: -16rpx;
+}
+
+.right-0-xxxxl {
+    right: -20rpx;
+}
+
+.right-0-xxxxxl {
+    right: -24rpx;
+}
+
+.right-0 {
+    right: 0;
+}
+
+.right-xs {
+    right: 2rpx;
+}
+
+.right-sm {
+    right: 4rpx;
+}
+
+.right-md {
+    right: 6rpx;
+}
+
+.right-lg {
+    right: 8rpx;
+}
+
+.right-xl {
+    right: 10rpx;
+}
+
+.right-xxl {
+    right: 12rpx;
+}
+
+.right-xxxl {
+    right: 16rpx;
+}
+
+.right-xxxxl {
+    right: 20rpx;
+}
+
+.right-xxxxxl {
+    right: 24rpx;
+}
+
+/**
+ * gap
+ */
+.gap-2 {
+    gap: 4rpx;
+}
+.gap-3 {
+    gap: 6rpx;
+}
+.gap-4 {
+    gap: 8rpx;
+}
+
+.gap-5 {
+    gap: 10rpx;
+}
+
+.gap-8 {
+    gap: 16rpx;
+}
+
+.gap-10 {
+    gap: 20rpx;
+}
+
+.gap-12 {
+    gap: 24rpx;
+}
+
+.gap-16 {
+    gap: 32rpx;
+}
+.gap-20 {
+    gap: 40rpx;
+}
+
+.pr-4 {
+    padding: 8rpx;
+}
+.pr-15 {
+    padding-right: 30rpx;
+}
+.plr-11 {
+    padding-left: 22rpx;
+    padding-right: 22rpx;
+}
+
+.ptb-5 {
+    padding-top: 10rpx;
+    padding-bottom: 10rpx;
+}
+
+.ptb-15 {
+    padding-top: 30rpx;
+    padding-bottom: 30rpx;
+}
+
+.mlr-10 {
+    margin-left: 20rpx;
+    margin-right: 20rpx;
+}
+
+/**
+ * 主要类样式
+ */
+.margin-main {
+    margin: 24rpx;
+}
+.margin-top-main {
+    margin-top: 24rpx;
+}
+.margin-right-main {
+    margin-right: 24rpx;
+}
+.margin-bottom-main {
+    margin-bottom: 24rpx;
+}
+.margin-left-main {
+    margin-left: 24rpx;
+}
+.margin-horizontal-main {
+    margin-left: 24rpx;
+    margin-right: 24rpx;
+}
+.margin-vertical-main {
+    margin-top: 24rpx;
+    margin-bottom: 24rpx;
+}
+.padding-main {
+    padding: 24rpx;
+}
+.padding-top-main {
+    padding-top: 24rpx;
+}
+.padding-right-main {
+    padding-right: 24rpx;
+}
+.padding-bottom-main {
+    padding-bottom: 24rpx;
+}
+.padding-left-main {
+    padding-left: 24rpx;
+}
+.padding-horizontal-main {
+    padding-left: 24rpx;
+    padding-right: 24rpx;
+}
+.padding-vertical-main {
+    padding-top: 24rpx;
+    padding-bottom: 24rpx;
+}
+.border-radius-main {
+    border-radius: 16rpx;
+}
+.border-radius-left-main {
+    border-top-left-radius: 16rpx;
+    border-bottom-left-radius: 16rpx;
+}
+.border-radius-right-main {
+    border-top-right-radius: 16rpx;
+    border-bottom-right-radius: 16rpx;
+}
+.border-radius-top-main {
+    border-top-left-radius: 16rpx;
+    border-top-right-radius: 16rpx;
+}
+.border-radius-bottom-main {
+    border-bottom-left-radius: 16rpx;
+    border-bottom-right-radius: 16rpx;
+}
+.border-radius-xs {
+    border-radius: 4rpx;
+}
+.border-radius-left-xs {
+    border-top-left-radius: 4rpx;
+    border-bottom-left-radius: 4rpx;
+}
+.border-radius-right-xs {
+    border-top-right-radius: 4rpx;
+    border-bottom-right-radius: 4rpx;
+}
+.border-radius-top-xs {
+    border-top-left-radius: 4rpx;
+    border-top-right-radius: 4rpx;
+}
+.border-radius-bottom-xs {
+    border-bottom-left-radius: 4rpx;
+    border-bottom-right-radius: 4rpx;
+}
+.border-radius-sm {
+    border-radius: 8rpx;
+}
+.border-radius-left-sm {
+    border-top-left-radius: 8rpx;
+    border-bottom-left-radius: 8rpx;
+}
+.border-radius-right-sm {
+    border-top-right-radius: 8rpx;
+    border-bottom-right-radius: 8rpx;
+}
+.border-radius-top-sm {
+    border-top-left-radius: 8rpx;
+    border-top-right-radius: 8rpx;
+}
+.border-radius-bottom-sm {
+    border-bottom-left-radius: 8rpx;
+    border-bottom-right-radius: 8rpx;
+}
\ No newline at end of file
diff --git a/common/css/page.css b/common/css/page.css
new file mode 100644
index 0000000..6d58ee3
--- /dev/null
+++ b/common/css/page.css
@@ -0,0 +1,1420 @@
+/* #ifdef H5 */
+body {
+    background: #333 !important;
+}
+page {
+    min-height: 100%;
+}
+a {
+    text-decoration: none;
+}
+
+/**
+ * 页面宽度最大1600rpx、并居中
+ */
+page,
+iframe,
+.uni-page-head,
+.uni-tabbar,
+.open-location,
+.home-top-nav-content,
+.search-content-fixed,
+.trn-nav-top,
+.goods-buy-nav,
+.popup-bottom,
+.popup-top,
+.quick-movable-container,
+.online-service-movable-container,
+.bottom-fixed,
+.buy-nav,
+.plugins-popupscreen .content,
+.cart-buy-nav,
+.bg-img,
+.pa-w,
+.plugins-realstore-cart-content,
+.tabs-content,
+.header-around,
+.plugins-realstore-detail-base-mode-nav {
+    max-width: 1600rpx !important;
+    margin: 0 auto !important;
+}
+.plugins-realstore-buy-type-choice,
+.plugins-categorylimit-warm-tips-content {
+    max-width: 1400rpx !important;
+    margin: 0 auto !important;
+}
+.trn-nav-top,
+.nav-more-view,
+.quick-movable-container,
+.online-service-movable-container,
+.plugins-realstore-cart-content,
+.plugins-realstore-detail-base-mode-nav {
+    left: auto !important;
+}
+iframe,
+.bottom-fixed {
+    right: 0 !important;
+}
+.web-html-content iframe {
+    width: 100% !important;
+    max-height: 500rpx !important;
+}
+@media only screen and (min-width: 1600rpx) {
+    .cart-buy-nav,
+    .goods-buy-nav {
+        left: calc(50% - 780rpx) !important;
+        width: 1560rpx !important;
+    }
+}
+
+/**
+ * 隐藏导航栏内容、仅展示返回按钮
+ */
+uni-page-head {
+    position: absolute;
+    margin-top: -1999998rpx;
+    z-index: 99;
+}
+.uni-page-head-bd {
+    display: none !important;
+}
+.uni-page-head-btn {
+    position: fixed;
+    left: auto;
+    bottom: 320rpx;
+    background: rgba(0, 0, 0, 0.6);
+    box-shadow: 0 0 20rpx rgb(0 0 0 / 30%);
+    margin: 0 0 0 20rpx;
+    border-radius: 100rpx;
+    width: 62rpx;
+    height: 62rpx;
+    text-align: center;
+    padding: 4rpx 6rpx 0 0;
+}
+.uni-page-head-btn .uni-btn-icon {
+    color: #fff !important;
+}
+.uni-app--showtabbar uni-page-wrapper,
+uni-page-head[uni-page-head-type=default]~uni-page-wrapper {
+    height: calc(100% - var(--window-bottom)) !important;
+}
+
+/* #endif */
+
+/**
+ * 公共样式、框架样式覆盖
+ */
+page {
+    background: #f8f8f8;
+    color: #4a4a4a;
+}
+
+input[type="text"],
+input[type="number"],
+input[type="idcard"],
+input[type="digit"],
+textarea {
+    appearance: none;
+    -webkit-appearance: none;
+    border-radius: 10rpx;
+    box-sizing: border-box;
+}
+
+page,
+textarea,
+.a-textarea-control textarea {
+    font-size: 28rpx;
+}
+
+button:after,
+button:before {
+    border: 0;
+    border-radius: 0;
+}
+
+/**
+ * 模块分割间距
+ */
+.spacing {
+    padding-top: 20rpx;
+}
+.spacing-mt-10 {
+    margin-top: 20rpx;
+}
+.spacing-mb-10 {
+    margin-bottom: 20rpx;
+}
+.spacing-mb {
+    margin-bottom: 24rpx;
+}
+.spacing-mt {
+    margin-top: 24rpx;
+}
+
+/**
+ * 常用样式
+ */
+.max-w {
+    max-width: 100%;
+}
+.max-h {
+    max-height: 100%;
+}
+.min-w {
+    min-width: 100%;
+}
+.min-h {
+    min-height: 100%;
+}
+.fl {
+    float: left;
+}
+.fr {
+    float: right;
+}
+.min-wh {
+    min-width: 100vw !important;
+}
+.min-ht {
+    min-height: 100vh !important;
+}
+.wh {
+    width: 100vw !important;
+}
+.ht {
+    height: 100vh !important;
+}
+.wh-auto {
+    width: 100% !important;
+}
+.ht-auto {
+    height: 100% !important;
+}
+.tc {
+    text-align: center;
+}
+.tl {
+    text-align: left;
+}
+.tr {
+    text-align: right;
+}
+.oh {
+    overflow: hidden;
+}
+.oa {
+    overflow: auto;
+}
+.ou {
+    overflow: unset !important;
+}
+.dis-none {
+    display: none !important;
+}
+.dis-block {
+    display: block !important;
+}
+.dis-inline {
+    display: inline !important;
+}
+.dis-inline-block {
+    display: inline-block !important;
+}
+.dis-inline-grid {
+    display: inline-grid;
+}
+.va-t {
+    vertical-align: top;
+}
+.va-m {
+    vertical-align: middle;
+}
+.va-b {
+    vertical-align: text-bottom;
+}
+.pf {
+    position: fixed;
+}
+.pa {
+    position: absolute;
+}
+.pr {
+    position: relative;
+}
+.ps {
+    position: sticky;
+}
+.z-i {
+    z-index: 1 !important;
+}
+.z-i-deep {
+    z-index: 2 !important;
+}
+.z-i-deep-must {
+    z-index: 999 !important;
+}
+.bs-bb {
+    box-sizing: border-box;
+}
+.radius-0 {
+    border-radius: 0 !important;
+}
+.radius {
+    border-radius: 10rpx !important;
+}
+.radius-md {
+    border-radius: 16rpx !important;
+}
+.radius-lg {
+    border-radius: 32rpx !important;
+}
+.round {
+    border-radius: 100rpx !important;
+}
+.circle {
+    border-radius: 50% !important;
+}
+.fw-b {
+    font-weight: 500;
+}
+.fw-n {
+    font-weight: 400;
+}
+.auto {
+    margin: 0 auto;
+}
+.cp {
+    /* #ifdef H5 */
+    cursor: pointer;
+    /* #endif */
+}
+
+/**
+ * 透明度
+ */
+.opacity-min {
+    opacity: 0.3;
+}
+.opacity {
+    opacity: 0.6;
+}
+.opacity-max {
+    opacity: 0.8;
+}
+
+/**
+ * 底部浮动
+ */
+.bottom-fixed {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    box-sizing: border-box;
+    z-index: 2;
+    padding: 20rpx;
+}
+.bottom-fixed .item {
+    box-shadow: 0rpx 4rpx 8rpx 0px rgba(0, 0, 0, 0.16);
+}
+
+/**
+ * 底部右侧浮动+号
+ */
+.buttom-right-submit {
+    position: fixed;
+    bottom: 50rpx;
+    right: 50rpx;
+    width: 100rpx;
+    height: 100rpx;
+    line-height: 86rpx;
+    box-shadow: 0 0 20rpx 4rpx #c4c4c4;
+    font-size: 76rpx;
+}
+
+/**
+ * 兼容底部横线底部内边距
+ */
+.bottom-line-exclude {
+    /* #ifndef APP */
+    padding-bottom: calc(env(safe-area-inset-bottom) - 40rpx);
+    /* #endif */
+}
+
+/**
+ * 页面底部浮动、增加底部边距
+ */
+.page-bottom-fixed {
+    padding-bottom: 120rpx !important;
+}
+
+/**
+ * 价格
+ */
+.sales-price {
+    color: #E22C08;
+    font-weight: bold;
+    font-size: 28rpx;
+}
+.original-price {
+    color: #999;
+    font-size: 24rpx;
+    text-decoration: line-through;
+}
+
+/**
+ * 边框 灰色（四边）、红色、黄色、绿色、灰色、无边线
+ */
+.br {
+    border: 2rpx solid #EEEEEE !important;
+}
+.br-b {
+    border-bottom: 2rpx solid #EEEEEE !important;
+}
+.br-t {
+    border-top: 2rpx solid #EEEEEE !important;
+}
+.br-l {
+    border-left: 2rpx solid #EEEEEE !important;
+}
+.br-r {
+    border-right: 2rpx solid #EEEEEE !important;
+}
+.br-f5 {
+    border: 2rpx solid #f5f5f5 !important;
+}
+.br-b-f5 {
+    border-bottom: 2rpx solid #f5f5f5 !important;
+}
+.br-t-f5 {
+    border-top: 2rpx solid #f5f5f5 !important;
+}
+.br-l-f5 {
+    border-left: 2rpx solid #f5f5f5 !important;
+}
+.br-r-f5 {
+    border-right: 2rpx solid #f5f5f5 !important;
+}
+
+
+.br-f9 {
+    border: 2rpx solid #f9f9f9 !important;
+}
+.br-b-f9 {
+    border-bottom: 2rpx solid #f9f9f9 !important;
+}
+.br-t-f9 {
+    border-top: 2rpx solid #f9f9f9 !important;
+}
+.br-l-f9 {
+    border-left: 2rpx solid #f9f9f9 !important;
+}
+.br-r-f9 {
+    border-right: 2rpx solid #f9f9f9 !important;
+}
+.br-e {
+    border: 2rpx solid #eeeeee !important;
+}
+.br-b-e {
+    border-bottom: 2rpx solid #eeeeee !important;
+}
+.br-t-e {
+    border-top: 2rpx solid #eeeeee !important;
+}
+.br-l-e {
+    border-left: 2rpx solid #eeeeee !important;
+}
+.br-r-e {
+    border-right: 2rpx solid #eeeeee !important;
+}
+.br-c {
+    border: solid 2rpx #cccccc !important;
+}
+.br-b-c {
+    border-bottom: 2rpx solid #cccccc !important;
+}
+.br-t-c {
+    border-top: 2rpx solid #cccccc !important;
+}
+.br-l-c {
+    border-left: 2rpx solid #cccccc !important;
+}
+.br-r-c {
+    border-right: 2rpx solid #cccccc !important;
+}
+
+.br-white {
+    border: 2rpx solid #FFF !important;
+}
+.br-red {
+    border: 2rpx solid #E22C08 !important;
+}
+.br-yellow {
+    border: 2rpx solid #f6c133 !important;
+}
+.br-green {
+    border: 2rpx solid #52C41A !important;
+}
+.br-grey {
+    border: solid 2rpx #dddddd !important;
+}
+.br-grey-d {
+    border: solid 2rpx #dddddd !important;
+}
+.br-grey-f5 {
+    border: solid 2rpx #f5f5f5 !important;
+}
+.br-grey-f7 {
+    border: solid 2rpx #f7f7f7 !important;
+}
+.br-grey-9 {
+    border: solid 2rpx #999999 !important;
+}
+.br-blue {
+    border: solid 2rpx #2196F3 !important;
+}
+.br-black {
+    border: solid 2rpx #333333 !important;
+}
+.br-base {
+    border: solid 2rpx #666 !important;
+}
+.br-0 {
+    border: 0 !important;
+    box-shadow: none;
+}
+.br-top-shadow {
+    box-shadow: 0rpx -4rpx 10rpx 0rpx rgba(0, 0, 0, 0.03);
+}
+
+/**
+ * 虚线边框、灰色（四边）、红色、黄色、绿色、灰色
+ */
+.br-dashed {
+    border: dashed 2rpx #EEEEEE !important;
+}
+.br-b-dashed {
+    border-bottom: dashed 2rpx #EEEEEE !important;
+}
+.br-t-dashed {
+    border-top: dashed 2rpx #EEEEEE !important;
+}
+.br-l-dashed {
+    border-left: dashed 2rpx #EEEEEE !important;
+}
+.br-r-dashed {
+    border-right: dashed 2rpx #EEEEEE !important;
+}
+.br-dashed-red {
+    border: dashed 2rpx #E22C08 !important;
+}
+.br-dashed-yellow {
+    border: dashed 2rpx #f6c133 !important;
+}
+.br-dashed-green {
+    border: dashed 2rpx #1AAD19 !important;
+}
+.br-dashed-grey {
+    border: dashed 2rpx #d6d6d6 !important;
+}
+
+/**
+ * 统一颜色
+ * 文本价格色、基础色、白色、黑色、灰色、浅灰色、红色、黄色、绿色、蓝色
+ */
+.cr-price {
+    color: #E22C08;
+}
+.cr-base {
+    color: #666 !important;
+}
+.cr-white {
+    color: #fff !important;
+}
+.cr-black {
+    color: #333 !important;
+}
+.cr-grey,
+.cr-grey-9 {
+    color: #999 !important;
+}
+.cr-grey-c {
+    color: #ccc !important;
+}
+.cr-grey-d {
+    color: #ddd !important;
+}
+.cr-grey-white {
+    color: #e7e7e7 !important;
+}
+.cr-red {
+    color: #E22C08 !important;
+}
+.cr-yellow {
+    color: #f6c133 !important;
+}
+.cr-orange {
+    color: #F37B1D !important;
+}
+.cr-green {
+    color: #1AAD19 !important;
+}
+.cr-blue {
+    color: #2196F3 !important;
+}
+.cr-blue-dark {
+    color: #B3BFCB !important;
+}
+
+/**
+ * 统一背景色
+ * 白色、绿色、红色、黄色、灰色
+ */
+.bg-white {
+    background-color: #fff !important;
+}
+.bg-green {
+    background-color: #1AAD19 !important;
+}
+.bg-red {
+    background-color: #E64340 !important;
+}
+.bg-yellow {
+    background-color: #f6c133 !important;
+}
+.bg-grey {
+    background-color: #d6d6d6 !important;
+}
+.bg-grey-d {
+    background-color: #dddddd !important;
+}
+.bg-grey-e {
+    background-color: #eeeeee !important;
+}
+.bg-grey-f5 {
+    background-color: #f5f5f5 !important;
+}
+.bg-grey-f7 {
+    background-color: #f7f7f7 !important;
+}
+.bg-grey-f8 {
+    background-color: #f8f8f8 !important;
+}
+.bg-grey-f9 {
+    background-color: #f9f9f9 !important;
+}
+.bg-base {
+    background-color: #f5f5f5 !important;
+}
+.bg-blue {
+    background-color: #2196F3 !important;
+}
+.bg-black {
+    background-color: #333333 !important;
+}
+.bg-white-disabled,
+button[disabled].bg-white {
+    background-color: #fff !important;
+    color: #ccc !important;
+}
+.bg-green-disabled,
+button[disabled].bg-green {
+    background-color: #94de94 !important;
+    color: #d5f5d5 !important;
+}
+.bg-red-disabled,
+button[disabled].bg-red {
+    background-color: #ffbaba !important;
+    color: #ffdfdf !important;
+}
+.bg-yellow-disabled,
+button[disabled].bg-yellow {
+    background-color: #fff1cb !important;
+    color: #fbd777 !important;
+}
+.bg-grey-disabled,
+button[disabled].bg-grey {
+    background-color: #ececec !important;
+    color: #ababab !important;
+}
+
+/**
+ * 表单
+ */
+.form-container .form-gorup {
+    padding: 24rpx;
+}
+.form-container .form-gorup .form-gorup-item-left {
+    float: left;
+    padding-right: 20rpx;
+}
+.form-container .form-gorup .form-gorup-item-right {
+    float: right;
+    padding-left: 20rpx;
+    border-left: 2rpx solid #f7f7f7;
+}
+.form-container .form-gorup .form-gorup-item-left,
+.form-container .form-gorup .form-gorup-item-right {
+    width: calc(50% - 20rpx - 2rpx);
+}
+.form-container .form-gorup-submit {
+    padding: 20rpx 0;
+}
+.form-container .form-gorup:not(.form-gorup-submit) {
+    background: #fff;
+}
+.form-container .form-group-tips,
+.form-container .form-group-tips-must {
+    margin-left: 6rpx;
+    font-size: 24rpx;
+    color: #ccc;
+}
+.form-container .form-group-tips-must {
+    color: #f00;
+}
+.form-container .form-gorup input,
+.form-container .form-gorup textarea,
+.form-container .form-gorup .picker,
+.form-container .form-gorup .form-gorup-value {
+    border-radius: 0;
+    width: 100%;
+    box-sizing: border-box;
+    font-size: 28rpx;
+}
+.form-container .form-gorup input,
+.form-container .form-gorup .picker,
+.form-container .form-gorup .radio-gorup,
+.form-container .form-gorup .form-gorup-value {
+    height: 70rpx;
+    line-height: 70rpx;
+}
+.form-container .form-gorup textarea {
+    padding: 0;
+    height: 150rpx !important;
+    margin-top: 20rpx;
+}
+.form-container .form-gorup-text {
+    padding: 20rpx 10rpx;
+}
+.form-container .form-gorup .switch {
+    margin: 30rpx 0 20rpx 0;
+}
+.form-container .form-gorup .radio-gorup .radio radio {
+    transform: scale(0.7);
+}
+.form-container .form-gorup .radio-gorup .radio:not(:last-child) {
+    margin-right: 50rpx;
+}
+.form-container .form-gorup.row {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    width: 100%;
+}
+.form-container .form-gorup.row .form-gorup-title {
+    width: 180rpx;
+}
+
+/**
+ * 表单图片上传
+ */
+.form-container-upload .form-gorup-title {
+    margin-bottom: 20rpx;
+}
+.form-container-upload .form-upload-data .item {
+    margin: 10rpx 10rpx 0 0;
+    position: relative;
+}
+.form-container-upload .form-upload-data .delete-icon {
+    position: absolute;
+    top: 0;
+    right: 0;
+    color: #e5e5e5;
+    background-color: #d9534f;
+    padding: 5rpx 18rpx;
+    font-size: 36rpx;
+    border: 2rpx solid #eee;
+    border-radius: 50rpx;
+    line-height: 44rpx;
+    z-index: 1;
+}
+.form-container-upload .form-upload-data image {
+    width: 140rpx;
+    height: 140rpx;
+    padding: 5rpx;
+    border: 2rpx solid #eee;
+    display: block;
+    border-radius: 10rpx;
+}
+
+/**
+ * 箭头符号
+ */
+.arrow-right {
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAGqADAAQAAAABAAAAGgAAAABMybYKAAACJElEQVRIDWNgGAWDPQQYCTkwNTXVhZmZ2RKIp02dOvUtIfW45JlwSSCJp3NwcDT9/ft3S0ZGhg6SOElMghYBfdL47du306ysrBZAk3empaUFkGQDVDEzIU1nzpx5ZWxsvP7////SQEutgXSIiYnJV19f35MHDhz4T0g/TJ6gRSCFZ8+e/aaoqLiRjY3tDxMTkx3QQs9Pnz7JmJmZHQY65AfMMHw0wcSArhmYOIJBCQMYlGK/fv06ArQ4Zfr06TfR1aHzifIRsqZz585dNzU13f/7928LdnZ2U2Ai8QMG7Q2gr+8gq0Nnk+wjmAFZWVkSf/78mQL0WTCQBgVfhaSk5OSGhoZ/MDXINMk+gmk+ffr0F15e3nWCgoL/gMFnD8TeX758YQXG2T6YGmSaYPJGVozOBqa6P8BUeB0o/h0Ybwz//v1TQFcD47PAGKTSoaGhzEDf1AJ9Us3IyMgCjLO5wPgqw2UOWRbl5uaKAlPcZBYWlnBg/PwCGl4yY8aMPqCFOPMVyYkBWDLoAg1eAExxRkBfPAUGXebMmTM34/IJTJwki9LT0/2BrgblISmgj44DDUkBWnINZhg+miiLgEmW6dmzZ2VASxqBwcUGDK5FQLqIlNKcoEXJyclCQB/0AVNVPNCCv0BXN7x796599erVIDbRgGBiALp8IjA+Yn78+PESaGoOMKjWEG06kkKC+QgY2Zd//vy5DZhHPMi1BMm+UeYgDgEAf6bHwBiHBjoAAAAASUVORK5CYII=');
+    background-size: 26rpx 26rpx;
+    background-repeat: no-repeat;
+    background-position: center right;
+}
+.arrow-bottom {
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABRklEQVRYR+2UsUrFMBSGT9LBN3AQR4vQNO0gPoA6Cy5XZ1ddfZbr6nwdXFwVH8AlJacg2cTFN7BLjkQQwtW2STvcJRlL8/8fX3LCYMOLbbgfEkAykAwkA4MGEHEhhLif81gZY3bzPP/oy+gFQMSCiJCIjqSUL1MgjDFbXdd9AcB1WZbL/zIGDWitVwCwmAKhlNrOsuyTMYYAcC6EaKMB3IZfCMbYiRDiOcQEIu4RkRkrd1lBU+CZOJVSPg5BNE1zwDl/DSkPBvBNENGFlNIdzZ+FiMdE9BRaHgXgQ1hrL6uquvMJ2rY9s9Y+xJRHA/gQnPOroihu3Tc3rkS0ii2fBLB2MW8A4H1q+WQAH+InZGTUhi5t0BT0BWitDQDsMMYO++Z8bGxnAbhwpdR+XddvY0XRT/HUwNh9sw3EFq7/nwCSgWQgGfgGWR6PIRYTYskAAAAASUVORK5CYII=');
+    background-size: 38rpx 38rpx;
+    background-repeat: no-repeat;
+    background-position: center right;
+}
+
+/**
+ * 信息提示、加载页面图片
+ */
+.data-loding image {
+    width: 120rpx;
+    height: 120rpx;
+    background-size: 80% 80% !important;
+}
+
+/**
+ * 元素漂出可视页面
+ */
+.drift {
+    position: fixed;
+    left: -2000rpx;
+}
+
+/**
+ * 导航分割
+ */
+.spacing-nav-title {
+    margin-bottom: 20rpx
+}
+.spacing-nav-title .text-wrapper {
+    display: inline-block;
+    font-size: 32rpx;
+    font-weight: 500;
+    color: #333;
+}
+
+/**
+ * 关键字标签展示
+ */
+.word-list .word-icon {
+    border-radius: 4rpx;
+    border: 2rpx solid #FFCAC0;
+    color: #FFCAC0;
+    padding: 0 12rpx;
+    line-height: 40rpx;
+}
+.word-list .word-icon:not(:last-child) {
+    margin-right: 20rpx;
+}
+.word-list image {
+    max-width: 100%;
+    margin: 0 auto;
+}
+
+/**
+ * 文字超出部分使用省略号
+ */
+.single-text {
+    -o-text-overflow: ellipsis;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    max-width: 100%;
+}
+.multi-text {
+    max-width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    line-clamp: 2;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    min-height: 76rpx;
+    line-height: 38rpx;
+    font-size: 28rpx;
+    white-space: initial;
+}
+.text-line-1 {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 1;
+    /* 添加标准属性以增加兼容性 */
+    line-clamp: 1; 
+    -webkit-box-orient: vertical;
+    word-break: break-word;
+    overflow-wrap: break-word;
+    word-wrap: break-word;
+}
+.text-line-2 {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    /* 添加标准属性以增加兼容性 */
+    line-clamp: 2; 
+    -webkit-box-orient: vertical;
+    word-break: break-word;
+    overflow-wrap: break-word;
+    word-wrap: break-word;
+}
+.text-line-3 {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 3;
+    /* 添加标准属性以增加兼容性 */
+    line-clamp: 3; 
+    -webkit-box-orient: vertical;
+    word-break: break-word;
+    overflow-wrap: break-word;
+    word-wrap: break-word;
+}
+/**
+ * 文字超出部分换行
+ */
+.warp {
+    word-break: break-all;
+}
+/**
+ * 文字不换行
+ */
+.nowrap {
+    white-space: nowrap;
+}
+
+/**
+ * 基础导航
+ */
+.nav-base {
+    height: 80rpx;
+    line-height: 80rpx;
+}
+.nav-base .item {
+    /* #ifdef H5 */
+    cursor: pointer;
+    /* #endif */
+}
+
+/**
+ * 导航下划线
+ */
+.nav-active-line {
+    position: relative;
+}
+.nav-active-line::before {
+    content: '';
+    width: 24rpx;
+    height: 6rpx;
+    background: transparent;
+    border-radius: 6rpx;
+    position: absolute;
+    left: 50%;
+    bottom: 0;
+    transform: translateX(-50%);
+}
+
+/**
+ * 滚动页面高度
+ */
+.scroll-box {
+    height: 100vh;
+}
+
+/**
+ * 存在基础导航
+ */
+.scroll-box-ece-nav {
+    height: calc(100vh - 80rpx);
+}
+
+/**
+ * 滚动水平左右滑动
+ */
+.scroll-view-horizontal {
+    white-space: nowrap;
+    box-sizing: border-box;
+    width: 100%;
+}
+
+/**
+ * 滚动水平左右滑动内容宽度处理
+ */
+.rolling-horizontal .scroll-view-horizontal {
+    width: calc(100% + 20rpx);
+}
+
+/**
+ * 公共操作栏按钮样式
+ */
+.item-operation button:not(:first-child) {
+    margin-left: 20rpx;
+}
+.item-operation button {
+    padding: 0 35rpx;
+    height: 58rpx;
+    line-height: 58rpx;
+    display: inline-flex;
+    align-items: center;
+}
+
+/**
+ * 单页预览
+ */
+.single-page-top {
+    padding-top: 110rpx;
+}
+
+/**
+ * 上一篇、下一篇
+ */
+.last-next-data .item {
+    width: calc(100% - 120rpx);
+}
+
+/**
+ * 商品列表
+ */
+.goods-list .cart-badge-icon {
+    top: -18rpx;
+    right: 8rpx;
+}
+.goods-list .error-msg {
+    position: absolute;
+    top: 0;
+    left: 0;
+    background: rgb(253 253 253 / 60%);
+    z-index: 1;
+    filter: blur(0.6rpx);
+}
+.goods-data-grid-list .item .error-msg,
+.goods-data-rolling-list .item .error-msg {
+    border-bottom-left-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
+}
+
+/**
+ * 商品列表 - 列表
+ */
+.goods-data-list .error-msg,
+.goods-data-list .goods-img {
+    width: 190rpx !important;
+    height: 190rpx !important;
+}
+.goods-data-list .base {
+    width: calc(100% - 220rpx);
+}
+.goods-data-list .base .base-bottom {
+    width: calc(100% - 60rpx);
+}
+.goods-data-list .error-msg {
+    top: 24rpx;
+    left: 24rpx;
+    line-height: 190rpx;
+}
+
+/*
+ * 商品列表 - 滚动
+ */
+.goods-data-rolling-list .swiper {
+    height: 310rpx !important;
+}
+.goods-data-rolling-list .item .error-msg,
+.goods-data-rolling-list .item .goods-img {
+    height: 210rpx !important;
+}
+.goods-data-rolling-list .item .error-msg {
+    line-height: 210rpx;
+}
+
+/**
+ * 商品列表 - 九方格
+ */
+
+.goods-data-grid-list .item {
+    width: calc(50% - 12rpx);
+    padding-bottom: 24rpx;
+    margin-bottom: 24rpx;
+}
+.goods-data-grid-list .item:nth-of-type(2n + 1) {
+    margin-right: 12rpx;
+}
+.goods-data-grid-list .item:nth-of-type(2n) {
+    margin-left: 12rpx;
+}
+.goods-data-grid-list .item .error-msg {
+    line-height: 341rpx;
+}
+.goods-data-grid-list .item .open-grid-btn {
+    width: calc(100% - 80rpx);
+    min-height: 50rpx;
+    line-height: 50rpx;
+}
+
+/**
+ * 头部客服信息弹窗
+ */
+/**
+* 客服
+*/
+.header-service .item:first-child {
+    border-top: 0 !important;
+}
+.header-service .qrcode .item:not(:last-child) {
+    margin-right: 40rpx;
+}
+.header-service image {
+    width: 200rpx;
+    height: 200rpx;
+}
+.header-service .chat-info image {
+    width: 40rpx;
+    height: 40rpx;
+}
+
+/**
+ * flex 布局
+ */
+.flex-row {
+    display: flex;
+    flex-direction: row;
+}
+.flex-col {
+    display: flex;
+    flex-direction: column;
+}
+.jc-sb {
+    justify-content: space-between;
+}
+.jc-c {
+    justify-content: center;
+}
+.jc-sa {
+    justify-content: space-around;
+}
+.jc-e {
+    justify-content: flex-end;
+}
+.align-c {
+    align-items: center;
+}
+.align-e {
+    align-items: flex-end;
+}
+.align-s {
+    align-items: flex-start;
+}
+.align-b {
+    align-items: baseline;
+}
+.flex-wrap {
+    flex-wrap: wrap;
+}
+.flex-nowrap {
+    flex-wrap: nowrap;
+}
+.flex-1 {
+    flex: 1;
+}
+.flex-2 {
+    flex: 2;
+}
+.flex-3 {
+    flex: 3;
+}
+.self-c {
+    align-self: center;
+}
+.self-b {
+    align-self: baseline;
+}
+.self-s {
+    align-self: flex-start;
+}
+.self-e {
+    align-self: flex-end;
+}
+.flex-shrink {
+    flex-shrink: 0;
+}
+.flex-shrink-1 {
+    flex-shrink: 0;
+}
+.flex-width {
+    width: 0;
+}
+.flex-width-half {
+    width: 50%;
+}
+.flex-width-half-half {
+    width: 25%;
+}
+
+/**
+ * css伪类文本之间的分割线 ｜ ——
+*/
+.divider-l,
+.divider-r,
+.divider-t,
+.divider-b,
+.divider-l-f5,
+.divider-r-f5,
+.divider-t-f5,
+.divider-b-f5,
+.divider-l-d,
+.divider-r-d,
+.divider-t-d,
+.divider-b-d {
+    position: relative;
+}
+.divider-l-f5::before,
+.divider-r-f5::after,
+.divider-t-f5::before,
+.divider-b-f5::after {
+    background: #f5f5f5 !important;
+}
+.divider-l-d::before,
+.divider-r-d::after,
+.divider-t-d::before,
+.divider-b-d::after {
+    background: #dddddd !important;
+}
+.divider-l::before,
+.divider-l-f5::before,
+.divider-l-d::before {
+    content: '';
+    width: 2rpx;
+    height: 65%;
+    position: absolute;
+    left: 0;
+    top: 50%;
+    transform: translateY(-50%);
+    background: #EEEEEE;
+}
+.divider-r::after,
+.divider-r-f5::after,
+.divider-r-d::after {
+    content: '';
+    width: 2rpx;
+    height: 65%;
+    position: absolute;
+    right: 0;
+    top: 50%;
+    transform: translateY(-50%);
+    background: #EEEEEE;
+}
+.divider-t::before,
+.divider-t-f5::before,
+.divider-t-d::before {
+    content: '';
+    width: 100%;
+    height: 2rpx;
+    position: absolute;
+    top: 0;
+    background: #EEEEEE;
+}
+.divider-b::after,
+.divider-b-f5::after,
+.divider-b-d::after {
+    content: '';
+    width: 100%;
+    height: 2rpx;
+    position: absolute;
+    bottom: 0;
+    background: #EEEEEE;
+}
+
+/**
+ * 标题左侧边线
+*/
+.title-left-border {
+    position: relative;
+    padding-left: 20rpx;
+}
+.title-left-border::before {
+    content: '';
+    width: 8rpx;
+    height: 32rpx;
+    border-radius: 6rpx;
+    position: absolute;
+    top: 50%;
+    left: 0;
+    transform: translateY(-50%);
+}
+
+/**
+ * 导航菜单左侧边线
+ */
+.nav-left-border {
+    position: relative;
+    padding-left: 20rpx;
+}
+.nav-left-border::before {
+    content: '';
+    width: 6rpx;
+    height: 40rpx;
+    border-radius: 6rpx;
+    position: absolute;
+    top: 50%;
+    left: 0;
+    transform: translateY(-50%);
+}
+/**
+ * 延迟动画
+ */
+.animate-linear {
+    transition: all 0.3s linear;
+}
+
+/**
+ * 呼吸
+ */
+/* <div class="breathe"></div> */
+.breathe {
+    background-color: #FF7C74;
+    border-radius: 100%;
+    width: 12rpx;
+    height: 12rpx;
+    position: relative;
+}
+.breathe::before,
+.breathe::after {
+    content: '';
+    background-color: rgba(255, 124, 116, 0.7);
+    border-radius: 50%;
+    position: absolute;
+    animation: loading 2s infinite ease-in-out;
+}
+.breathe::before {
+    width: 24rpx;
+    height: 24rpx;
+    top: -6rpx;
+    left: -6rpx;
+}
+.breathe::after {
+    width: 36rpx;
+    height: 36rpx;
+    top: -12rpx;
+    left: -12rpx;
+}
+
+@keyframes loading {
+    0% {
+        opacity: 0.5;
+        -webkit-transform: scale(1);
+    }
+
+    50% {
+        opacity: 0.7;
+        -webkit-transform: scale(1.12);
+    }
+
+    100% {
+        opacity: 0.5;
+        -webkit-transform: scale(1);
+    }
+}
+
+/**
+ * 扩散效果
+ */
+/* <div class="spread margin-left-xxxl">
+	<div class="ring"></div>
+	<div class="ring"></div>
+	<div class="ring"></div>
+</div> */
+.spread {
+    background-color: #FF7C74;
+    height: 16rpx;
+    width: 16rpx;
+    border-radius: 100%;
+    position: relative;
+    z-index: 1;
+}
+.spread .ring {
+    position: absolute;
+    background-color: inherit;
+    height: 100%;
+    width: 100%;
+    border-radius: 100%;
+    opacity: .8;
+    /* 速度为1.5 * 层数 = 实际运行速度，速度修改则 animation-delay 属性也修改相同速度 */
+    animation: pulsing 4.5s ease-out infinite;
+}
+
+/* 速度为1*层数 */
+.spread .ring:nth-of-type(1) {
+    -webkit-animation-delay: -1.5s;
+    animation-delay: -1.5s;
+}
+
+/* 速度为1*层数 */
+.spread .ring:nth-of-type(2) {
+    -webkit-animation-delay: -3s;
+    animation-delay: -3s;
+}
+
+@keyframes pulsing {
+    100% {
+        transform: scale(3);
+        opacity: 0
+    }
+}
+
+/**
+ * 通知
+ */
+.uni-noticebar {
+    padding: 0 !important;
+    margin: 0 !important;
+}
+
+
+/**
+ * 顶部搜索按钮宽度
+ */
+.top-search-width {
+    width: calc(100% - 250rpx) !important;
+    /* #ifdef MP-ALIPAY */
+    width: calc(100% - 290rpx) !important;
+    /* #endif */
+}
+
+/**
+ * 小程序端距离顶部位置的控制
+ */
+.weixin-nav-padding-top {
+    /* #ifndef H5  */
+    padding-top: calc(var(--status-bar-height) + 10rpx);
+    /* #endif */
+}
+
+/* 数字和文字超出范围不整体换行 */
+.text-word-break {
+    word-break: break-all;
+    overflow-wrap: break-word;
+    word-wrap: break-word;
+}
+/* 指示器上下显示 */
+.indicator_up_down_location {
+    position: absolute;
+    z-index: 1;
+    padding-top: 20rpx;
+    padding-bottom: 20rpx;
+    display: flex;
+    flex-direction: column;
+}
+.indicator_up_down_location .dot-item {
+    margin: 6rpx 0;
+}
+/* 指示器左右显示 */
+.indicator_about_location {
+    position: absolute;
+    z-index: 1;
+    padding-right: 20rpx;
+    padding-left: 20rpx;
+    display: flex;
+}
+.indicator_about_location .dot-item {
+    margin: 0 6rpx;
+}
\ No newline at end of file
diff --git a/common/css/plugins.css b/common/css/plugins.css
new file mode 100644
index 0000000..448992d
--- /dev/null
+++ b/common/css/plugins.css
@@ -0,0 +1,265 @@
+/*
+ * 优惠劵
+ */
+.plugins-coupon-container .item {
+    overflow: hidden;
+    height: 180rpx;
+}
+.plugins-coupon-container .v-left {
+    width: calc(100% - 140rpx);
+    padding: 30rpx 0 30rpx 20rpx;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+}
+.plugins-coupon-container .v-left .base .symbol {
+    font-family: Verdana, Tahoma;
+}
+.plugins-coupon-container .v-left .base .price {
+    font-weight: 700;
+    font-family: arial;
+    font-size: 76rpx;
+}
+.plugins-coupon-container .v-left .base .unit {
+    margin-left: 5rpx;
+}
+.plugins-coupon-container .v-left .base .desc {
+    margin-left: 20rpx;
+}
+.plugins-coupon-container .v-left .base-tips,
+.plugins-coupon-container .v-left .base-time {
+    margin-top: 10rpx;
+}
+.plugins-coupon-container .v-right {
+    width: 140rpx;
+    height: 180rpx;
+    color: #fff;
+    font-weight: 500;
+    position: relative;
+    text-align: center;
+}
+.plugins-coupon-container .v-right:before {
+    content: '';
+    display: inline-block;
+    height: 100%;
+    vertical-align: middle;
+}
+.plugins-coupon-container .v-right .circle {
+    display: block;
+    position: absolute;
+    left: -1px;
+    top: -3px;
+    width: 3px;
+    height: 180rpx;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAACpCAYAAADur4c3AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3NpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo3MjUzYzIwOS04ZWNlLTRlNTctODQ4OC01ZDExOTkwOGNkYmMiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MTM1QzgxREZGRDI5MTFFNTg3QjhGRUQ1MDY5OURERUQiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MTM1QzgxREVGRDI5MTFFNTg3QjhGRUQ1MDY5OURERUQiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTJiNzVkOGUtZDc2Yi00MzEzLWFmNmYtYTJkNTRlYTI4YTY1IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjcyNTNjMjA5LThlY2UtNGU1Ny04NDg4LTVkMTE5OTA4Y2RiYyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pvy+vnQAAAEqSURBVHjaYvz//z8DDDAxIAFyOVeBOAHEYfyPMDsLmXMfmfMT2YADDP8h4CEQq4A4aUDMA1LNSKZDXwJxGcg1yJaWIXOeInO+IxuwA+acK0AsA+IEADEbic7hhPOAer4DcQcQMyNb2oLMeYVsADcyZwPMObuBWBTEsQFpI9E54sjO+QvEc0F+YoHKJgHxJ2TnvEM2gBmZswrmnA1AzAXiaJPhHC1k58BNQ3bBTGTOR2QD/iJzFsH8Mw/kHxBHggzn2KA7BxzWyC5Yisz5imwACmc2LLY7QbEN4nCS4ZwAIGZFds5lUEpEdsF6nKn3PTJnAsiAV0BcBsSM5GamFCDmQXYOOJ8iu2Anzrz9HKU8ABlwDYgTKcnbo0XNaFEzWtQgipqOYVLUAAQYAKPWa4c8cIHnAAAAAElFTkSuQmCC) no-repeat;
+}
+.plugins-coupon-container .item-disabled .v-right {
+    background: #dfdfdf !important;
+    color: #c0c0c0 !important;
+    cursor: no-drop !important;
+}
+
+/**
+ * 标签
+ */
+.plugins-label {
+    z-index: 2;
+    box-sizing: border-box;
+    white-space: initial;
+    max-width: 100%;
+}
+.plugins-label-text {
+    padding: 10rpx 10rpx 0 10rpx;
+}
+.plugins-label .lv:not(:last-child) {
+    margin-right: 10rpx;
+}
+.plugins-label .lv {
+    margin-bottom: 10rpx;
+}
+.plugins-label-img.plugins-label-bottom-left .lv,
+.plugins-label-img.plugins-label-bottom-center .lv,
+.plugins-label-img.plugins-label-bottom-right .lv {
+    margin-bottom: 0;
+    margin-top: 10rpx;
+}
+.plugins-label .lv view {
+    padding: 4rpx 12rpx;
+    -webkit-box-shadow: 0px 1px 2px -1px rgb(0 0 0 / 60%);
+    box-shadow: 0px 1px 2px -1px rgb(0 0 0 / 60%);
+}
+.plugins-label-img image {
+    width: 80rpx !important;
+    height: 80rpx !important;
+}
+.plugins-label-top-left {
+    left: 0;
+    top: 0;
+}
+.plugins-label-top-center {
+    left: 0;
+    top: 0;
+    width: 100%;
+    text-align: center;
+}
+.plugins-label-top-right {
+    top: 0;
+    right: 0;
+}
+.plugins-label-bottom-left,
+.plugins-label-bottom-center,
+.plugins-label-bottom-right {
+    bottom: calc(100% - 380rpx);
+}
+.plugins-label-bottom-left {
+    left: 0;
+}
+.plugins-label-bottom-center {
+    width: 100%;
+    text-align: center;
+}
+.plugins-label-bottom-right {
+    right: 0;
+}
+
+/**
+ * 商品列表标签处理
+ */
+.goods-data-rolling-list .plugins-label-bottom-left,
+.goods-data-rolling-list .plugins-label-bottom-center,
+.goods-data-rolling-list .plugins-label-bottom-right {
+    bottom: calc(100% - 240rpx) !;
+}
+.goods-data-list .plugins-label-bottom-left,
+.goods-data-list .plugins-label-bottom-center,
+.goods-data-list .plugins-label-bottom-right {
+    bottom: 0;
+}
+
+/**
+ * 灰度样式
+ */
+.grayscale {
+    filter: grayscale(100%);
+    -webkit-filter: grayscale(100%);
+    -moz-filter: grayscale(100%);
+    -ms-filter: grayscale(100%);
+    -o-filter: grayscale(100%);
+}
+
+
+/**
+ * 博客 - 列表
+ */
+.plugins-blog-list .blog-img {
+    width: 200rpx !important;
+    height: 170rpx !important;
+}
+.plugins-blog-list .base {
+    width: calc(100% - 220rpx);
+}
+
+/*
+ * 博客 - 滚动
+ */
+.plugins-blog-rolling-list swiper,
+.plugins-blog-rolling-list .item .blog-img {
+    height: 180rpx !important;
+}
+.plugins-blog-rolling-list .item .blog-title {
+    left: 0;
+    bottom: 0;
+    width: calc(100% - 26rpx);
+    background-color: rgba(0, 0, 0, .5);
+}
+
+/**
+ * 博客 - 九方格
+ */
+.plugins-blog-grid-list .item {
+    width: calc(50% - 10rpx);
+    float: left;
+    padding-bottom: 10rpx;
+    margin-bottom: 20rpx;
+}
+.plugins-blog-grid-list .item:nth-of-type(2n + 1) {
+    margin-right: 10rpx;
+}
+.plugins-blog-grid-list .item:nth-of-type(2n) {
+    margin-left: 10rpx;
+}
+.plugins-blog-grid-list .item .blog-img {
+    width: 100%;
+    height: 220rpx !important;
+}
+
+/**
+* 门店 - 数据列表
+*/
+.plugins-realstore-data-list .item .address-content {
+    width: calc(100% - 150rpx);
+}
+
+.plugins-realstore-data-list .item .address-distance {
+    right: 20rpx;
+    bottom: 18rpx;
+}
+
+.plugins-realstore-data-list .item .icon-list {
+    right: 24rpx;
+    top: 36rpx;
+}
+.plugins-realstore-data-list .item .icon-list .icon-item {
+    width: 46rpx;
+    height: 46rpx;
+    line-height: 46rpx;
+}
+.plugins-realstore-data-list .item .icon-item .badge-icon {
+    top: -10px;
+    right: 2px;
+}
+.plugins-realstore-data-list .item .icon-list .icon-item {
+    background: rgba(226, 44, 8, 0.08);
+    border-radius: 8rpx;
+    color: #E46248;
+}
+.plugins-realstore-data-list .item .icon-list .icon-item:not(:last-child) {
+    margin-right: 26rpx;
+}
+.plugins-realstore-data-list .item .logo {
+    width: 100rpx;
+    height: 100rpx !important;
+}
+.plugins-realstore-data-list .item .base-right {
+    padding-left: 14rpx;
+}
+.plugins-realstore-data-list .item .base-right .title {
+    width: calc(100% - 110rpx);
+}
+
+/**
+ * 多商户 - 数据列表
+ */
+.plugins-shop-data-list .item .logo {
+    width: 100rpx;
+    height: 100rpx !important;
+}
+.plugins-shop-data-list .item .item-right-icon {
+    position: absolute;
+    right: 12px;
+    top: 50%;
+    transform: translateY(-50%);
+}
+.plugins-shop-data-list .item .right-content {
+    padding-left: 14rpx;
+    margin-right: 50rpx;
+}
+.plugins-shop-data-list .item .auth-icon .icon {
+    width: 28rpx;
+    height: 28rpx !important;
+    margin-right: 10rpx;
+}
+.plugins-shop-data-list .item .desc {
+    min-height: 72rpx;
+    line-height: 36rpx;
+}
\ No newline at end of file
diff --git a/common/css/theme.css b/common/css/theme.css
new file mode 100644
index 0000000..2dda8ce
--- /dev/null
+++ b/common/css/theme.css
@@ -0,0 +1,838 @@
+/******************** 红色 ********************/
+/**
+ * 边线 搭配色、次主色、主色
+ */
+.theme-red .border-color-main-pair {
+	border-color: #F6C133 !important;
+}
+.theme-red .border-color-main-light {
+	border-color: #ffdbe2 !important;
+}
+.theme-red .border-color-main {
+	border-color: #ff0036 !important;
+}
+
+/**
+ * 边框 搭配色、次主色、主色
+ */
+.theme-red .br-main-pair {
+	border: 1px solid #F6C133 !important;
+}
+.theme-red .br-main-light {
+	border: solid 1px #ffdbe2 !important;
+}
+.theme-red .br-main {
+	border: 1px solid #ff0036 !important;
+}
+
+/**
+ * 虚线边框 搭配色、次主色、主色
+ */
+.theme-red .br-dashed-main-pair {
+	border: dashed 1px #F6C133 !important;
+}
+.theme-red .br-dashed-main-light {
+	border: dashed 1px #ffdbe2 !important;
+}
+.theme-red .br-dashed-main {
+	border: dashed 1px #ff0036 !important;
+}
+
+/**
+ * 文本颜色 搭配色、次主色、主色
+ */
+.theme-red .cr-main-pair {
+	color: #F6C133 !important;
+}
+.theme-red .cr-main-light {
+	color: #ffdbe2 !important;
+}
+.theme-red .cr-main {
+	color: #ff0036 !important;
+}
+
+/**
+ * 背景色 搭配色、次主色、主色
+ */
+.theme-red .bg-main-pair {
+	background-color: #F6C133 !important;
+}
+.theme-red .bg-main-light {
+	background-color: #ffdbe2 !important;
+}
+.theme-red .bg-main {
+	background-color: #ff0036 !important;
+}
+
+/**
+ * 导航伪类背景色
+ */
+.theme-red .nav-active-line::before {
+	background: #ff0036;
+}
+.theme-red button[disabled].bg-main-pair {
+	background-color: #d0cbca !important;
+    border-color: #d0cbca !important;
+	color: #eaeaea !important;
+}
+.theme-red button[disabled].bg-main-light {
+	background-color: #ffe9ed !important;
+    border-color: #ffe9ed !important;
+	color: #ffa5b7 !important;
+}
+.theme-red button[disabled].bg-main {
+	background-color: #ffa7ba !important;
+    border-color: #ffa7ba !important;
+	color: #fff5f7 !important;
+}
+
+/**
+ * 标题左侧边线
+*/
+.theme-red .title-left-border::before {
+	background: linear-gradient(180deg, #ff0036 0%, #ffdbe2 100%);
+}
+
+/**
+ * 导航菜单左侧边线
+ */
+.theme-red .nav-left-border::before {
+	background: #ff0036;
+}
+
+
+
+
+/******************** 黄色 ********************/
+/**
+ * 边线 搭配色、次主色、主色
+ */
+.theme-yellow .border-color-main-pair {
+    border-color: #FF0036 !important;
+}
+.theme-yellow .border-color-main-light {
+    border-color: #ffebd2 !important;
+}
+.theme-yellow .border-color-main {
+    border-color: #f6c133 !important;
+}
+
+/**
+ * 边框 搭配色、次主色、主色
+ */
+.theme-yellow .br-main-pair {
+    border: 1px solid #FF0036 !important;
+}
+.theme-yellow .br-main-light {
+    border: solid 1px #ffebd2 !important;
+}
+.theme-yellow .br-main {
+    border: 1px solid #f6c133 !important;
+}
+
+/**
+ * 虚线边框 搭配色、次主色、主色
+ */
+.theme-yellow .br-dashed-main-pair {
+    border: dashed 1px #FF0036 !important;
+}
+.theme-yellow .br-dashed-main-light {
+    border: dashed 1px #ffebd2 !important;
+}
+.theme-yellow .br-dashed-main {
+    border: dashed 1px #f6c133 !important;
+}
+
+/**
+ * 文本颜色 搭配色、次主色、主色
+ */
+.theme-yellow .cr-main-pair {
+    color: #FF0036 !important;
+}
+.theme-yellow .cr-main-light {
+    color: #ffebd2 !important;
+}
+.theme-yellow .cr-main {
+    color: #f6c133 !important;
+}
+
+/**
+ * 导航伪类背景色
+ */
+.theme-yellow .nav-active-line::before {
+    background: #f6c133;
+}
+
+/**
+ * 背景色 搭配色、次主色、主色
+ */
+.theme-yellow .bg-main-pair {
+    background-color: #FF0036 !important;
+}
+.theme-yellow .bg-main-light {
+    background-color: #ffebd2 !important;
+}
+.theme-yellow .bg-main {
+    background-color: #f6c133 !important;
+}
+.theme-yellow button[disabled].bg-main-pair {
+    background-color: #b5a29c !important;
+    border-color: #b5a29c !important;
+    color: #8c766f !important;
+}
+.theme-yellow button[disabled].bg-main-light {
+    background-color: #fbebd6 !important;
+    border-color: #fbebd6 !important;
+    color: #ffcc40 !important;
+}
+.theme-yellow button[disabled].bg-main {
+    background-color: #fdd178 !important;
+    border-color: #fdd178 !important;
+    color: #fff7e7 !important;
+}
+
+/**
+ * 标题左侧边线
+*/
+.theme-yellow .title-left-border::before {
+    background: linear-gradient(180deg, #f6c133 0%, #ffebd2 100%);
+}
+
+/**
+ * 导航菜单左侧边线
+ */
+.theme-yellow .nav-left-border::before {
+    background: #f6c133;
+}
+
+
+
+
+
+/******************** 黑色 ********************/
+/**
+ * 边线 搭配色、次主色、主色
+ */
+.theme-black .border-color-main-pair {
+	border-color: #D3B881 !important;
+}
+.theme-black .border-color-main-light {
+	border-color: #dcdcdc !important;
+}
+.theme-black .border-color-main {
+	border-color: #333333 !important;
+}
+
+/**
+ * 边框 搭配色、次主色、主色
+ */
+.theme-black .br-main-pair {
+	border: 1px solid #D3B881 !important;
+}
+.theme-black .br-main-light {
+	border: solid 1px #dcdcdc !important;
+}
+.theme-black .br-main {
+	border: 1px solid #333333 !important;
+}
+
+/**
+ * 虚线边框 搭配色、次主色、主色
+ */
+.theme-black .br-dashed-main-pair {
+	border: dashed 1px #D3B881 !important;
+}
+.theme-black .br-dashed-main-light {
+	border: dashed 1px #dcdcdc !important;
+}
+.theme-black .br-dashed-main {
+	border: dashed 1px #333333 !important;
+}
+
+/**
+ * 文本颜色 搭配色、次主色、主色
+ */
+.theme-black .cr-main-pair {
+	color: #D3B881 !important;
+}
+.theme-black .cr-main-light {
+	color: #dcdcdc !important;
+}
+.theme-black .cr-main {
+	color: #333333 !important;
+}
+
+/**
+ * 背景色 搭配色、次主色、主色
+ */
+.theme-black .bg-main-pair {
+	background-color: #D3B881 !important;
+}
+.theme-black .bg-main-light {
+	background-color: #dcdcdc !important;
+}
+.theme-black .bg-main {
+	background-color: #333333 !important;
+}
+
+/**
+ * 导航伪类背景色
+ */
+.theme-black .nav-active-line::before {
+	background: #333333;
+}
+.theme-black button[disabled].bg-main-pair {
+	background-color: #bdece8 !important;
+    border-color: #bdece8 !important;
+	color: #edfbf9 !important;
+}
+.theme-black button[disabled].bg-main-light {
+	background-color: #efefef !important;
+    border-color: #efefef !important;
+	color: #b7b7b7 !important;
+}
+.theme-black button[disabled].bg-main {
+	background-color: #c7c7c7 !important;
+    border-color: #c7c7c7 !important;
+	color: #e2e2e2 !important;
+}
+
+/**
+ * 标题左侧边线
+*/
+.theme-black .title-left-border::before {
+	background: linear-gradient(180deg, #333333 0%, #dcdcdc 100%);
+}
+
+/**
+ * 导航菜单左侧边线
+ */
+.theme-black .nav-left-border::before {
+	background: #333333;
+}
+
+
+
+
+
+/******************** 绿色 ********************/
+/**
+ * 边线 搭配色、次主色、主色
+ */
+.theme-green .border-color-main-pair {
+	border-color: #20A5A2 !important;
+}
+.theme-green .border-color-main-light {
+	border-color: #cce8d2 !important;
+}
+.theme-green .border-color-main {
+	border-color: #20a53a !important;
+}
+
+/**
+ * 边框 搭配色、次主色、主色
+ */
+.theme-green .br-main-pair {
+	border: 1px solid #20A5A2 !important;
+}
+.theme-green .br-main-light {
+	border: solid 1px #cce8d2 !important;
+}
+.theme-green .br-main {
+	border: 1px solid #20a53a !important;
+}
+
+/**
+ * 虚线边框 搭配色、次主色、主色
+ */
+.theme-green .br-dashed-main-pair {
+	border: dashed 1px #20A5A2 !important;
+}
+.theme-green .br-dashed-main-light {
+	border: dashed 1px #cce8d2 !important;
+}
+.theme-green .br-dashed-main {
+	border: dashed 1px #20a53a !important;
+}
+
+/**
+ * 文本颜色 搭配色、次主色、主色
+ */
+.theme-green .cr-main-pair {
+	color: #20A5A2 !important;
+}
+.theme-green .cr-main-light {
+	color: #cce8d2 !important;
+}
+.theme-green .cr-main {
+	color: #20a53a !important;
+}
+
+/**
+ * 背景色 搭配色、次主色、主色
+ */
+.theme-green .bg-main-pair {
+	background-color: #20A5A2 !important;
+}
+.theme-green .bg-main-light {
+	background-color: #cce8d2 !important;
+}
+.theme-green .bg-main {
+	background-color: #20a53a !important;
+}
+
+/**
+ * 导航伪类背景色
+ */
+.theme-green .nav-active-line::before {
+	background: #20a53a;
+}
+.theme-green button[disabled].bg-main-pair {
+	background-color: #cfaae2 !important;
+    border-color: #cfaae2 !important;
+	color: #e6deea !important;
+}
+.theme-green button[disabled].bg-main-light {
+	background-color: #daeade !important;
+    border-color: #daeade !important;
+	color: #9dcaa6 !important;
+}
+.theme-green button[disabled].bg-main {
+	background-color: #a8c5ae !important;
+    border-color: #a8c5ae !important;
+	color: #d8eadc !important;
+}
+
+/**
+ * 标题左侧边线
+*/
+.theme-green .title-left-border::before {
+	background: linear-gradient(180deg, #20a53a 0%, #cce8d2 100%);
+}
+
+/**
+ * 导航菜单左侧边线
+ */
+.theme-green .nav-left-border::before {
+	background: #20a53a;
+}
+
+
+
+
+/******************** 橙色 ********************/
+/**
+ * 边线 搭配色、次主色、主色
+ */
+.theme-orange .border-color-main-pair {
+	border-color: #F6C133 !important;
+}
+.theme-orange .border-color-main-light {
+	border-color: #fde4d1 !important;
+}
+.theme-orange .border-color-main {
+	border-color: #fe6f04 !important;
+}
+
+/**
+ * 边框 搭配色、次主色、主色
+ */
+.theme-orange .br-main-pair {
+	border: 1px solid #F6C133 !important;
+}
+.theme-orange .br-main-light {
+	border: solid 1px #fde4d1 !important;
+}
+.theme-orange .br-main {
+	border: 1px solid #fe6f04 !important;
+}
+
+/**
+ * 虚线边框 搭配色、次主色、主色
+ */
+.theme-orange .br-dashed-main-pair {
+	border: dashed 1px #F6C133 !important;
+}
+.theme-orange .br-dashed-main-light {
+	border: dashed 1px #fde4d1 !important;
+}
+.theme-orange .br-dashed-main {
+	border: dashed 1px #fe6f04 !important;
+}
+
+/**
+ * 文本颜色 搭配色、次主色、主色
+ */
+.theme-orange .cr-main-pair {
+	color: #F6C133 !important;
+}
+.theme-orange .cr-main-light {
+	color: #fde4d1 !important;
+}
+.theme-orange .cr-main {
+	color: #fe6f04 !important;
+}
+
+/**
+ * 背景色 搭配色、次主色、主色
+ */
+.theme-orange .bg-main-pair {
+	background-color: #F6C133 !important;
+}
+.theme-orange .bg-main-light {
+	background-color: #fde4d1 !important;
+}
+.theme-orange .bg-main {
+	background-color: #fe6f04 !important;
+}
+
+/**
+ * 导航伪类背景色
+ */
+.theme-orange .nav-active-line::before {
+	background: #fe6f04;
+}
+.theme-orange button[disabled].bg-main-pair {
+	background-color: #b5a29c !important;
+    border-color: #b5a29c !important;
+	color: #8c766f !important;
+}
+.theme-orange button[disabled].bg-main-light {
+	background-color: #fbe9dc !important;
+    border-color: #fbe9dc !important;
+	color: #f7c49e !important;
+}
+.theme-orange button[disabled].bg-main {
+	background-color: #f7cdad !important;
+    border-color: #f7cdad !important;
+	color: #f7efea !important;
+}
+
+/**
+ * 标题左侧边线
+*/
+.theme-orange .title-left-border::before {
+	background: linear-gradient(180deg, #fe6f04 0%, #fde4d1 100%);
+}
+
+/**
+ * 导航菜单左侧边线
+ */
+.theme-orange .nav-left-border::before {
+	background: #fe6f04;
+}
+
+
+
+
+/******************** 蓝色 ********************/
+/**
+ * 边线 搭配色、次主色、主色
+ */
+.theme-blue .border-color-main-pair {
+	border-color: #16CEFF !important;
+}
+.theme-blue .border-color-main-light {
+	border-color: #d1e4ff !important;
+}
+.theme-blue .border-color-main {
+	border-color: #1677ff !important;
+}
+
+/**
+ * 边框 搭配色、次主色、主色
+ */
+.theme-blue .br-main-pair {
+	border: 1px solid #16CEFF !important;
+}
+.theme-blue .br-main-light {
+	border: solid 1px #d1e4ff !important;
+}
+.theme-blue .br-main {
+	border: 1px solid #1677ff !important;
+}
+
+/**
+ * 虚线边框 搭配色、次主色、主色
+ */
+.theme-blue .br-dashed-main-pair {
+	border: dashed 1px #16CEFF !important;
+}
+.theme-blue .br-dashed-main-light {
+	border: dashed 1px #d1e4ff !important;
+}
+.theme-blue .br-dashed-main {
+	border: dashed 1px #1677ff !important;
+}
+
+/**
+ * 文本颜色 搭配色、次主色、主色
+ */
+.theme-blue .cr-main-pair {
+	color: #16CEFF !important;
+}
+.theme-blue .cr-main-light {
+	color: #d1e4ff !important;
+}
+.theme-blue .cr-main {
+	color: #1677ff !important;
+}
+
+/**
+ * 背景色 搭配色、次主色、主色
+ */
+.theme-blue .bg-main-pair {
+	background-color: #16CEFF !important;
+}
+.theme-blue .bg-main-light {
+	background-color: #d1e4ff !important;
+}
+.theme-blue .bg-main {
+	background-color: #1677ff !important;
+}
+
+/**
+ * 导航伪类背景色
+ */
+.theme-blue .nav-active-line::before {
+	background: #1677ff;
+}
+.theme-blue button[disabled].bg-main-pair {
+	background-color: #efcbf5 !important;
+    border-color: #efcbf5 !important;
+	color: #faf1fb !important;
+}
+.theme-blue button[disabled].bg-main-light {
+	background-color: #e3eefd !important;
+    border-color: #e3eefd !important;
+	color: #b9d3f7 !important;
+}
+.theme-blue button[disabled].bg-main {
+	background-color: #bcd3f5 !important;
+    border-color: #bcd3f5 !important;
+	color: #eef4fd !important;
+}
+
+/**
+ * 标题左侧边线
+*/
+.theme-blue .title-left-border::before {
+	background: linear-gradient(180deg, #1677ff 0%, #d1e4ff 100%);
+}
+
+/**
+ * 导航菜单左侧边线
+ */
+.theme-blue .nav-left-border::before {
+	background: #1677ff;
+}
+
+
+
+
+/******************** 棕色 ********************/
+/**
+ * 边线 搭配色、次主色、主色
+ */
+.theme-brown .border-color-main-pair {
+	border-color: #8B1313 !important;
+}
+.theme-brown .border-color-main-light {
+	border-color: #eadcd2 !important;
+}
+.theme-brown .border-color-main {
+	border-color: #8B4513 !important;
+}
+
+/**
+ * 边框 搭配色、次主色、主色
+ */
+.theme-brown .br-main-pair {
+	border: 1px solid #8B1313 !important;
+}
+.theme-brown .br-main-light {
+	border: solid 1px #eadcd2 !important;
+}
+.theme-brown .br-main {
+	border: 1px solid #8B4513 !important;
+}
+
+/**
+ * 虚线边框 搭配色、次主色、主色
+ */
+.theme-brown .br-dashed-main-pair {
+	border: dashed 1px #8B1313 !important;
+}
+.theme-brown .br-dashed-main-light {
+	border: dashed 1px #eadcd2 !important;
+}
+.theme-brown .br-dashed-main {
+	border: dashed 1px #8B4513 !important;
+}
+
+/**
+ * 文本颜色 搭配色、次主色、主色
+ */
+.theme-brown .cr-main-pair {
+	color: #8B1313 !important;
+}
+.theme-brown .cr-main-light {
+	color: #eadcd2 !important;
+}
+.theme-brown .cr-main {
+	color: #8B4513 !important;
+}
+
+/**
+ * 背景色 搭配色、次主色、主色
+ */
+.theme-brown .bg-main-pair {
+	background-color: #8B1313 !important;
+}
+.theme-brown .bg-main-light {
+	background-color: #eadcd2 !important;
+}
+.theme-brown .bg-main {
+	background-color: #8B4513 !important;
+}
+
+/**
+ * 导航伪类背景色
+ */
+.theme-brown .nav-active-line::before {
+	background: #8B4513;
+}
+.theme-brown button[disabled].bg-main-pair {
+	background-color: #a6ded9 !important;
+    border-color: #a6ded9 !important;
+	color: #dff1ef !important;
+}
+.theme-brown button[disabled].bg-main-light {
+	background-color: #f1e6de !important;
+    border-color: #f1e6de !important;
+	color: #d6bdad !important;
+}
+.theme-brown button[disabled].bg-main {
+	background-color: #e4cdbc !important;
+    border-color: #e4cdbc !important;
+	color: #f9f4f0 !important;
+}
+
+/**
+ * 标题左侧边线
+*/
+.theme-brown .title-left-border::before {
+	background: linear-gradient(180deg, #8B4513 0%, #eadcd2 100%);
+}
+
+/**
+ * 导航菜单左侧边线
+ */
+.theme-brown .nav-left-border::before {
+	background: #8B4513;
+}
+
+
+
+
+/******************** 紫色 ********************/
+/**
+ * 边线 搭配色、次主色、主色
+ */
+.theme-purple .border-color-main-pair {
+	border-color: #3C8CEC !important;
+}
+.theme-purple .border-color-main-light {
+	border-color: #d6cbfb !important;
+}
+.theme-purple .border-color-main {
+	border-color: #623cec !important;
+}
+
+/**
+ * 边框 搭配色、次主色、主色
+ */
+.theme-purple .br-main-pair {
+	border: 1px solid #3C8CEC !important;
+}
+.theme-purple .br-main-light {
+	border: solid 1px #d6cbfb !important;
+}
+.theme-purple .br-main {
+	border: 1px solid #623cec !important;
+}
+
+/**
+ * 虚线边框 搭配色、次主色、主色
+ */
+.theme-purple .br-dashed-main-pair {
+	border: dashed 1px #3C8CEC !important;
+}
+.theme-purple .br-dashed-main-light {
+	border: dashed 1px #d6cbfb !important;
+}
+.theme-purple .br-dashed-main {
+	border: dashed 1px #623cec !important;
+}
+
+/**
+ * 文本颜色 搭配色、次主色、主色
+ */
+.theme-purple .cr-main-pair {
+	color: #3C8CEC !important;
+}
+.theme-purple .cr-main-light {
+	color: #d6cbfb !important;
+}
+.theme-purple .cr-main {
+	color: #623cec !important;
+}
+
+/**
+ * 背景色 搭配色、次主色、主色
+ */
+.theme-purple .bg-main-pair {
+	background-color: #3C8CEC !important;
+}
+.theme-purple .bg-main-light {
+	background-color: #d6cbfb !important;
+}
+.theme-purple .bg-main {
+	background-color: #623cec !important;
+}
+
+/**
+ * 导航伪类背景色
+ */
+.theme-purple .nav-active-line::before {
+	background: #623cec;
+}
+.theme-purple button[disabled].bg-main-pair {
+	background-color: #d8aed8 !important;
+    border-color: #d8aed8 !important;
+	color: #efe4ef !important;
+}
+.theme-purple button[disabled].bg-main-light {
+	background-color: #dcd6f1 !important;
+    border-color: #dcd6f1 !important;
+	color: #b2a7dc !important;
+}
+.theme-purple button[disabled].bg-main {
+	background-color: #bdb0ef !important;
+    border-color: #bdb0ef !important;
+	color: #e7e4f1 !important;
+}
+
+/**
+ * 标题左侧边线
+*/
+.theme-purple .title-left-border::before {
+	background: linear-gradient(180deg, #623cec 0%, #d6cbfb 100%);
+}
+
+/**
+ * 导航菜单左侧边线
+ */
+.theme-purple .nav-left-border::before {
+	background: #623cec;
+}
\ No newline at end of file
diff --git a/common/js/common/base.js b/common/js/common/base.js
new file mode 100644
index 0000000..026cc26
--- /dev/null
+++ b/common/js/common/base.js
@@ -0,0 +1,82 @@
+export default {
+    methods: {
+        //转义符换成普通字符
+        escape2Html(str) {
+            if (!str) return str;
+            var arrEntities = {
+                'lt': '<',
+                'gt': '>',
+                'nbsp': ' ',
+                'amp': '&',
+                'quot': '"'
+            };
+            return str.replace(/&(lt|gt|nbsp|amp|quot);/ig, function(all, t) {
+                return arrEntities[t];
+            });
+        },
+        //普通字符转换成转义符
+        html2Escape(sHtml) {
+            if (!sHtml) return sHtml;
+            return sHtml.replace(/[<>&"]/g, function(c) {
+                return {
+                    '<': '&lt;',
+                    '>': '&gt;',
+                    '&': '&amp;',
+                    '"': '&quot;'
+                } [c];
+            });
+        },
+        //setData polyfill 勿删!!!   (用于转换后的uniapp的项目能直接使用this.setData()函数)
+        setData: function(obj, callback) {
+            let that = this;
+            const handleData = (tepData, tepKey, afterKey) => {
+                var tepData2 = tepData;
+                tepKey = tepKey.split('.');
+                tepKey.forEach(item => {
+                    if (tepData[item] === null || tepData[item] === undefined) {
+                        let reg = /^[0-9]+$/;
+                        tepData[item] = reg.test(afterKey) ? [] : {};
+                        tepData2 = tepData[item];
+                    } else {
+                        tepData2 = tepData[item];
+                    }
+                });
+                return tepData2;
+            };
+            const isFn = function(value) {
+                return typeof value == 'function' || false;
+            };
+            Object.keys(obj).forEach(function(key) {
+                let val = obj[key];
+                key = key.replace(/\]/g, '').replace(/\[/g, '.');
+                let front, after;
+                let index_after = key.lastIndexOf('.');
+                if (index_after != -1) {
+                    after = key.slice(index_after + 1);
+                    front = handleData(that, key.slice(0, index_after), after);
+                } else {
+                    after = key;
+                    front = that;
+                }
+                if (front.$data && front.$data[after] === undefined) {
+                    Object.defineProperty(front, after, {
+                        get() {
+                            return front.$data[after];
+                        },
+                        set(newValue) {
+                            front.$data[after] = newValue;
+                            that.hasOwnProperty("$forceUpdate") && that.$forceUpdate();
+                        },
+                        enumerable: true,
+                        configurable: true
+                    });
+                    front[after] = val;
+                } else {
+                    that.$set(front, after, val);
+                }
+            });
+            this.$forceUpdate();
+            isFn(callback) && this.$nextTick(callback);
+        }
+    }
+}
\ No newline at end of file
diff --git a/common/js/common/common.js b/common/js/common/common.js
new file mode 100644
index 0000000..7353c95
--- /dev/null
+++ b/common/js/common/common.js
@@ -0,0 +1,653 @@
+const app = getApp();
+// 数据的默认值，避免没有值的时候报错
+export const old_radius = { radius: 0, radius_top_left: 0, radius_top_right: 0, radius_bottom_left: 0, radius_bottom_right: 0 };
+export const old_padding = { padding: 0, padding_top: 0, padding_bottom: 0, padding_left: 0, padding_right: 0 };
+export const old_margin = { margin: 0, margin_top: 0, margin_bottom: 0, margin_left: 0, margin_right: 0 };
+export const old_border_and_box_shadow = { border_is_show: '0', border_color: '#FF3F3F', border_style: 'solid',border_size: { padding: 1, padding_top: 1, padding_right: 1, padding_bottom: 1, padding_left: 1, }, box_shadow_color: '', box_shadow_x: 0, box_shadow_y: 0, box_shadow_blur: 0, box_shadow_spread: 0 };
+
+/**
+ * 判断一个对象是否为空。
+ *
+ * 为空的定义是对象的键的数量为0。这适用于任何对象，包括普通对象、数组（视为对象）等。
+ * 该函数不直接使用`Object.keys(obj).length === 0`进行判断，而是通过封装这个逻辑来提供一个独立的、可重用的函数。
+ * 这样做可以增加代码的可读性和可维护性，并且抽象了对象为空的检查，使得调用者不需要关心具体的实现细节。
+ *
+ * @param obj 要检查的对象。可以是任何类型的对象，包括数组。
+ * @returns 如果对象为空，则返回true；否则返回false。
+ */
+export function is_obj_empty(obj) {
+    return Object.keys(obj).length === 0;
+}
+
+export const border_width = (style) => {
+    if (!style) { return 0; }
+    if (style.border_is_show == '1') {
+        const { padding_left = 0, padding_right = 0 } = style.border_size || {};
+        return padding_left + padding_right;
+    } else {
+        return 0;
+    }
+}
+
+/**
+ * 根据指定的条件类型和值，判断字段值是否满足条件
+ * @param fieldValue 字段值，可以是任何类型
+ * @param type 条件类型，如'contains', 'is-empty', 'greater-than'等
+ * @param value 用于比较的值，可以是数字或字符串
+ * @returns 返回一个布尔值，表示字段值是否满足指定的条件
+ */
+export const custom_condition_judg = (fieldValue, type, value) => {
+    // 处理 null 或 undefined 的情况
+    if (fieldValue == null) {
+        return true;
+    }
+
+    // 提前计算并缓存转换结果
+    const stringValue = String(fieldValue);
+    const valueStr = String(value);
+    const numberValue = Number(value);
+    switch (type) {
+        case 'contains':
+        case 'does-not-contain':
+            // 处理包含和不包含的逻辑, 如果值为空，直接返回为空
+            if (!isEmpty(valueStr)) {
+                const result = stringValue.includes(valueStr);
+                return type === 'contains' ? result : !result;
+            } else {
+                return true;
+            }
+        case 'is-empty':
+        case 'is-not-empty':
+            // 处理为空和不为空的逻辑
+            const is_Empty = ['', '{}', '[]'].includes(stringValue.trim()) || (Array.isArray(fieldValue) && fieldValue.length === 0);
+            return type === 'is-empty' ? is_Empty : !is_Empty;
+        case 'greater-than':
+        case 'less-than':
+        case 'equal':
+            // 根据字段值的类型，进行数字间的比较
+            if (typeof fieldValue === 'number') {
+                return compare_numbers(fieldValue, numberValue, type);
+            } else if (Array.isArray(fieldValue) || typeof fieldValue === 'string') {
+                // 如果字段值是数组或字符串，比较数组长度和指定值
+                const valueLength = fieldValue?.length || 0;
+                return compare_numbers(valueLength, numberValue, type);
+            } else if (typeof fieldValue === 'object') {
+                // 如果字段值是对象，比较对象的属性值
+                const numericFieldValue = Object.keys(fieldValue)?.length || 0;
+                return compare_numbers(numericFieldValue, numberValue, type);
+            }
+        default:
+            return true;
+    }
+}
+
+/**
+ * 比较两个数字的大小
+ * @param a 第一个数字
+ * @param b 第二个数字
+ * @param type 比较类型，如'greater-than', 'less-than', 'equal'等
+ * @returns 根据比较类型返回比较结果
+ */
+const compare_numbers = (a, b, type) => {
+    switch (type) {
+        case 'greater-than': return a > b;
+        case 'less-than': return a < b;
+        case 'equal': return a === b;
+        default: return false;
+    }
+}
+
+/**
+ * 根据新的样式对象计算指示器的位置样式
+ * 
+ * 此函数根据指示器的新位置和当前位置以及底部距离来生成相应的CSS样式
+ * 它处理的是一个包含指示器位置信息的对象，并返回一个字符串形式的CSS样式
+ * 
+ * @param new_style 包含指示器新位置和当前位置及底部距离的样式对象
+ * @returns 返回计算出的指示器位置CSS样式字符串
+ */
+export const get_indicator_location = (new_style) => {
+    // 解构指示器的位置信息
+    const { indicator_new_location = '',  indicator_location = '', indicator_bottom = 0 } = new_style;
+    let styles = '';
+    // 根据指示器的新位置是水平方向（left或right）还是垂直方向（默认）来决定如何设置样式
+    if (['left', 'right'].includes(indicator_new_location)) {
+        // 如果是水平方向，根据指示器的当前位置设置top、center或bottom样式
+        if (indicator_location == 'flex-start') {
+            styles += `top: 0px;`;
+        } else if (indicator_location == 'center') {
+            styles += `top: 50%; transform: translateY(-50%);`;
+        } else {
+            styles += `bottom: 0px;`;
+        }
+    } else {
+        // 如果是垂直方向，根据指示器的当前位置设置left、center或right样式
+        if (indicator_location == 'flex-start') {
+            styles += `left: 0px;`;
+        } else if (indicator_location == 'center') {
+            styles += `left: 50%; transform: translateX(-50%);`;
+        } else {
+            styles += `right: 0px;`;
+        }
+    }
+    // 如果有位置的处理，就使用指示器的位置处理，否则的话就用下边距处理
+    styles += `${ !isEmpty(indicator_new_location) ? `${indicator_new_location}: ${ indicator_bottom }px;` : `bottom: ${ indicator_bottom }px;` }`;
+    // 返回计算出的指示器位置样式
+    return styles;
+}
+
+/**
+ * 判断给定条件是否符合资格，主要用于自定义内部各个组件是否符合显示条件
+ * @param field_list 字段列表，包含各个字段的数据
+ * @param condition 条件数据，包括字段、类型和值
+ * @param props 额外属性，包含自定义组和数据源等信息
+ * @returns 返回一个布尔值，表示是否符合条件
+ */
+export const get_is_eligible = (field_list, condition, sourceList, isCustom, isCustomGroup, customGroupFieldId) => {
+    try {
+        // 条件加特殊标识，避免选择的时候出现重复的
+        let new_field = condition.field;
+        // 如果包含{|}，则取第一个字段
+        if (condition.field.includes('{|}')) {
+            new_field = condition.field.split('{|}')[0];
+        }
+        // 获取对应条件字段的字段数据
+        let option = {};
+        if (field_list) {
+            // 判断是否是自定义组并且 自定义组选则了对应的数据源
+            if (isCustomGroup && !isEmpty(customGroupFieldId)) {
+                // 取出对应自定义组的内容
+                const group_option_list = field_list.find(item => item.field === customGroupFieldId);
+                // 取出自定义组内部数据源参数的详细数据
+                const new_field_list = group_option_list?.data || [];
+                // 通过对应条件，筛选出对应的数据
+                option = new_field_list.find(item => item.field === new_field);
+            } else {
+                option = field_list.find(item => item.field === new_field);
+            }
+        }
+        // 找不到对应的字段，就直接返回为成功，条件不存在
+        if (!isEmpty(option)) {
+            // 获取到字段的真实数据, option的使用主要是为了获取的他的中间参数和前缀，后缀等拼接在一起
+            const field_value = custom_condition_data(new_field || '', option || {}, sourceList, isCustom);
+            // 判断条件字段是否为空并且是显示面板才会生效，则直接返回true
+            if (!isEmpty(new_field) && !isEmpty(condition.type)) {
+                return custom_condition_judg(field_value, condition.type, condition.value);
+            } else {
+                return true;
+            }
+        } else {
+            return true;
+        }
+    } catch (error) {
+        return true; // 或者根据业务需求返回适当的默认值
+    }
+}
+
+/**
+ * 根据数据源ID和配置选项来处理和返回特定格式的数据
+ * 
+ * @param data_source_id 数据源ID字符串，可以包含多个用分号分隔的ID
+ * @param option 配置选项，包含数据处理的额外参数
+ * @param sourceList 数据源列表，用于查找和处理数据
+ * @param isCustom 是否为自定义模式，用于确定数据处理的方式
+ * @returns 返回处理后的数据字符串
+ */
+export const custom_condition_data = (data_source_id, option, sourceList, isCustom) => {
+    let data_value = '';
+    if (data_source_id.includes(';')) {
+        // 当数据源ID包含多个用分号分隔的ID时
+        // 取出所有的字段，使用;分割
+        const ids = data_source_id.split(';');
+        let text = '';
+        // 遍历每个ID，处理数据并合并
+        ids.forEach((item, index) => {
+            text += data_handling(item, sourceList, isCustom) + (index != ids.length - 1 ? (option?.join || '') : '');
+        });
+        data_value = text;
+    } else {
+        // 不输入商品， 文章和品牌时，从外层处理数据
+        // 当数据源ID不包含分号时，直接处理数据
+        data_value = data_handling(data_source_id, sourceList, isCustom);
+    }
+    // 如果数据是undefined或者null，则设置为空字符串
+    if (data_value == null) {
+        data_value = '';
+    }
+    // 根据配置选项，添加前缀和后缀到处理后的数据
+    return Array.isArray(data_value) || typeof data_value === "object" ? data_value : ((option?.first || '') + data_value + (option?.last || ''));
+}
+
+/**
+ * 数据处理函数
+ * 该函数根据数据源ID和一个数据对象，返回对应的图标路径
+ * 主要用于从复杂的数据结构中提取图标信息，根据是否是自定义图标，
+ * 从不同的数据层级中获取信息
+ * 
+ * @param data_source_id 数据源ID，用于定位图标在数据结构中的位置
+ * @param sourceList 包含图标数据的对象，可以是多层嵌套结构
+ * @param isCustom 布尔值，指示是否为自定义图标，影响数据获取的方式
+ * @returns 返回找到的图标路径，如果没有找到或数据为空，则返回空值
+ */
+const data_handling = (data_source_id, sourceList, isCustom) => {
+    // 不输入商品， 文章和品牌时，从外层处理数据
+    let new_data = get_nested_property(sourceList, data_source_id);
+    // 如果是商品,品牌，文章的图片， 其他的切换为从data中取数据
+    if (!isEmpty(sourceList.data) && isCustom) {
+        new_data = get_nested_property(sourceList.data, data_source_id);
+    }
+    return new_data;
+}
+
+/**
+ * 获取嵌套对象的属性值
+ * 
+ * 该函数旨在通过指定的属性路径获取嵌套对象中的属性值它接受一个对象和一个属性路径字符串作为参数，
+ * 并返回对应路径的属性值如果输入的路径无效或对象中不存在该路径，则返回空字符串
+ * 
+ * @param {Object} obj - 要从中获取属性的嵌套对象
+ * @param {string} path - 属性路径，使用点号分隔的字符串表示
+ * @returns {string} - 返回指定路径的属性值，如果路径无效则返回空字符串
+ */
+export function get_nested_property(obj, path) {
+    // 检查路径参数是否为字符串且非空，若不满足条件则返回空字符串
+    if (typeof path !== 'string' || !path) return '';
+    
+    // 将属性路径字符串拆分为属性键数组
+    const keys = path.split('.');
+    
+    // 使用reduce方法遍历属性键数组，逐层访问对象属性
+    // 如果当前对象存在且拥有下一个属性键，则继续访问；否则返回空字符串
+    return keys.reduce((o, key) => (o != null && o[key] != null ? o[key] : ''), obj) ?? '';
+}
+
+/**
+ * 根据数据源链接ID和属性源列表生成自定义链接
+ * 
+ * @param {string} data_source_link_id - 数据源链接ID，可以是单个ID或多个ID以分号分隔
+ * @param {object} propSourceList - 包含数据源的属性列表
+ * @param {object} source_link_option - 链接生成的可选配置，包括首尾添加的字符串和连接符
+ * @returns {string} 生成的自定义链接URL
+ */
+export function get_custom_link(data_source_link_id, propSourceList, source_link_option) {
+    let url = '';
+    if (!data_source_link_id) {
+        return '';
+    }
+    // 判断数据源链接ID是否包含分号，包含则表示有多个ID
+    if (data_source_link_id.includes(';')) {
+        // 分割数据源链接ID，处理多个ID
+        const ids = data_source_link_id.split(';');
+        let source_url = '';
+        // 遍历每个ID，获取对应的属性值并拼接成URL
+        ids.forEach((item, index) => {
+            // 判断数据源列表是否为空
+            if (!isEmpty(propSourceList.data)) {
+                // 从数据源列表的data属性中获取嵌套属性值，并使用指定的连接符连接
+                source_url += get_nested_property(propSourceList.data, item) + (index != ids.length -1 ? (source_link_option?.join || '') : '');
+            } else {
+                // 直接从数据源列表中获取嵌套属性值，并使用指定的连接符连接
+                source_url += get_nested_property(propSourceList, item) + (index != ids.length -1 ? (source_link_option?.join || '') : '');
+            }
+        });
+        url = source_url;
+    } else {
+        // 处理单个ID的情况
+        if (!isEmpty(propSourceList.data)) {
+            // 从数据源列表的data属性中获取嵌套属性值作为URL
+            url = get_nested_property(propSourceList.data, data_source_link_id);
+        } else {
+            // 直接从数据源列表中获取嵌套属性值作为URL
+            url = get_nested_property(propSourceList, data_source_link_id);
+        }
+    }
+    // 返回最终的URL，添加首尾的可选字符串
+    return (source_link_option?.first || '') + url + (source_link_option?.last || '');
+}
+
+/**
+ * 指示器的样式
+ *
+ * @param style_object 样式对象
+ * @returns 返回对应的值
+ */
+export function get_indicator_style(style_object) {
+    const { indicator_radius, indicator_style, indicator_size, color, indicator_new_location } = style_object;
+    let styles = '';
+    if (!isEmpty(indicator_radius)) {
+        styles += radius_computer(indicator_radius);
+    }
+    // 数字类型的指示器
+    if (indicator_style == 'num') {
+        styles += `color: ${color || '#DDDDDD'};`;
+        styles += `font-size: ${indicator_size * 2}rpx;`;
+    } else if (indicator_style == 'elliptic') {
+        // 宽的指示器，按照宽高1:3 来计算
+        styles += `background: ${color || '#DDDDDD'};`;
+        if (['left', 'right'].includes(indicator_new_location)) {
+            styles += `width: ${indicator_size * 2 }rpx; height: ${indicator_size * 6}rpx;`;
+        } else {
+            styles += `width: ${indicator_size * 6}rpx; height: ${indicator_size * 2}rpx;`;
+        }
+    } else {
+        // 圆点指示器
+        styles += `background: ${color || '#DDDDDD'};`;
+        styles += `width: ${indicator_size * 2}rpx; height: ${indicator_size * 2}rpx;`;
+    }
+    return styles;
+}
+/**
+ * 指示器的位置处理
+ *
+ * @param style_object 样式对象
+ * @returns 返回对应的值
+ */
+export function get_indicator_location_style(style_object) {
+    const { indicator_new_location,  indicator_location, indicator_bottom } = style_object;
+    let styles = '';
+    if (['left', 'right'].includes(indicator_new_location)) {
+        if (indicator_location == 'flex-start') {
+            styles += `top: 0px;`;
+        } else if (indicator_location == 'center') {
+            styles += `top: 50%; transform: translateY(-50%);`;
+        } else {
+            styles += `bottom: 0px;`;
+        }
+    } else {
+        if (indicator_location == 'flex-start') {
+            styles += `left: 0px;`;
+        } else if (indicator_location == 'center') {
+            styles += `left: 50%; transform: translateX(-50%);`;
+        } else {
+            styles += `right: 0px;`;
+        }
+    }
+    // 如果有位置的处理，就使用指示器的位置处理，否则的话就用下边距处理
+    styles += `${ !isEmpty(indicator_new_location) ? `${indicator_new_location}: ${ indicator_bottom }px;` : `bottom: ${ indicator_bottom }px;` }`;
+    return styles;
+};
+
+/**
+ * 判断对象数组等是否为空。
+ */
+export function isEmpty(value) {
+    return (
+        value === null ||
+        value === undefined ||
+        value === '' ||
+        value === NaN ||
+        (Array.isArray(value) && value.length === 0) ||
+        (typeof value === 'object' && Object.keys(value).length === 0)
+    )
+}
+/**
+ * 检查给定的参数是否为对象
+ *
+ * 此函数用于精确地验证一个变量是否为对象类型它通过以下步骤实现：
+ * 1. 特殊处理 `null` 值，因为 `null` 在 JavaScript 中被当作对象处理，但实质上它不是
+ * 2. 使用 `typeof` 操作符初步判断变量是否为对象
+ * 3. 使用 `Object.prototype.toString.call(obj)` 方法精确判断变量是否为普通的对象
+ *
+ * @param obj 未知类型的参数，待检查是否为对象
+ * @returns 如果参数是对象，则返回 true；否则返回 false
+ */
+export function is_obj(obj) {
+    // 特殊处理 null值，因为 typeof null 返回 "object"，但 null 并不是我们要检查的对象
+    if (obj === null) return false;
+    // 使用 typeof 排除非对象类型
+    if (typeof obj !== 'object') return false;
+    // 确认是普通对象
+    return Object.prototype.toString.call(obj) === '[object Object]';
+}
+/**
+ * 渐变色的方法
+ * color_list: [] 渐变色的存储
+ * direction 渐变色的角度
+ * @param {string[], string} path
+ * @returns {string}
+ */
+export function gradient_computer(new_style, is_return_all = true) {
+    let color_list = new_style.color_list;
+    let direction = new_style.direction;
+    return gradient_handle(color_list, direction, is_return_all);
+}
+/**
+ * 根据给定的颜色列表和方向生成一个线性渐变的CSS样式字符串。
+ *
+ * @param color_list 颜色列表，包含渐变中的各个颜色值。
+ * @param direction 渐变的方向，可以是角度或其他CSS支持的渐变方向。
+ * @param is_return_all 是否返回所有样式，包括渐变类型、颜色列表和方向。默认为false，只返回渐变样式。
+ * @returns 返回一个字符串，包含生成的线性渐变样式。
+ */
+export function gradient_handle(color_list, direction, is_return_all = true) {
+    let container_common_styles = ``;
+    if (color_list && color_list.length > 0) {
+        if (is_return_all) {
+            container_common_styles += `background:`;
+        }
+        container_common_styles += `linear-gradient(${direction || '180deg'},`;
+        const new_color_list = JSON.parse(JSON.stringify(color_list));
+        new_color_list.forEach((item, index) => {
+            container_common_styles += `${item.color ? item.color : 'rgb(255 255 255 / 0%)'}`;
+            if (color_list.length == 1) {
+                container_common_styles += ` ${item.color_percentage || 0}%, ${item.color ? item.color : 'rgb(255 255 255 / 0%)'} 100%`;
+            } else {
+                if (typeof item.color_percentage === 'number') {
+                    if (index == color_list.length - 1) {
+                        container_common_styles += ` ${item.color_percentage}%`;
+                    } else {
+                        container_common_styles += ` ${item.color_percentage}%,`;
+                    }
+                } else {
+                    if (index == color_list.length - 1) {
+                        container_common_styles += ` 100%`;
+                    } else if (index == 0) {
+                        container_common_styles += ` 0%,`;
+                    } else {
+                        container_common_styles += ` ${(100 / color_list.length) * index}%,`;
+                    }
+                }
+            }
+        });
+        container_common_styles += `)`;
+        if (is_return_all) {
+            container_common_styles += `;`;
+        }
+    }
+    return container_common_styles;
+}
+/**
+ * 设置内边距的方法
+ * new_style: 内边距的集合
+ * @param {string[], string} path
+ * @returns {string}
+ */
+export function padding_computer(new_style, scale = 1, is_custom = false, index) {
+    if (new_style) {
+        if (!is_custom) {
+            let padding_top = '';
+            if (index == 0) {
+                // 状态栏高度
+                var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
+                // #ifdef MP-TOUTIAO
+                bar_height = 0;
+                // #endif
+                let sticky_top = 0;
+                // #ifdef MP
+                sticky_top = bar_height + 5 + 10;
+                // #endif
+                // #ifdef H5 || MP-TOUTIAO
+                sticky_top = bar_height + 7 + 10;
+                // #endif
+                // #ifdef APP
+                sticky_top = bar_height + 0 + 10;
+                // #endif
+                padding_top = `padding-top:calc(${new_style.padding_top * 2 || 0}rpx + ${sticky_top}px);`;
+            }
+            return `padding: ${new_style.padding_top * 2 || 0}rpx ${new_style.padding_right * 2 || 0}rpx ${new_style.padding_bottom * 2 || 0}rpx ${new_style.padding_left * 2 || 0}rpx;` + padding_top;
+        } else {
+            return `padding: ${new_style.padding_top * scale || 0}px ${new_style.padding_right * scale || 0}px ${new_style.padding_bottom * scale || 0}px ${new_style.padding_left * scale || 0}px;`;
+        }
+    } else {
+        return '';
+    }
+}
+/**
+ * 设置外边距的方法
+ * new_style: 外边距的集合
+ * @param {string[], string} path
+ * @returns {string}
+ */
+export function margin_computer(new_style) {
+    return `margin: ${new_style.margin_top * 2 || 0}rpx ${new_style.margin_right * 2 || 0}rpx ${new_style.margin_bottom * 2 || 0}rpx ${new_style.margin_left * 2 || 0}rpx;`;
+}
+/**
+ * 设置圆角的方法
+ * new_style: 外边距的集合
+ * @param {string[], string} path
+ * @returns {string}
+ */
+export function radius_computer(new_style, scale = 1, is_custom = false) {
+    if (new_style) {
+        if (!is_custom) {
+            return `border-radius: ${new_style.radius_top_left * 2 || 0}rpx ${new_style.radius_top_right * 2 || 0}rpx ${new_style.radius_bottom_right * 2 || 0}rpx ${new_style.radius_bottom_left * 2 || 0}rpx;`;
+        } else {
+            return `border-radius: ${new_style.radius_top_left * scale || 0}px ${new_style.radius_top_right * scale || 0}px ${new_style.radius_bottom_right * scale || 0}px ${new_style.radius_bottom_left * scale || 0}px;`;
+        }
+    } else {
+        return '';
+    }
+}
+/**
+ * 设置阴影样式
+ * new_style: 外边距的集合
+ * @param {string[], string} path
+ * @returns {string}
+ */
+export function box_shadow_computer(new_style) {
+    return `box-shadow: ${new_style.box_shadow_x * 2 || 0}rpx ${new_style.box_shadow_y * 2 || 0}rpx ${new_style.box_shadow_blur * 2 || 0}rpx ${new_style.box_shadow_spread * 2 || 0}rpx ${new_style.box_shadow_color || 'rgba(0,0,0,0)'};`;
+}
+/**
+ * 设置阴影样式
+ * new_style: 外边距的集合
+ * @param {string[], string} path
+ * @returns {string}
+ */
+export function background_computer(new_style) {
+    if (new_style.background_img.length > 0) {
+        let url_styke = '';
+        if (new_style.background_img_style == '1') {
+            url_styke = 'background-repeat: repeat;';
+        } else if (new_style.background_img_style == '2') {} else {
+            url_styke = `background-repeat: no-repeat;background-position: center;`;
+        }
+        switch (new_style.background_img_style) {
+            case '1':
+                url_styke = `background-repeat: no-repeat;background-position: bottom;background-size: 100% auto;`;
+                break;
+            case '2':
+                url_styke = `background-repeat: no-repeat;background-position: center;background-size: 100% auto;`;
+                break;
+            case '3':
+                url_styke = 'background-repeat: repeat;';
+                break;
+            case '4':
+                url_styke = 'background-size: cover;background-position: center;';
+                break;
+            default:
+                url_styke = `background-repeat: no-repeat;background-position: top;background-size: 100% auto;`;
+                break;
+        }
+        return `background-image:url(${new_style.background_img[0].url});${url_styke}`;
+    } else {
+        return '';
+    }
+}
+
+/**
+ * 计算并返回边框的样式字符串
+ * 
+ * 此函数根据传入的新样式对象，决定是否显示边框以及边框的样式细节
+ * 如果边框需要显示，函数会构造相应的边框样式字符串，包括边框的宽度、样式和颜色；
+ * 如果边框不需要显示，则返回空字符串
+ * 
+ * @param {Object} new_style - 新样式对象，包含边框的相关属性
+ * @returns {String} 边框样式字符串或空字符串
+ */
+export const border_computer = (new_style) => {
+    // 从新样式对象中解构边框的相关属性，并设置默认值
+    const { border_is_show = '0', border_color = '', border_style = 'solid', border_size = { padding: 0, padding_bottom: 0, padding_left: 0, padding_right: 0, padding_top: 0 } } = new_style;
+    
+    // 根据边框是否需要显示的标志，决定是否构造并返回边框样式字符串
+    if (border_is_show == '1') {
+       return `border-width: ${border_size.padding_top}px ${border_size.padding_right}px ${border_size.padding_bottom}px ${border_size.padding_left}px;border-style: ${ border_style };border-color: ${border_color};`
+    }
+    
+    // 如果边框不需要显示，返回空字符串
+    return '';
+};
+
+/**
+ * 计算并组合组件的常用样式。
+ *
+ * 该函数通过调用一系列特定样式的计算函数，来组装一个组件的常用样式字符串。
+ * 这些样式包括渐变色、内边距、外边距、圆角和阴影等，为组件提供了一套完整的外观定义。
+ *
+ * @param new_style  组件的新样式对象，包含了需要计算的样式属性。
+ * @param scale      一个缩放比例，用于控制样式的缩放，默认为1。
+ * @param scale      用于控制样式的缩放比例，默认为1，表示不进行缩放。
+ * @param is_custom  一个布尔值，用于判断是否为自定义样式，默认为false。
+ * @param index      用于标识组件的索引，默认为0。
+ * @returns 返回一个字符串，包含了计算后的样式定义，可以被直接应用于组件的样式属性。
+ */
+export function common_styles_computer(new_style) {
+    return gradient_computer(new_style) + margin_computer(new_style) + radius_computer(new_style) + box_shadow_computer(new_style) + border_computer(new_style) + `overflow:hidden;`;
+}
+export function common_img_computer(new_style, index, bool) {
+    return padding_computer(new_style, 1, false, index, bool) + background_computer(new_style) + `overflow:hidden;box-sizing: border-box;`;
+}
+/**
+ * 生成一个随机数学字符串。
+ * @returns {string} 一个6位的36进制随机字符串。
+ */
+export function get_math() {
+    // 通过Math.random()生成随机数，并转换为36进制的字符串
+    let randomString = Math.random().toString(36);
+    // 确保随机字符串至少有6位，因为substring(2)可能会使短于6位的字符串产生错误。
+    // 如果字符串长度不足6位，通过padStart将其前面填充为0，直到长度达到6位。
+    randomString = randomString.length >= 6 ? randomString : randomString.padStart(6, '0');
+    // 截取掉随机字符串开头的'0.'部分，获得最终的6位随机字符串。
+    return randomString.substring(2);
+}
+/**
+ * 将大小计算成百分比
+ *
+ * @param num 当前的大小或位置。
+ * @param size 容器的大小。
+ * @returns 计算后的百分比值，含4位小数
+ */
+export const percentage_count = (num, container_size) => {
+    const marks = (num / container_size) * 100;
+    return marks.toFixed(4) + '%';
+};
+
+/**
+ * 计算当前偏移量
+ *
+ * @param size 当前的组件的大小宽或者高。
+ * @param location 容器的位置的偏移量。
+ * @param container_size 对应位置的容器的大小
+ * @returns 偏移量
+ */
+export const location_compute = (size, location, container_size) => {
+    if (size + location >= container_size) {
+        const deviation = container_size - size;
+        if (deviation >= 0) {
+            return deviation;
+        } else {
+            return 0;
+        }
+    } else {
+        return location;
+    }
+};
\ No newline at end of file
diff --git a/common/js/common/share.js b/common/js/common/share.js
new file mode 100644
index 0000000..e86c8ce
--- /dev/null
+++ b/common/js/common/share.js
@@ -0,0 +1,47 @@
+export default {
+    data(){
+        return {
+            // 设置默认的分享参数、页面可自定义以下数据
+            // 如果页面不设置share，就触发这个默认的分享
+            // 标题、关键字、描述、地址、参数、封面图片、视频
+            share_info: {
+                title: '',
+                kds: '',
+                desc: '',
+                path: '',
+                query: '',
+                img: '',
+                video: ''
+            }
+        }
+    },
+
+    // 分享给好友
+    onShareAppMessage() {
+        var app = getApp();
+        var share = app.globalData.share_content_handle(this.share_info || {});
+        var data = {
+            title: share.title,
+            desc: share.desc,
+            path: share.path + share.query
+        }
+        if(app.globalData.data.is_share_use_image == 1) {
+            data['imageUrl'] = share.img;
+        }
+        return data;
+    },
+
+    // 分享朋友圈
+    onShareTimeline() {
+        var app = getApp();
+        var share = app.globalData.share_content_handle(this.share_info || {});
+        var data = {
+            title: share.title,
+            query: ((share.query || null) != null && share.query.substr(0, 1) == '?') ? share.query.slice(1) : share.query
+        };
+        if(app.globalData.data.is_share_use_image == 1) {
+            data['imageUrl'] = share.img;
+        }
+        return data;
+    }
+}
\ No newline at end of file
diff --git a/common/js/lib/base64.js b/common/js/lib/base64.js
new file mode 100644
index 0000000..5e1e77a
--- /dev/null
+++ b/common/js/lib/base64.js
@@ -0,0 +1,8 @@
+/**
+ * Minified by jsDelivr using Terser v5.7.1.
+ * Original file: /npm/js-base64@3.7.2/base64.js
+ *
+ * Do NOT use SRI with dynamically generated files! More information: https://www.jsdelivr.com/using-sri-with-dynamic-files
+ */
+!function(t,n){var r,e;"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(r=t.Base64,(e=n()).noConflict=function(){return t.Base64=r,e},t.Meteor&&(Base64=e),t.Base64=e)}("undefined"!=typeof self?self:"undefined"!=typeof window?window:"undefined"!=typeof global?global:this,(function(){"use strict";var t,n="3.7.2",r="function"==typeof atob,e="function"==typeof btoa,o="function"==typeof Buffer,u="function"==typeof TextDecoder?new TextDecoder:void 0,i="function"==typeof TextEncoder?new TextEncoder:void 0,f=Array.prototype.slice.call("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="),c=(t={},f.forEach((function(n,r){return t[n]=r})),t),a=/^(?:[A-Za-z\d+\/]{4})*?(?:[A-Za-z\d+\/]{2}(?:==)?|[A-Za-z\d+\/]{3}=?)?$/,d=String.fromCharCode.bind(String),s="function"==typeof Uint8Array.from?Uint8Array.from.bind(Uint8Array):function(t,n){return void 0===n&&(n=function(t){return t}),new Uint8Array(Array.prototype.slice.call(t,0).map(n))},l=function(t){return t.replace(/=/g,"").replace(/[+\/]/g,(function(t){return"+"==t?"-":"_"}))},h=function(t){return t.replace(/[^A-Za-z0-9\+\/]/g,"")},p=function(t){for(var n,r,e,o,u="",i=t.length%3,c=0;c<t.length;){if((r=t.charCodeAt(c++))>255||(e=t.charCodeAt(c++))>255||(o=t.charCodeAt(c++))>255)throw new TypeError("invalid character found");u+=f[(n=r<<16|e<<8|o)>>18&63]+f[n>>12&63]+f[n>>6&63]+f[63&n]}return i?u.slice(0,i-3)+"===".substring(i):u},y=e?function(t){return btoa(t)}:o?function(t){return Buffer.from(t,"binary").toString("base64")}:p,A=o?function(t){return Buffer.from(t).toString("base64")}:function(t){for(var n=[],r=0,e=t.length;r<e;r+=4096)n.push(d.apply(null,t.subarray(r,r+4096)));return y(n.join(""))},b=function(t,n){return void 0===n&&(n=!1),n?l(A(t)):A(t)},g=function(t){if(t.length<2)return(n=t.charCodeAt(0))<128?t:n<2048?d(192|n>>>6)+d(128|63&n):d(224|n>>>12&15)+d(128|n>>>6&63)+d(128|63&n);var n=65536+1024*(t.charCodeAt(0)-55296)+(t.charCodeAt(1)-56320);return d(240|n>>>18&7)+d(128|n>>>12&63)+d(128|n>>>6&63)+d(128|63&n)},B=/[\uD800-\uDBFF][\uDC00-\uDFFFF]|[^\x00-\x7F]/g,x=function(t){return t.replace(B,g)},C=o?function(t){return Buffer.from(t,"utf8").toString("base64")}:i?function(t){return A(i.encode(t))}:function(t){return y(x(t))},m=function(t,n){return void 0===n&&(n=!1),n?l(C(t)):C(t)},v=function(t){return m(t,!0)},U=/[\xC0-\xDF][\x80-\xBF]|[\xE0-\xEF][\x80-\xBF]{2}|[\xF0-\xF7][\x80-\xBF]{3}/g,F=function(t){switch(t.length){case 4:var n=((7&t.charCodeAt(0))<<18|(63&t.charCodeAt(1))<<12|(63&t.charCodeAt(2))<<6|63&t.charCodeAt(3))-65536;return d(55296+(n>>>10))+d(56320+(1023&n));case 3:return d((15&t.charCodeAt(0))<<12|(63&t.charCodeAt(1))<<6|63&t.charCodeAt(2));default:return d((31&t.charCodeAt(0))<<6|63&t.charCodeAt(1))}},w=function(t){return t.replace(U,F)},S=function(t){if(t=t.replace(/\s+/g,""),!a.test(t))throw new TypeError("malformed base64.");t+="==".slice(2-(3&t.length));for(var n,r,e,o="",u=0;u<t.length;)n=c[t.charAt(u++)]<<18|c[t.charAt(u++)]<<12|(r=c[t.charAt(u++)])<<6|(e=c[t.charAt(u++)]),o+=64===r?d(n>>16&255):64===e?d(n>>16&255,n>>8&255):d(n>>16&255,n>>8&255,255&n);return o},E=r?function(t){return atob(h(t))}:o?function(t){return Buffer.from(t,"base64").toString("binary")}:S,D=o?function(t){return s(Buffer.from(t,"base64"))}:function(t){return s(E(t),(function(t){return t.charCodeAt(0)}))},R=function(t){return D(T(t))},z=o?function(t){return Buffer.from(t,"base64").toString("utf8")}:u?function(t){return u.decode(D(t))}:function(t){return w(E(t))},T=function(t){return h(t.replace(/[-_]/g,(function(t){return"-"==t?"+":"/"})))},Z=function(t){return z(T(t))},j=function(t){return{value:t,enumerable:!1,writable:!0,configurable:!0}},I=function(){var t=function(t,n){return Object.defineProperty(String.prototype,t,j(n))};t("fromBase64",(function(){return Z(this)})),t("toBase64",(function(t){return m(this,t)})),t("toBase64URI",(function(){return m(this,!0)})),t("toBase64URL",(function(){return m(this,!0)})),t("toUint8Array",(function(){return R(this)}))},O=function(){var t=function(t,n){return Object.defineProperty(Uint8Array.prototype,t,j(n))};t("toBase64",(function(t){return b(this,t)})),t("toBase64URI",(function(){return b(this,!0)})),t("toBase64URL",(function(){return b(this,!0)}))},P={version:n,VERSION:"3.7.2",atob:E,atobPolyfill:S,btoa:y,btoaPolyfill:p,fromBase64:Z,toBase64:m,encode:m,encodeURI:v,encodeURL:v,utob:x,btou:w,decode:Z,isValid:function(t){if("string"!=typeof t)return!1;var n=t.replace(/\s+/g,"").replace(/={0,2}$/,"");return!/[^\s0-9a-zA-Z\+/]/.test(n)||!/[^\s0-9a-zA-Z\-_]/.test(n)},fromUint8Array:b,toUint8Array:R,extendString:I,extendUint8Array:O,extendBuiltins:function(){I(),O()},Base64:{}};return Object.keys(P).forEach((function(t){return P.Base64[t]=P[t]})),P}));
+//# sourceMappingURL=/sm/79de78edcfa94236e4c8354f91262971e185c3633bb865b6fc17942e93a40207.map
\ No newline at end of file
diff --git a/components/activity-list/activity-list.vue b/components/activity-list/activity-list.vue
new file mode 100644
index 0000000..d1d8038
--- /dev/null
+++ b/components/activity-list/activity-list.vue
@@ -0,0 +1,71 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(propConfig || null) != null && (propData || null) != null && propData.length > 0">
+            <block v-for="(floor, index) in propData" :key="index">
+                <block v-if="floor.goods_list.length > 0 && floor.home_data_location == propLocation">
+                    <component-goods-list
+                        :propData="floor"
+                        propMoreUrlKey="url"
+                        :propLabel="propLabel"
+                        :propIsAutoPlay="(propConfig.is_home_auto_play || 0) == 1"
+                        :propCurrencySymbol="propCurrencySymbol"
+                        :propIsCartParaCurve="propIsCartParaCurve"
+                        :propSource="propSource"
+                        :propOpenCart="floor.style_type === '2' ? false : true"
+                    ></component-goods-list>
+                </block>
+            </block>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentGoodsList from '@/components/goods-list/goods-list';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+            };
+        },
+        components: {
+            componentGoodsList,
+        },
+        props: {
+            propCurrencySymbol: {
+                type: String,
+                default: app.globalData.currency_symbol(),
+            },
+            propLocation: {
+                type: [String, Number],
+                default: 0,
+            },
+            propConfig: {
+                type: [String, Object],
+                default: null,
+            },
+            propData: {
+                type: Array,
+                default: [],
+            },
+            propLabel: {
+                type: [Array, Object, String],
+                default: null,
+            },
+            propIsCartParaCurve: {
+                type: Boolean,
+                default: false,
+            },
+            // 来源
+            propSource: {
+                type: String,
+                default: '',
+            },
+            propOpenCart: {
+                type: Boolean,
+                default: true,
+            },
+        },
+        methods: {},
+    };
+</script>
+<style></style>
diff --git a/components/app-admin/app-admin.vue b/components/app-admin/app-admin.vue
new file mode 100644
index 0000000..fd3d74c
--- /dev/null
+++ b/components/app-admin/app-admin.vue
@@ -0,0 +1,242 @@
+<template>
+    <view :class="theme_view">
+        <!-- 更新 -->
+        <view v-if="is_update_status && (update_data || null) != null" class="update-container pf left-0 top-0 wh-auto ht-auto">
+            <view class="update-content auto bg-white pr">
+                <image :src="update_alert_bg_images" mode="widthFix" class="update-alert-bg-images wh-auto"></image>
+                <view class="padding-top-xs padding-left-xl padding-right-xl padding-bottom-xl">
+                    <view class="text-size-xl fw-b tc pa name">{{update_data.name}}</view>
+                    <view class="text-size tc pa version">v{{update_data.version_new}}</view>
+                    <scroll-view :scroll-y="true" class="content tl">
+                        <block v-for="(item, index) in update_data.content" :key="index">
+                            <view class="margin-bottom-sm text-size-xs">{{item}}</view>
+                        </block>
+                    </scroll-view>
+                    <view class="margin-top-xl flex-row">
+                        <button v-if="(update_data.is_force_update || 0) == 0" type="default" class="br-main bg-white cr-main round text-size-md" size="mini" @tap="update_close_event">{{$t('common.cancel')}}</button>
+                        <button type="default" class="br-main bg-main cr-white round text-size-md" size="mini" @tap="to_update_event">{{$t('common.now_update_text')}}</button>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <!-- 评分 -->
+        <view v-if="is_star_status && (star_url || null) != null && (star_alert_images || null) != null" class="star-container pf left-0 top-0 wh-auto ht-auto tc">
+            <view class="star-content">
+                <image :src="star_alert_images" mode="widthFix" class="star-alert-images wh-auto" @tap="to_star_event"></image>
+            </view>
+            <view class="padding-sm margin-top-xl">
+                <view class="dis-inline-block" @tap="close_star_event">
+                    <iconfont name="icon-close-o" size="30rpx" color="#ccc"></iconfont>
+                </view>
+            </view>
+        </view>
+
+        <!-- 关于我们中使用 -->
+        <!-- #ifdef APP -->
+        <view v-if="is_about_page && !propIsHideStar" class="margin-top">
+            <text class="cr-grey-9">{{app_version_info}}</text>
+            <block v-if="is_loading">
+                <text v-if="(update_data || null) == null" class="cr-grey-c margin-left-lg text-size-xs">{{$t('common.already_latest_text')}}</text>
+                <text v-else class="cr-blue margin-left-lg text-size-xs cp" @tap="update_event">{{$t('common.to_update_text')}}(v{{update_data.version_new}})</text>
+                <text v-if="(star_url || null) != null && (star_alert_images || null) != null" class="cr-blue margin-left-lg text-size-xs cp" @tap="star_event">{{$t('common.to_star_text')}}</text>
+            </block>
+        </view>
+        <!-- #endif -->
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                update_tips_cache_key: app.globalData.data.cache_app_update_tips_interval_time_key,
+                star_tips_cache_key: app.globalData.data.cache_app_star_tips_interval_time_key,
+                app_version_info: app.globalData.data.app_version_info,
+                is_about_page: false,
+                is_loading: false,
+                update_data: null,
+                // 更新提示
+                is_update_status: false,
+                update_tips_interval_time: 0,
+                update_alert_bg_images: null,
+                // 评分提示
+                is_star_status: false,
+                star_tips_await_time: 0,
+                star_tips_interval_time: 0,
+                star_alert_images: null,
+                star_url: null
+                
+            };
+        },
+        props: {
+            propIsHideStar: {
+                type: Boolean,
+                default: false,
+            },
+        },
+        // 页面被展示
+        created: function () {
+            this.init();
+        },
+
+        methods: {
+            // 初始化、获取数据
+            init(is_init = 0) {
+                // #ifdef APP
+                // 是否关于我们页面
+                this.setData({
+                    is_about_page: app.globalData.current_page(false) == 'pages/about/about',
+                });
+
+                // 请求接口获取版本数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'version', 'appadmin'),
+                    method: 'POST',
+                    data: {app_version: app.globalData.data.app_version_info},
+                    dataType: 'json',
+                    success: (res) => {
+                        if(res.data.code == 0) {
+                            var data = res.data.data;
+                            var upd_data = {
+                                is_loading: true,
+                                update_data: data.update_data || null,
+                                // 更新提示
+                                update_alert_bg_images: data.update_alert_bg_images || null,
+                                is_update_status: parseInt(data.is_update_status || 0) == 1,
+                                update_tips_interval_time: parseInt(data.update_tips_interval_time || 600),
+                                // 评分提示
+                                is_star_status: parseInt(data.is_star_status || 0) == 1,
+                                star_tips_await_time: parseInt(data.star_tips_await_time || 600),
+                                star_tips_interval_time: parseInt(data.star_tips_interval_time || 1800),
+                                star_alert_images: data.star_alert_images || null,
+                                star_url: data.star_url || null,
+                            };
+
+                            // 当前时间
+                            var current_time = Date.parse(new Date()) / 1000;
+
+                            // 更新提示间隔时间
+                            var update_tips_cache_time = parseInt(uni.getStorageSync(this.update_tips_cache_key) || 0);
+                            if(update_tips_cache_time > 0 && current_time < update_tips_cache_time + upd_data.update_tips_interval_time) {
+                                upd_data.is_update_status = false;
+                            }
+
+                            // 评分是否可以展示评分
+                            var star_tips_cache_time = parseInt(uni.getStorageSync(this.star_tips_cache_key) || 0);
+                            if(star_tips_cache_time > 0) {
+                                upd_data.is_star_status = current_time > star_tips_cache_time;
+                            }
+                            // 首次则记录评分缓存
+                            if(star_tips_cache_time == 0) {
+                                uni.setStorageSync(this.star_tips_cache_key, (Date.parse(new Date()) / 1000)+upd_data.star_tips_await_time);
+                                // 如果等待时间为0则不需要等待就提示评分
+                                if(upd_data.star_tips_await_time == 0) {
+                                    upd_data.is_star_status = true;
+                                }
+                            }
+                            // 如果已经展示更新弹窗则不展示评分弹窗
+                            if(upd_data.is_update_status) {
+                                upd_data.is_star_status = false;
+                            }
+
+                            // 关于我们页面则不直接展示
+                            if(this.is_about_page) {
+                                upd_data.is_update_status = false;
+                                upd_data.is_star_status = false;
+                            }
+
+                            this.setData(upd_data);
+                        }
+                    },
+                    fail: () => {
+                        // 失败则再重试一次
+                        if(is_init == 0) {
+                            this.get_data(1);
+                        }
+                    }
+                });
+                // #endif
+            },
+
+            // 更新关闭
+            update_close_event(e) {
+                this.setData({
+                    is_update_status: false
+                });
+                uni.setStorageSync(this.update_tips_cache_key, Date.parse(new Date()) / 1000);
+            },
+
+            // 打开更新事件
+            update_event(e) {
+                this.setData({
+                    is_update_status: true
+                });
+            },
+
+            // 去更新事件
+            to_update_event(e) {
+                plus.runtime.openURL(this.update_data.update_url);
+            },
+            
+            // 打开评分事件
+            star_event(e) {
+                this.setData({
+                    is_star_status: true
+                });
+            },
+
+            // 去打分事件
+            to_star_event(e) {
+                // 先关闭评分
+                this.close_star_event();
+
+                // 打开地址
+                plus.runtime.openURL(this.star_url);
+            },
+
+            // 关闭评分事件
+            close_star_event(e) {
+                this.setData({
+                    is_star_status: false
+                });
+                // 增加间隔时间，到时间后才会再提示
+                uni.setStorageSync(this.star_tips_cache_key, (Date.parse(new Date()) / 1000)+this.star_tips_interval_time);
+            }
+        }
+    };
+</script>
+<style scoped>
+    .update-container,
+    .star-container {
+        background-color: rgba(0, 0, 0, 0.6);
+        z-index: 100;
+        padding-top: 26vh;
+    }
+    .update-container .update-content {
+        width: 75vw;
+        padding-top: 100rpx;
+        border-radius: 20rpx;
+    }
+    .update-container .update-content .update-alert-bg-images {
+        margin-top: -180rpx;
+    }
+    .update-container .update-content .name {
+        left: 36rpx;
+        top: 60rpx;
+    }
+    .update-container .update-content .version {
+        left: 36rpx;
+        top: 140rpx;
+    }
+    .update-container .update-content .content {
+        max-height: 26vh;
+    }
+    .star-container .star-content {
+        border-radius: 20rpx;
+    }
+    .star-container .star-content .star-alert-images {
+        max-width: 460rpx;
+    }
+</style>
\ No newline at end of file
diff --git a/components/ask-comments-goods/ask-comments-goods.vue b/components/ask-comments-goods/ask-comments-goods.vue
new file mode 100644
index 0000000..7234f5a
--- /dev/null
+++ b/components/ask-comments-goods/ask-comments-goods.vue
@@ -0,0 +1,103 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="(propData || null) != null && propData.length > 0">
+            <view v-for="(item, index) in propData" :key="index" class="ask-comment-item">
+                <view :data-value="item.url" @tap="url_event" class="flex-row cp">
+                    <view class="title cr-white tc">{{$t('goods-list.goods-list.00n7i3')}}</view>
+                    <view class="base-nav flex-1 flex-width margin-left-sm">
+                        <view class="oh nav padding-bottom-sm">
+                            <view class="flex-row jc-sb align-c">
+                                <text class="va-m single-text flex-1 flex-width">{{ item.title || item.content }}</text>
+                                <text class="cr-grey text-size-xs">{{$t('detail.detail.025362')}}{{ item.comments_count }}{{$t('ask-comments-goods.ask-comments-goods.xl51n6')}}</text>
+                            </view>
+                            <view v-if="(item.images || null) != null && item.images.length > 0" class="images oh margin-top-lg">
+                                <block v-for="(iv, ix) in item.images" :key="ix">
+                                    <image class="br radius margin-right-sm" @tap="comment_images_show_event" :data-index="index" :data-ix="ix" :src="iv" mode="aspectFit"></image>
+                                </block>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </block>
+        <block v-else>
+            <view class="cr-grey-d tc spacing-mb flex-row jc-c align-c">
+                <image :src="ask_static_url + 'no-ask.png'" mode="widthFix" class="no-ask margin-right-main" />{{$t('ask-comments-goods.ask-comments-goods.g6mc44')}}</view>
+        </block>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    var ask_static_url = app.globalData.get_static_url('ask', true) + 'app/';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                ask_static_url:ask_static_url,
+            };
+        },
+        props: {
+            propData: {
+                type: Array,
+                default: () => {
+                    return [];
+                },
+            },
+        },
+
+        created: function () {},
+
+        methods: {
+            // 评价图片预览
+            comment_images_show_event(e) {
+                var index = e.currentTarget.dataset.index;
+                var ix = e.currentTarget.dataset.ix;
+                uni.previewImage({
+                    current: this.propData[index]["images"][ix],
+                    urls: this.propData[index]["images"],
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style scoped>
+    /**
+     * 商品评价
+    */
+    .title {
+        width: 40rpx;
+        height: 40rpx;
+        line-height: 40rpx;
+        background: #fd9525;
+        border-radius: 4rpx;
+    }
+    .ask-comment-item {
+        padding-bottom: 10rpx;
+        margin-bottom: 20rpx;
+    }
+    .ask-comment-item .avatar {
+        width: 50rpx;
+        height: 50rpx;
+        border-radius: 50%;
+        border: 1px solid #e2e2e2;
+    }
+    .ask-comment-item .base-nav {
+        border-bottom: 2rpx solid #f5f5f5;
+    }
+
+    .ask-comment-item:last-of-type {
+        margin-bottom: 0;
+    }
+
+    .ask-comment-item:last-of-type .base-nav {
+        border: 0;
+    }
+    .no-ask {
+        width: 174rpx;
+    }
+</style>
diff --git a/components/badge/badge.vue b/components/badge/badge.vue
new file mode 100644
index 0000000..a6e8286
--- /dev/null
+++ b/components/badge/badge.vue
@@ -0,0 +1,55 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="propNumber != 0" class="am-badge">
+            <view :class="'am-badge-text ' + ((propNumber > 99) ? 'am-badge-text-max' : '')">
+                <text>{{(propNumber > 99) ? '99+' : propNumber}}</text>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+            };
+        },
+        components: {},
+        props: {
+            propNumber: {
+            	type: [Number,String],
+            	default: 0
+            }
+        },
+        methods: {}
+    };
+</script>
+<style scoped>
+    .am-badge {
+        display: inline-block;
+        position: relative;
+        vertical-align: middle;
+    }
+    .am-badge-text {
+        display: inline-block;
+        position: absolute;
+        right: 0;
+        transform: translate(50%, -50%);
+        top: 0;
+        min-width: 28rpx;
+        padding: 0;
+        height: 28rpx;
+        line-height: 28rpx;
+        text-align: center;
+        background-color: #FF3B30;
+        border-radius: 40rpx;
+        color: #fff;
+        font-size: 20rpx;
+        padding: 2rpx 2rpx;
+        box-shadow: 0 0 10rpx rgb(0 0 0 / 30%);
+    }
+    .am-badge-text-max {
+        padding: 2rpx 4rpx;
+    }
+</style>
\ No newline at end of file
diff --git a/components/binding-detail-list/binding-detail-list.vue b/components/binding-detail-list/binding-detail-list.vue
new file mode 100644
index 0000000..5f8173d
--- /dev/null
+++ b/components/binding-detail-list/binding-detail-list.vue
@@ -0,0 +1,98 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="((propData || null) != null)" class="plugins-binding-container">
+            <!-- 组合搭配 -->
+            <block v-if="((propData.binding_list || null) != null)">
+                <block v-for="(bv, bi) in propData.binding_list" :key="bi">
+                    <view v-if="((bv.goods || null) != null) && bv.goods.length > 0" class="plugins-binding-list padding-horizontal-main padding-top-main border-radius-main oh spacing-mb">
+                        <view class="spacing-nav-title oh">
+                            <text class="text-wrapper">{{bv.title}}</text>
+                            <view v-if="(bv.estimate_discount_price || 0) != 0" class="estimate-discount-price fr">
+                                <text class="discount-icon cr-white text-size-xs">{{$t('detail.detail.6026t4')}}</text>
+                                <text class="cr-green text-size-lg va-m">{{propCurrencySymbol}}{{bv.estimate_discount_price}}</text>
+                            </view>
+                        </view>
+                        <view class="left-content fl">
+                            <component-goods-list :propData="{style_type: 2, goods_list: bv.goods, multiple_items: 2}" :propOpenCart="false" :propLabel="propLabel" :propCurrencySymbol="propCurrencySymbol" :propIsAutoPlay="(propData.config.is_auto_play || 0) == 1"></component-goods-list>
+                        </view>
+                        <view class="right-content fr bs-bb padding-left-main tc">
+                            <button type="default" size="mini" class="bg-main br-main cr-white text-size-xs round" :data-value="'/pages/plugins/binding/detail/detail?id='+bv.id" @tap="url_event">{{bv.buy_button_text}}</button>
+                            <view class="sales-price margin-top-sm">{{propCurrencySymbol}}{{bv.estimate_price}}</view>
+                            <view v-if="(bv.estimate_original_price || 0) != 0" class="original-price margin-top-sm">{{propCurrencySymbol}}{{bv.estimate_original_price}}</view>
+                        </view>
+                    </view>
+                </block>
+            </block>
+
+            <!-- 商品关联 -->
+            <view v-if="((propData.relevant_data || null) != null)">
+                <component-goods-list :propData="{title: propData.relevant_data.name, style_type: 2, goods_list: propData.relevant_data.data}" :propLabel="propLabel" :propCurrencySymbol="propCurrencySymbol" :propIsAutoPlay="(propData.config.is_auto_play_relevant || 0) == 1"></component-goods-list>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentGoodsList from "../goods-list/goods-list";
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+            };
+        },
+        components: {
+            componentGoodsList
+        },
+        props: {
+            propCurrencySymbol: {
+                type: String,
+                default: app.globalData.currency_symbol()
+            },
+            propData: {
+            	type: [Array,Object],
+            	default: []
+            },
+            propLabel: {
+                type: [Array,Object,String],
+                default: null
+            }
+        },
+        methods: {
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        }
+    };
+</script>
+<style>
+    .plugins-binding-list {
+        background: linear-gradient(to right, rgb(255 235 220), rgb(241 235 255));
+    }
+    .plugins-binding-list .left-content {
+        width: 65%;
+    }
+    .plugins-binding-list .right-content {
+        width: 35%;
+        padding-top: 100rpx;
+    }
+    .plugins-binding-list .estimate-discount-price .discount-icon {
+        border-top-right-radius: 30rpx;
+        border-bottom-left-radius: 30rpx;
+        background-image: linear-gradient(45deg,#a3f9a3,#248828,#8bc34a,#d2374c,#9c27b0);
+        background-size: 400%;
+        animation: gradient 5s ease infinite;
+        padding: 0 16rpx;
+    }
+    @keyframes gradient {
+        0% {
+            background-position: 0% 50%;
+        }
+        50% {
+            background-position: 100% 50%;
+        }
+        100% {
+            background-position: 0% 50%;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/components/binding-list/binding-list.vue b/components/binding-list/binding-list.vue
new file mode 100644
index 0000000..e992fa7
--- /dev/null
+++ b/components/binding-list/binding-list.vue
@@ -0,0 +1,173 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data_list || null) != null && data_list.length > 0" class="plugins-binding-data-list oh">
+            <block v-for="(item, index) in data_list" :key="index">
+                <view class="item border-radius-main bg-white padding-main oh pr spacing-mb">
+                    <view class="oh flex-row" :data-value="item.url" @tap="url_event">
+                        <image :src="item.images" mode="aspectFit" class="images dis-block border-radius-main"></image>
+                        <view class="flex-1 flex-width flex-col jc-sb">
+                            <view class="base-right bs-bb padding-left-main">
+                                <view class="fw-b text-size-lg cr-base single-text">{{ item.title }}</view>
+                                <view class="sales-price margin-top-main single-text">
+                                    <text class="text-size-xs">{{ propCurrencySymbol }}</text>
+                                    <text class="text-size-lg fw-b">{{ item.estimate_price }}</text>
+                                </view>
+                                <view v-if="(item.estimate_discount_price || 0) != 0" class="margin-top-sm single-text flex-row align-c">
+                                    <text class="discount-icon cr-white text-size-xs">{{$t('detail.detail.6026t4')}}</text>
+                                    <view class="cr-green single-text">
+                                        <text class="text-size-xs">{{ propCurrencySymbol }}</text>
+                                        <text class="text-size">{{ item.estimate_discount_price }}</text>
+                                    </view>
+                                </view>
+                            </view>
+                            <button type="default" size="mini" class="br-main bg-main cr-white round buy-submit self-e margin-0 text-size-xs">{{ item.type_name }}{{$t('binding-list.binding-list.kh7951')}}</button>
+                        </view>
+                    </view>
+                    <view class="binding-goods-list border-radius-main margin-top-main oh" :style="'height: ' + ((item.is_home_show_goods || 0) == 1 ? Math.ceil(item.goods.length / 2) * 134 + 12 : '0') + 'rpx'">
+                        <view class="padding-horizontal-main padding-top-main padding-bottom-main oh">
+                            <block v-for="(gv, gi) in item.goods" :key="gi">
+                                <view class="goods-item oh margin-bottom-lg" :data-value="gv.goods_url" @tap="url_event">
+                                    <image :src="gv.images" mode="aspectFit" class="goods-images fl dis-block radius"></image>
+                                    <view class="goods-right fr bs-bb">
+                                        <view class="single-text text-size-sm">{{ gv.title }}</view>
+                                        <view v-if="(gv.show_field_price_status || 0) == 1" class="single-text">
+                                            <text class="sales-price va-m text-size-xss">{{ gv.show_price_symbol }}{{ gv.price }}</text>
+                                            <text class="cr-grey va-m text-size-xsss">{{ gv.show_price_unit }}</text>
+                                        </view>
+                                        <view v-if="(gv.discount_price || null) != null" class="single-text cr-green text-size-xss">{{$t('detail.detail.6026t4')}}{{ gv.show_price_symbol }}{{ gv.discount_price }}</view>
+                                    </view>
+                                </view>
+                            </block>
+                        </view>
+                    </view>
+                    <view class="bg-white padding-top-main wh-auto bs-bb bottom-elastic" :class="(item.is_home_show_goods || 0) != 1 ? 'br-t-dashed' : ''" :data-index="index" @tap="item_more_goods_event">
+                        <view class="flex-row jc-sb align-c">
+                            <view class="cr-grey-9 text-size-xs">{{ (item.is_home_show_goods || 0) == 1 ? $t('binding-list.binding-list.2u4v35') : $t('binding-list.binding-list.91d60h') }}{{ item.type_name }}{{$t('recommend-list.recommend-list.x74z3o')}}</view>
+                            <iconfont :name="(item.is_home_show_goods || 0) == 1 ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx" color="#666"></iconfont>
+                        </view>
+                    </view>
+                </view>
+            </block>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                config: {},
+                data_list: [],
+            };
+        },
+        components: {},
+        props: {
+            // 价格符号
+            propCurrencySymbol: {
+                type: String,
+                default: app.globalData.currency_symbol()
+            },
+            propConfig: {
+                type: [String, Object],
+                default: null,
+            },
+            propData: {
+                type: Object,
+                default: () => {
+                    return {};
+                },
+            }
+        },
+        // 属性值改变监听
+        watch: {
+            // 数据
+            propData(value, old_value) {
+                this.init();
+            }
+        },
+        // 页面被展示
+        created: function(e) {
+        	this.init();
+        },
+        methods: {
+            // 初始化
+            init() {
+                var config = ((this.propConfig || null) == null ? app.globalData.get_config('plugins_base.binding.data') : this.propConfig) || {};
+                var data_list = ((this.propData || null) == null || (this.propData.data || null) == null || this.propData.data.length == 0) ? [] : this.propData.data;
+                this.setData({
+                    config: config,
+                    data_list: data_list,
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 商品展开关闭
+            item_more_goods_event(e) {
+                var index = e.currentTarget.dataset.index;
+                var temp_data = this.data_list;
+                temp_data[index]['is_home_show_goods'] = parseInt(temp_data[index]['is_home_show_goods'] || 0) == 1 ? 0 : 1;
+                this.setData({ data_list: temp_data });
+            },
+        },
+    };
+</script>
+<style scoped>
+    .plugins-binding-data-list .item .images {
+        width: 256rpx;
+        height: 256rpx !important;
+    }
+    .plugins-binding-data-list .item .base-right .discount-icon {
+        border-top-right-radius: 30rpx;
+        border-bottom-left-radius: 30rpx;
+        background-image: linear-gradient(45deg, #a3f9a3, #248828, #8bc34a, #d2374c, #9c27b0);
+        background-size: 400%;
+        animation: gradient 5s ease infinite;
+        padding: 0 16rpx;
+    }
+    .plugins-binding-data-list .item .buy-submit {
+        padding: 0 20rpx;
+        height: 46rpx;
+        line-height: 44rpx;
+    }
+    .plugins-binding-data-list .item .binding-goods-list {
+        background: #f8f8f8;
+        transition: height 0.25s ease-in-out;
+    }
+    .plugins-binding-data-list .item .binding-goods-list .goods-item {
+        width: calc(50% - 15rpx);
+        height: 102rpx;
+    }
+    .plugins-binding-data-list .item .binding-goods-list .goods-item:nth-child(odd) {
+        float: left;
+    }
+    .plugins-binding-data-list .item .binding-goods-list .goods-item:nth-child(even) {
+        float: right;
+    }
+    .plugins-binding-data-list .item .binding-goods-list .goods-item .goods-right {
+        width: calc(100% - 115rpx);
+    }
+    .plugins-binding-data-list .item .binding-goods-list .goods-item .goods-images {
+        width: 100rpx;
+        height: 100rpx !important;
+    }
+    .plugins-binding-data-list .item .bottom-elastic {
+        left: 0;
+        bottom: 0;
+    }
+    @keyframes gradient {
+        0% {
+            background-position: 0% 50%;
+        }
+        50% {
+            background-position: 100% 50%;
+        }
+        100% {
+            background-position: 0% 50%;
+        }
+    }
+</style>
diff --git a/components/blog-list/blog-list.vue b/components/blog-list/blog-list.vue
new file mode 100644
index 0000000..e910229
--- /dev/null
+++ b/components/blog-list/blog-list.vue
@@ -0,0 +1,99 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(propConfig || null) != null && (propData || null) != null && propData.length > 0">
+            <block v-for="(floor, index) in propData" :key="index">
+                <block v-if="floor.blog_list.length > 0 && floor.home_data_location == propLocation">
+                    <view class="plugins-blog" :class="floor.style_type == 2 ? 'bg-white border-radius-main padding-main spacing-mb' : ''">
+                        <view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                            <view class="title-left">
+                                <text class="text-wrapper" :class="floor.style_type == 2 ? '' : 'title-left-border'" :style="'color:' + (floor.color || '#333') + ';'">{{ floor.title }}</text>
+                                <text v-if="(floor.vice_title || null) != null" class="vice-name margin-left-sm cr-grey-9">{{ floor.vice_title }}</text>
+                            </view>
+                            <text :data-value="floor.more_url" @tap="url_event" class="arrow-right padding-right cr-grey cp">{{$t('common.more')}}</text>
+                        </view>
+                        <view class="wh-auto oh pr">
+                            <block v-if="floor.blog_list.length > 0">
+                                <!-- 默认图文 -->
+                                <block v-if="(floor.style_type || 0) == 0">
+                                    <view class="plugins-blog-list">
+                                        <view v-for="(item, index) in floor.blog_list" :key="index" class="item oh padding-main border-radius-main bg-white spacing-mb">
+                                            <view :data-value="item.url" @tap="url_event" class="cp">
+                                                <image class="blog-img fl radius" :src="item.cover" mode="aspectFill"></image>
+                                                <view class="base fr">
+                                                    <view class="single-text text-size">{{ item.title }}</view>
+                                                    <view class="cr-grey-9 margin-top-sm text-size-xs">{{ item.add_time_date_cn }}</view>
+                                                    <view v-if="(item.describe || null) != null" class="cr-base multi-text margin-top-sm text-size-xs">{{item.describe}}</view>
+                                                </view>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </block>
+                                <!-- 九方格 -->
+                                <block v-else-if="floor.style_type == 1">
+                                    <view class="plugins-blog-grid-list">
+                                        <view v-for="(item, index) in floor.blog_list" :key="index" class="item oh border-radius-main bg-white spacing-mb">
+                                            <view :data-value="item.url" @tap="url_event" class="cp">
+                                                <image class="blog-img dis-block" :src="item.cover" mode="widthFix"></image>
+                                                <view class="base padding-horizontal-sm margin-top-sm">
+                                                    <view class="goods-title multi-text margin-bottom-sm text-size-xs">{{ item.title }}</view>
+                                                    <view class="cr-grey text-size-xs">{{ item.add_time_date_cn }}</view>
+                                                </view>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </block>
+                                <!-- 滚动 -->
+                                <view v-else-if="floor.style_type == 2" class="rolling-horizontal border-radius-main oh spacing-mb">
+                                    <view class="plugins-blog-rolling-list scroll-view-horizontal">
+                                        <swiper :vertical="false" :autoplay="(propConfig.is_home_hot_auto_play || 0) == 1" :circular="false" :display-multiple-items="floor.blog_list.length < 3 ? floor.blog_list.length : 3" interval="3000">
+                                            <block v-for="(item, index) in floor.blog_list" :key="index">
+                                                <swiper-item>
+                                                    <view :data-value="item.url" @tap="url_event" class="item bg-white border-radius-main margin-right-main oh pr ht-auto pr cp">
+                                                        <image class="blog-img dis-block wh-auto" :src="item.cover" mode="scaleToFill"></image>
+                                                        <view class="blog-title pa single-text cr-white padding-sm text-size-xs">{{ item.title }}</view>
+                                                    </view>
+                                                </swiper-item>
+                                            </block>
+                                        </swiper>
+                                    </view>
+                                </view>
+                            </block>
+                        </view>
+                    </view>
+                </block>
+            </block>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+            };
+        },
+        components: {},
+        props: {
+            propLocation: {
+                type: [String, Number],
+                default: 0,
+            },
+            propConfig: {
+                type: [String, Object],
+                default: null,
+            },
+            propData: {
+                type: Array,
+                default: [],
+            },
+        },
+        methods: {
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        }
+    };
+</script>
+<style></style>
diff --git a/components/bottom-line/bottom-line.vue b/components/bottom-line/bottom-line.vue
new file mode 100644
index 0000000..03c556c
--- /dev/null
+++ b/components/bottom-line/bottom-line.vue
@@ -0,0 +1,56 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(propStatus || false)" class="data-bottom-line">
+            <view class="bottom-exclude">
+                <view class="line-item left"></view>
+                <view class="line-item msg">{{propMsg || $t('bottom-line.bottom-line.44bct2')}}</view>
+                <view class="line-item right"></view>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+            };
+        },
+        components: {},
+        props: {
+            propStatus: Boolean,
+            propMsg: String
+        },
+        methods: {}
+    };
+</script>
+<style>
+    .data-bottom-line {
+        padding: 40rpx;
+        overflow: hidden;
+    }
+    .data-bottom-line .bottom-exclude {
+        padding-bottom: env(safe-area-inset-bottom);
+    }
+    .data-bottom-line .line-item {
+        width: 33.3%;
+    }
+    .data-bottom-line .line-item.left,
+    .data-bottom-line .line-item.right {
+        margin-top: 8px;
+        border-bottom: 1px solid #e1e1e1;
+    }
+    .data-bottom-line .line-item.msg {
+        color: #999;
+        text-align: center;
+        font-size: 24rpx;
+    }
+    .data-bottom-line .line-item.left,
+    .data-bottom-line .line-item.msg {
+        float: left;
+    }
+    .data-bottom-line .line-item.right {
+        float: right;
+    }
+</style>
\ No newline at end of file
diff --git a/components/buy-ordergoodsform/buy-ordergoodsform.vue b/components/buy-ordergoodsform/buy-ordergoodsform.vue
new file mode 100644
index 0000000..d1c5bef
--- /dev/null
+++ b/components/buy-ordergoodsform/buy-ordergoodsform.vue
@@ -0,0 +1,187 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="data.length > 0" class="plugins-ordergoodsform-buy oh margin-top-sm">
+            <view v-for="(item, index) in data" :key="index" class="item pr oh">
+                <view class="title dis-block single-text text-size-sm pa">{{item.title}}</view>
+                <view class="value dis-block pa">
+                    <view v-if="propIsRead">{{item.content}}</view>
+                    <input v-else :type="((item.element_arr || null) == null || (item.element_arr[1] || null) == null) ? 'text' : item.element_arr[1]" 
+                        :placeholder="(item.placeholder || null) == null ? item.title : item.placeholder" 
+                        :data-index="index"
+                        :value="item.default_value || ''"
+                        @blur="input_value_event"
+                        @confirm="input_value_event"
+                        placeholder-class="cr-grey"
+                        :class="'radius text-size-sm padding-horizontal-sm '+((item.check_status === undefined || item.check_status === true) ? 'br' : 'br-red')"
+                    />
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data: [],
+            };
+        },
+        components: {},
+        props: {
+            propData: {
+            	type: [Array],
+            	default: []
+            },
+            propGoodsID: {
+            	type: [Number,String],
+            	default: 0
+            },
+            propIsRead: {
+            	type: Boolean,
+            	default: false
+            }
+        },
+        // 页面被展示
+        created: function () {
+            this.setData({
+                data: this.propData
+            });
+        },
+        methods: {
+            // 数据值事件
+            input_value_event(e) {
+                // 当前表单数据
+                var index = e.currentTarget.dataset.index;
+                var item = this.data[index];
+                item['default_value'] = e.detail.value.trim();
+                // 数据验证
+                var check = this.input_value_check(item, index);
+                // 保存数据
+                uni.request({
+                    url: app.globalData.get_request_url('save', 'goods', 'ordergoodsform'),
+                    method: 'POST',
+                    data: {
+                        form_id: item.form_id,
+                        goods_id: this.propGoodsID,
+                        title: item.title,
+                        content: check.value
+                    },
+                    dataType: 'json',
+                    success: (res) => {},
+                    fail: (res) => {},
+                });
+            },
+
+            // 数据值验证
+            input_value_check(item, index) {
+                // 是否需要校验
+                var is_required = parseInt(item.is_required || 0);
+                var type = ((item.element_arr || null) == null || (item.element_arr[1] || null) == null) ? 'text' : item.element_arr[1];
+                var value = item.default_value;
+                var msg = item.validation_msg || item.error_message || this.$t('user-address-save.user-address-save.wkfi45');
+                var status = null;
+
+                // 强制填写数据，但是数据没有则错误
+                if(status === null && is_required == 1 && value === '')
+                {
+                    status = false;
+                }
+
+                // 有数据则验证正确格式
+                if(status === null && value !== '')
+                {
+                    // 根据类型验证数据
+                    switch(type)
+                    {
+                        // 文本
+                        case 'text' :
+                            var len = value.length;
+                            var minlength = parseInt(item.minlength || 0);
+                            var maxlength = parseInt(item.maxlength || 0);
+                            if((minlength > 0 && len < minlength) || (maxlength > 0 && len > maxlength))
+                            {
+                                status = false;
+                            }
+                            break;
+
+                        // 整数
+                        case 'number' :
+                            var val = parseInt(value || 0);
+                            var min = parseInt(item.minlength || 0);
+                            var max = parseInt(item.maxlength || 0);
+                            if((min > 0 && val < min) || (max > 0 && val > max))
+                            {
+                                value = (min > 0 && val < min) ? min : max;
+                                status = false;
+                            }
+                            break;
+                    }
+
+                    // 是否有正则
+                    if(status === null) {
+                        var pattern = (((item.element_arr || null) == null) || (item.element_arr[2] || null) == null) ? null : item.element_arr[2];
+                        if(pattern != null)
+                        {
+                            var regex = new RegExp(pattern);
+                            if(!regex.test(value))
+                            {
+                                status = false;
+                            }
+                        }
+                    }
+                }
+
+                // 是否提示错误
+                if(status === false) {
+                    app.globalData.showToast(msg);
+                }
+
+                // 数据赋值
+                var temp_data = this.data;
+                item['default_value'] = value;
+                temp_data[index] = item;
+                temp_data[index]['check_status'] = (status === null) ? true : status;
+                this.setData({
+                    data: temp_data
+                });
+
+                // 验证信息返回
+                return {status: status, value: value};
+            },
+
+            // 数据验证
+            data_check() {
+                var status = true;
+                for(var i in this.data) {
+                    var res = this.input_value_check(this.data[i], i);
+                    if(res.status === false) {
+                        status = false;
+                        break;
+                    }
+                }
+                return status;
+            }
+        }
+    };
+</script>
+<style>
+    .plugins-ordergoodsform-buy .item {
+        height: 72rpx;
+    }
+    .plugins-ordergoodsform-buy .item .title {
+        width: 134rpx;
+        left: 0;
+        bottom: 8rpx;
+    }
+    .plugins-ordergoodsform-buy .item .value {
+        width: calc(100% - 140rpx);
+        left: 140rpx;
+        bottom: 0;
+    }
+    .plugins-ordergoodsform-buy .item .value input {
+        height: 50rpx;
+        line-height: 50rpx;
+    }
+</style>
\ No newline at end of file
diff --git a/components/cart-para-curve/cart-para-curve.vue b/components/cart-para-curve/cart-para-curve.vue
new file mode 100644
index 0000000..0e59cfe
--- /dev/null
+++ b/components/cart-para-curve/cart-para-curve.vue
@@ -0,0 +1,125 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="cart_icon_data != null && (cart_icon_data.status || 0) == 1" class="cart-para-curve-container pf round" :style="cart_icon_data.style">
+            <image v-if="(cart_icon_data.icon || null) != null" class="cart-para-curve-icon round br" :src="cart_icon_data.icon"></image>
+            <view v-else class="cart-para-curve-icon bg-red padding dis-inline-block round br"></view>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                cart_icon_data: null
+            };
+        },
+        components: {},
+        props: {
+            propBtnHeight: {
+            	type: Number,
+            	default: 30
+            },
+            propBtnWidth: {
+            	type: Number,
+            	default: 30
+            },
+            propCart: {
+            	type: String,
+            	default: ''
+            },
+        },
+        methods: {
+            // 初始（购物车对象、当前点击对象、图标、支持tabbar位置）
+            init(cart, pos, icon = '', tabbar_pos = null) {
+                if((pos || null) != null) {
+                    var self = this;
+                    var btn_size = this.propBtnHeight;
+                    var btn_width = this.propBtnWidth;
+                    // 未指定购物车对象则读取tabbar数据自动计算购物车位置
+                    if((cart || null) == null || (cart[0] || null) == null) {
+                        var info = uni.getSystemInfoSync();
+                        // 当前页面
+                        var page = app.globalData.current_page().split('?');
+                        switch(page[0]) {                        
+                            // 商品搜索
+                            case 'pages/goods-search/goods-search' :
+                                var cart_top = 20;
+                                var cart_width = 35;
+                                var cart_left = info.screenWidth-20;
+                                break;
+
+                            // 默认购物车
+                            default :
+                                // 无购物车菜单则结束执行
+                                var tabbar = app.globalData.app_tabbar_pages();
+                                if(tabbar_pos === null) {
+                                    tabbar_pos = tabbar.indexOf('/pages/cart/cart');
+                                    if(tabbar_pos == -1) {
+                                        return false;
+                                    }
+                                }
+                                // 计算购物车菜单位置
+                                var tabbar_count = tabbar.length;
+                                var cart_top = info.screenHeight;
+                                var cart_width = info.screenWidth/tabbar_count;
+                                var cart_left = cart_width*tabbar_pos;
+                        }
+                    } else {
+                        var temp = cart[0];
+                        var cart_width = temp.width;
+                        var cart_left = temp.left;
+                        var cart_top = temp.top;
+                    }
+                    /* #ifndef MP-ALIPAY */
+                    var left = pos.changedTouches[0].clientX + btn_width/2 - btn_size/2;
+                    var top = pos.changedTouches[0].clientY - btn_size;
+                    /* #endif */
+                    /* #ifdef MP-ALIPAY */
+                    var left = pos.detail.clientX + btn_width/2 - btn_size/2;
+                    var top = pos.detail.clientY - btn_size;
+                    /* #endif */
+                    var x = cart_left + cart_width/2 - btn_size/2 - left;
+                    var y = cart_top - btn_size - top;
+                     if(self.cart_icon_data == null || (self.cart_icon_data.status || 0) == 0) {
+                        self.setData({cart_icon_data: {
+                            status: 1,
+                            style: `--left:${left}px;--top:${top}px;--x:${x}px;--y:${y}px;`,
+                            icon: icon,
+                        }});
+                        setTimeout(function(){
+                            self.setData({ cart_icon_data: {status: 0}});
+                        }, 495);
+                    }
+                }
+            }
+        }
+    };
+</script>
+<style>
+    @keyframes moveY {
+        to {
+            transform: translateY(var(--y));
+        }
+    }
+    @keyframes moveX {
+        to {
+            transform: translateX(var(--x));
+        }
+    }
+    .cart-para-curve-container {
+        width: 60rpx;
+        height: 60rpx;
+        z-index: 10;
+        left: var(--left);
+        top: var(--top);
+        --duration: 0.5s;
+        animation: moveY var(--duration) cubic-bezier(0.5, -0.25, 1, 1);
+    }
+    .cart-para-curve-container .cart-para-curve-icon {
+        max-width: 100%;
+        max-height: 100%;
+        animation: moveX var(--duration) linear;
+    }
+</style>
\ No newline at end of file
diff --git a/components/cart/cart.vue b/components/cart/cart.vue
new file mode 100644
index 0000000..25d038e
--- /dev/null
+++ b/components/cart/cart.vue
@@ -0,0 +1,1690 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="is_first == 0">
+            <block v-if="(plugins_realstore_info || null) != null">
+                <!-- 顶部导航 -->
+                <component-nav-back propClass="bg-white" propColor="#333" :propFixed="false" :propIsShowBack="propSourceType == 'page'">
+                    <template slot="right" class="flex-1 cart-right-title">
+                        <view class="cart-top-nav tc auto">
+                            <view class="cart-top-nav-content bg-grey-f7 round padding-xss cr-black">
+                                <view :class="'item dis-inline-block round cp ' + (cart_type_value == 'shop' ? 'bg-white cr-main' : '')" data-type="shop" @tap="cart_type_event">{{ $t('cart.cart.v37ow8') }}</view>
+                                <view :class="'item dis-inline-block round cp ' + (cart_type_value == 'realstore' ? 'bg-white cr-main' : '')" data-type="realstore" @tap="cart_type_event">{{ $t('cart.cart.09gl3g') }}</view>
+                            </view>
+                        </view>
+                    </template>
+                </component-nav-back>
+                <!-- 门店数据 -->
+                <view v-if="cart_type_value == 'realstore'" class="realstore-nav border-radius-main margin-main oh pr">
+                    <view class="fl padding-main cp" @tap="realstore_choice_open_event">
+                        <view class="dis-inline-block va-m">
+                            <iconfont name="icon-store" size="28rpx" propClass="lh-il" color="#191F39"></iconfont>
+                        </view>
+                        <text class="va-m margin-left-xs">{{ plugins_realstore_info.name }}</text>
+                        <text v-if="(plugins_realstore_info.distance || null) != null" class="va-m">({{ plugins_realstore_info.distance }})</text>
+                        <view class="dis-inline-block va-m margin-left-xs">
+                            <iconfont name="icon-arrow-bottom" size="24rpx" propClass="lh-il" color="#666"></iconfont>
+                        </view>
+                    </view>
+                    <view v-if="(plugins_realstore_info.buy_use_type_list || null) != null && plugins_realstore_info.buy_use_type_list.length > 0" class="pa top-0 right-0 padding-main cp" @tap="realstore_buy_type_switch_event">
+                        <text class="cr-base va-m">{{ plugins_realstore_info.buy_use_type_list[plugins_realstore_buy_use_type_active_index]['name'] }}</text>
+                        <view class="dis-inline-block va-m margin-left-xs">
+                            <iconfont name="icon-arrow-right" size="24rpx" propClass="lh-il" color="#666"></iconfont>
+                        </view>
+                    </view>
+                </view>
+            </block>
+            <block v-else>
+                <!-- #ifndef MP-TOUTIAO || H5 -->
+                <component-nav-back propClass="bg-white" propColor="#333" propNameClass="cr-black" :propName="$t('common.cart')" :propFixed="false" :propIsShowBack="propSourceType == 'page'" :propIsRightSlot="false"></component-nav-back>
+                <!-- #endif -->
+            </block>
+        </block>
+
+        <!-- 提示信息 -->
+        <block v-if="data_list_loding_status == 1">
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg" propPage="cart" :propIsHeader="true"></component-no-data>
+        </block>
+        <block v-else>
+            <!-- 购物车商品列表 -->
+            <scroll-view :scroll-y="true" :class="'scroll-box ' + (data_list.length > 0 ? 'cart ' : '')" @scrolltolower="scroll_lower" lower-threshold="60" :style="scroll_style">
+                <view class="content">
+                    <!-- 数据列表 -->
+                    <view v-if="data_list.length > 0" class="padding-horizontal-main padding-bottom-xsss">
+                        <uni-swipe-action>
+                            <view v-for="(item, index) in data_list" :key="index" class="oh border-radius-main bg-white spacing-mb">
+                                <uni-swipe-action-item :right-options="swipe_options" @click="swipe_opt_event" @change="swipe_change($event, index)">
+                                    <view class="cart-goods-item flex-row align-c bs-bb padding-main pr wh-auto" :class="(common_site_type == 4 ? 'cart-exhibition-mode-data' : '')">
+                                        <!-- 选择 -->
+                                        <view v-if="common_site_type != 4" @tap="selected_event" data-type="node" :data-index="index" class="cart-selected pr z-i">
+                                            <iconfont :name="'icon-zhifu-' + (item.selected || false ? 'yixuan' : 'weixuan')" size="40rpx" :color="item.selected || false ? theme_color : '#999'"></iconfont>
+                                        </view>
+                                        <view class="items oh padding-left-main flex-1 flex-row">
+                                            <view>
+                                                <view :data-index="index" :data-value="item.goods_url" @tap="goods_event" class="cp">
+                                                    <!-- 图片 -->
+                                                    <image :class="'cart-goods-image fl radius ' + ((item.is_error || 0) == 1 ? 'opacity' : '')" :src="item.images" mode="aspectFill"></image>
+                                                    <!-- 错误 -->
+                                                    <view v-if="(item.is_error || 0) == 1" class="error-msg pa tc text-size-xs">
+                                                        <text class="cr-red tc bg-white round">{{ item.error_msg }}</text>
+                                                    </view>
+                                                </view>
+                                            </view>
+
+                                            <!-- 基础 -->
+                                            <view class="cart-goods-base padding-left-main flex-1">
+                                                <!-- 标题、规格 -->
+                                                <view :data-index="index" :data-value="item.goods_url" @tap="goods_event" class="cp">
+                                                    <view :class="'cart-goods-title multi-text margin-bottom-sm fw-b ' + ((item.is_error || 0) == 1 ? 'cr-grey' : '')">{{ item.title }}</view>
+                                                </view>
+                                                <view v-if="item.spec != null" class="margin-bottom-sm">
+                                                    <block v-for="(sv, si) in item.spec" :key="si">
+                                                        <text v-if="si > 0" class="cr-grey padding-left-xs padding-right-xs">;</text>
+                                                        <text class="cr-grey">{{ sv.value }}</text>
+                                                    </block>
+                                                </view>
+
+                                                <!-- 底部内容 -->
+                                                <view class="goods-bottom pr margin-top-sm flex-row jc-sb align-c">
+                                                    <!-- 价格 -->
+                                                    <view v-if="(item.show_field_price_status || 0) == 1">
+                                                        <text class="sales-price fw-b va-m">
+                                                            <text class="text-size-sm">{{ item.show_price_symbol }}</text>
+                                                            <text class="text-size-lg">{{ item.price }}</text>
+                                                        </text>
+                                                        <text class="cr-grey text-size-xs va-m">{{ item.show_price_unit }}</text>
+                                                    </view>
+
+                                                    <!-- 数量 -->
+                                                    <view v-if="(item.is_error || 0) != 1 && common_site_type != 4" class="cart-number-content pa tc oh round br">
+                                                        <view @tap="goods_buy_number_event" class="number-submit tc cr-grey fl va-m" :data-index="index" data-type="0">-</view>
+                                                        <input @blur="goods_buy_number_blur" class="number-input tc cr-grey fl va-m bg-white radius-0" type="number" :value="item.stock" :data-index="index" />
+                                                        <view @tap="goods_buy_number_event" class="number-submit tc cr-grey fl va-m" :data-index="index" data-type="1">+</view>
+                                                    </view>
+                                                </view>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </uni-swipe-action-item>
+                            </view>
+                        </uni-swipe-action>
+                    </view>
+
+                    <!-- 空购物车 -->
+                    <view v-if="data_list.length == 0 && data_list_loding_status == 0" class="cart-no-data-box tc">
+                        <image :src="common_static_url + 'cart-empty.png'" mode="widthFix" class="margin-bottom-lg image"></image>
+                        <view class="cr-grey text-size-sm">{{ data_list_loding_msg || $t('cart.cart.j8on74') }}</view>
+                        <view class="margin-top-xxl">
+                            <button class="bg-main br-main cr-white text-size-md round" type="default" size="mini" hover-class="none" @tap="no_cart_data_btn_event">{{no_cart_data_btn_text}}</button>
+                        </view>
+                    </view>
+
+                    <!-- 底部说明 - 智能工具箱插件、存在购物车商品才展示 -->
+                    <view v-if="data_list.length > 0 && (plugins_intellectstools_data || null) != null && (plugins_intellectstools_data.bottom_desc || null) != null && plugins_intellectstools_data.bottom_desc.length > 0" class="padding-horizontal-main spacing-mb">
+                        <view class="border-radius-main padding-main bg-white oh cr-orange">
+                            <view v-for="(item, index) in plugins_intellectstools_data.bottom_desc" :key="index">
+                                <view :class="index > 0 ? 'margin-top' : ''">{{item}}</view>
+                            </view>
+                        </view>
+                    </view>
+
+                    <!-- 猜你喜欢 -->
+                    <view v-if="goods_list.length > 0" class="padding-horizontal-main margin-top-xxxl">
+                        <view class="tc spacing-mb">
+                            <view class="guess-like fw-b text-size-md">{{ $t('goods-detail.goods-detail.v2974w') }}</view>
+                        </view>
+                        <div class="spacing-mt">
+                            <component-goods-list :propData="{ style_type: 1, goods_list: goods_list, random: random_value }" :propIsCartNumberTabBarBadgeSync="(plugins_realstore_info || null) == null" :propIsCartParaCurve="(plugins_realstore_info || null) == null" :propCurrencySymbol="currency_symbol" propSource="index" @CartSuccessEvent="cart_success_event"></component-goods-list>
+                        </div>
+                    </view>
+
+                    <!-- 操作导航 -->
+                    <block v-if="data_list.length > 0">
+                        <view class="bottom-fixed z-i" :class="(discount_detail_status ? ' discount-detail-popup-z-index' : '')" :style="bottom_fixed_style">
+                            <view>
+                                <!-- 展示 -->
+                                <view v-if="common_site_type == 4" class="cart-exhibition-mode">
+                                    <button class="item exhibition-btn bg-main br-main cr-white round wh-auto text-size-sm" type="default" @tap="exhibition_submit_event" hover-class="none">
+                                        <view class="dis-inline-block va-m margin-right-xl">
+                                            <uni-icons type="phone" size="14" color="#fff" />
+                                        </view>
+                                        <text class="va-m">{{ common_is_exhibition_mode_btn_text }}</text>
+                                    </button>
+                                </view>
+                                <!-- 销售,自提,虚拟销售 -->
+                                <view v-else class="bottom-fixed-content item round bg-white flex-row jc-sb align-c">
+                                    <view class="cart-nav-base single-text padding-left flex-row jc-sb align-c">
+                                        <view class="cart-selected flex-row align-c">
+                                            <view @tap="selected_event" data-type="all">
+                                                <iconfont :name="'icon-zhifu-' + (is_selected_all ? 'yixuan' : 'weixuan')" size="40rpx" :color="is_selected_all ? theme_color : '#999'"></iconfont>
+                                            </view>
+                                            <text v-if="already_selected_status" @tap="cart_all_remove_event" class="margin-left-main cart-nav-remove-submit dis-inline-block va-m bg-white cr-red br-red round cp">{{ $t('common.del') }}</text>
+                                            <text v-else class="va-m cr-base padding-left-main" @tap="selected_event" data-type="all">{{ $t('cart.cart.pxjwv8') }}</text>
+                                        </view>
+                                        <view class="price">
+                                            <view class="flex-row jc-s flex-nowrap align-c">
+                                                <view>{{ $t('buy.buy.wx78ju') }}</view>
+                                                <view class="sales-price single-text fw-b">
+                                                    <text class="text-size-sm">{{ buy_currency_symbol }}</text>
+                                                    <text class="text-size-lg">{{ total_price }}</text>
+                                                </view>
+                                            </view>
+                                            <block v-if="is_cart_show_discount == 1 && total_num > 0">
+                                                <view v-if="data_list.length > 0" class="flex-row jc-s flex-nowrap align-c text-size-xss">
+                                                    <block v-if="preferential_price > 0">
+                                                        <view class="cr-base">{{ $t('cart.cart.3kr74b') }}{{ buy_currency_symbol }}{{ preferential_price }}</view>
+                                                    </block>
+                                                    <block v-else>
+                                                        <block v-if="increase_price > 0">
+                                                            <view class="cr-base">{{ $t('cart.cart.n76213') }}{{ buy_currency_symbol }}{{ increase_price }}</view>
+                                                        </block>
+                                                    </block>
+                                                    <view v-if="preferential_price > 0 || increase_price > 0" class="discount-details" @tap="discount_detail_open_event">{{ $t('cart.cart.4tbj4s') }}</view>
+                                                </view>
+                                            </block>
+                                        </view>
+                                    </view>
+                                    <view class="cart-nav-submit">
+                                        <button class="nav-btn bg-main br-main cr-white round text-size-md" type="default" @tap="buy_submit_event" :disabled="!already_valid_selected_status" hover-class="none">
+                                            {{ $t('goods-category.goods-category.44f1ww') }}<block v-if="total_num > 0">({{ total_num }})</block>
+                                        </button>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                    </block>
+                    <!-- 优惠明细弹窗 -->
+                    <component-popup :propShow="discount_detail_status" propPosition="bottom" propStyle="background: #F6F6F6;" @onclose="discount_detail_close_event">
+                        <view v-if="data_list.length > 0" class="discount_detail-popup padding-main">
+                            <view class="oh tc discount_detail-popup-title">
+                                <text class="text-size">{{ $t('cart.cart.t41i4x') }}</text>
+                                <view class="fr" @tap.stop="discount_detail_close_event">
+                                    <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                                </view>
+                            </view>
+                            <view class="oh border-radius-main bg-white padding-sm discount_detail-popup-goods-list">
+                                <!-- 购物车商品列表 -->
+                                <scroll-view :scroll-y="discount_detail_goods_list_status" :class="'scroll-box-popup ' + (data_list.length > 0 ? 'cart ' : '') + cart_type_value + (!discount_detail_goods_list_status ? ' close' : '')" lower-threshold="60">
+                                    <view class="content flex-row flex-wrap">
+                                        <!-- 数据列表 -->
+                                        <view v-for="(item, index) in data_list" :key="index" class="item">
+                                            <view class="padding-sm pr">
+                                                <!-- 选择 -->
+                                                <view v-if="common_site_type != 4" @tap="selected_event" data-type="node" :data-index="index" class="cart-selected pa top-xxxl right-xxxl z-i">
+                                                    <iconfont :name="'icon-zhifu-' + (item.selected || false ? 'yixuan' : 'weixuan')" size="40rpx" :color="item.selected || false ? theme_color : '#999'"></iconfont>
+                                                </view>
+                                                <view>
+                                                    <view class="cp">
+                                                        <!-- 图片 -->
+                                                        <image :class="'cart-goods-image radius br-e ' + ((item.is_error || 0) == 1 ? 'opacity' : '')" :src="item.images" mode="aspectFill"></image>
+                                                        <!-- 错误 -->
+                                                        <view v-if="(item.is_error || 0) == 1" class="error-msg pa tc text-size-xs">
+                                                            <text class="cr-red tc bg-white round">{{ item.error_msg }}</text>
+                                                        </view>
+                                                    </view>
+                                                    <view class="flex-row jc-sb align-c margin-top-xs">
+                                                        <view class="fw-b text-size-xs single-text flex-1 flex-width"> {{ currency_symbol }}{{ item.price }} </view>
+                                                        <view class="text-size-xss cr-grey-9">x{{ item.stock }}</view>
+                                                    </view>
+                                                </view>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </scroll-view>
+                                <view v-if="data_list.length > 4" class="tc padding-top-sm" @tap="open_goods_list_event">
+                                    <text class="cr-grey-9 text-size-xs">{{ $t('buy.buy.g2vt78') }}{{ goods_count }}{{ $t('cart.cart.miti3i') }}</text>
+                                    <iconfont :name="!discount_detail_goods_list_status ? 'icon-arrow-bottom' : 'icon-arrow-top'" size="28rpx" propClass="pr top-xs margin-left-xs"></iconfont>
+                                </view>
+                            </view>
+
+                            <view v-if="total_num > 0" class="padding bg-white border-radius-main margin-top">
+                                <view class="flex-row jc-sb align-c text-size fw-b margin-bottom">
+                                    <view>{{ $t('cart.cart.t41i4x') }}</view>
+                                    <view> {{ buy_currency_symbol }}{{ all_total_price }} </view>
+                                </view>
+                                <block v-if="preferential_price > 0">
+                                    <view class="flex-row jc-sb align-c text-size-md margin-bottom">
+                                        <view class="fw-b">{{ $t('cart.cart.9s0l57') }}</view>
+                                        <view class="cr-red"> {{ buy_currency_symbol }}{{ preferential_price }}</view>
+                                    </view>
+                                </block>
+                                <block v-else>
+                                    <block v-if="increase_price > 0">
+                                        <view class="flex-row jc-sb align-c text-size-md margin-bottom">
+                                            <view class="fw-b">{{ $t('cart.cart.qh35gz') }}</view>
+                                            <view class="cr-red"> {{ buy_currency_symbol }}{{ increase_price }}</view>
+                                        </view>
+                                    </block>
+                                </block>
+                                <view v-for="(items, indexs) in discount_detail_list" :key="indexs" :class="discount_detail_list.length > indexs + 1 ? 'br-b-f5 margin-bottom' : ''">
+                                    <view class="flex-row align-c margin-bottom-sm">
+                                        <view class="">{{ items.name }}</view>
+                                        <view v-if="(items.alias || null) !== null" class="alias">{{ items.alias }}</view>
+                                    </view>
+                                    <view v-for="(item, index) in items.order_base.extension_data" :key="index" class="flex-row jc-sb align-c text-size-sm margin-bottom-sm">
+                                        <view class="cr-grey-9">{{ item.name }}</view>
+                                        <view class="cr-red"> {{ item.tips }}</view>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                    </component-popup>
+
+                    <!-- 结尾 -->
+                    <component-bottom-line :propStatus="goods_bottom_line_status"></component-bottom-line>
+                </view>
+            </scroll-view>
+        </block>
+
+        <!-- 选择门店弹窗 -->
+        <component-popup :propShow="plugins_realstore_choice_status" propPosition="bottom" @onclose="realstore_choice_close_event">
+            <view class="padding-horizontal-main padding-top-main bg-white">
+                <view class="oh tc">
+                    <text class="text-size">{{ $t('cart.cart.7gdej1') }}</text>
+                    <view class="fr" @tap.stop="realstore_choice_close_event">
+                        <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                    </view>
+                </view>
+                <view class="plugins-realstore-choice-container">
+                    <block v-if="(plugins_realstore_data || null) != null">
+                        <block v-for="(item, index) in plugins_realstore_data" :key="index">
+                            <view class="item" :data-index="index" @tap="realstore_choice_item_event">
+                                <view :class="'padding-main oh ' + ((plugins_realstore_info || null) != null && plugins_realstore_info.id == item.id ? 'border-radius-main br-main' : 'br-white')">
+                                    <text class="cr-base">{{ item.name }}</text>
+                                    <text v-if="(item.distance || null) != null" class="cr-grey margin-left-xs">({{ item.distance }})</text>
+                                    <view v-if="(plugins_realstore_info || null) != null && plugins_realstore_info.id == item.id" class="fr">
+                                        <iconfont name="icon-zhifu-yixuan" size="30rpx" propClass="lh-il cr-main"></iconfont>
+                                    </view>
+                                </view>
+                            </view>
+                        </block>
+                        <view class="padding-main tc">
+                            <view class="dis-inline-block cp" data-value="/pages/plugins/realstore/search/search" @tap="url_event">
+                                <text class="cr-grey text-size-xs va-m">{{ $t('common.view_more') }}</text>
+                                <view class="dis-inline-block va-m margin-left-xs">
+                                    <iconfont name="icon-arrow-right" size="24rpx" propClass="lh-il cr-grey"></iconfont>
+                                </view>
+                            </view>
+                        </view>
+                    </block>
+                    <block v-else>
+                        <component-no-data :propMsg="$t('cart.cart.h63814')"></component-no-data>
+                    </block>
+                </view>
+            </view>
+        </component-popup>
+
+        <!-- 互联网医院问诊下单弹窗 -->
+        <component-popup :propShow="plugins_hospital_prescription_status" propPosition="bottom" @onclose="hospital_prescription_close_event">
+            <view class="padding-horizontal-main padding-top-main bg-white">
+                <view class="oh tc">
+                    <text class="text-size">{{ (plugins_hospital_prescription_data || null) != null ? (plugins_hospital_prescription_data.title || '') : '' }}</text>
+                    <view class="fr" @tap.stop="hospital_prescription_close_event">
+                        <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                    </view>
+                </view>
+                <view class="padding-vertical-main">
+                    <block v-if="(plugins_hospital_prescription_data || null) != null && plugins_hospital_prescription_data.choice_data.length > 0">
+                        <block v-for="(item, index) in plugins_hospital_prescription_data.choice_data">
+                            <view class="padding-vertical-xxl pr">
+                                <text>{{item.name}}</text>
+                                <button type="default" size="mini" class="bg-main br-main cr-white round text-size-xs pa top-xxxxxl right-0" :data-index="index" @tap="hospital_prescription_confirm_event">{{item.btn_text}}</button>
+                            </view>
+                        </block>
+                    </block>
+                    <block v-else>
+                        <component-no-data></component-no-data>
+                    </block>
+                </view>
+            </view>
+        </component-popup>
+
+        <!-- 门店购物车 -->
+        <component-realstore-cart ref="realstore_cart" :propStatus="false" :propCurrencySymbol="currency_symbol" v-on:BuyTypeSwitchEvent="realstore_buy_type_switch_back_event"></component-realstore-cart>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import base64 from '@/common/js/lib/base64.js';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentGoodsList from '@/components/goods-list/goods-list';
+    import componentNavBack from '@/components/nav-back/nav-back';
+    import componentRealstoreCart from '@/components/realstore-cart/realstore-cart';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentPopup from '@/components/popup/popup';
+
+    var common_static_url = app.globalData.get_static_url('common');
+    var status_bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
+    export default {
+        data() {
+            return {
+                status_bar_height: status_bar_height,
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: app.globalData.get_theme_color(),
+                common_static_url: common_static_url,
+                user: null,
+                no_cart_data_btn_text: this.$t('login.login.6yfr9g'),
+                is_first: 1,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_is_loading: 0,
+                data_list: [],
+                total_price: '0.00',
+                total_num: 0,
+                preferential_price: 0,
+                increase_price: 0,
+                all_total_price: 0,
+                goods_count: 0,
+                discount_detail_list: [],
+                buy_currency_symbol: app.globalData.currency_symbol(),
+                is_selected_all: false,
+                already_selected_status: false,
+                already_valid_selected_status: false,
+                // 基础配置
+                currency_symbol: app.globalData.currency_symbol(),
+                common_site_type: 0,
+                common_is_exhibition_mode_btn_text: null,
+                common_is_cart_show_guess_you_like: 0,
+                common_app_customer_service_tel: null,
+                swipe_item_index: null,
+                swipe_options: [
+                    {
+                        text: this.$t('goods-detail.goods-detail.dco1sc'),
+                        style: {
+                            backgroundColor: '#1AAD19',
+                        },
+                    },
+                    {
+                        text: this.$t('common.del'),
+                        style: {
+                            backgroundColor: '#E64340',
+                        },
+                    },
+                ],
+                // 首页地址
+                home_page_url: app.globalData.app_tabbar_pages()[0],
+                // 猜你喜欢 参数
+                goods_list: [],
+                goods_bottom_line_status: false,
+                goods_is_loading: 0,
+                goods_total: 0,
+                goods_page_total: 0,
+                goods_page: 1,
+                // 增加随机数，避免无法监听数据列表内部数据更新
+                random_value: 0,
+                // 是否展示顶部购物车导航
+                is_cart_top_nav: 1,
+                // 购物车类型(shop 商城, realstore 门店)
+                cart_type_value: 'shop',
+                // 门店插件数据
+                plugins_realstore_data: null,
+                plugins_realstore_info: null,
+                plugins_realstore_buy_use_type_active_index: 0,
+                plugins_realstore_choice_status: false,
+                // 智能工具箱插件
+                plugins_intellectstools_data: null,
+                // 优惠明细弹窗
+                discount_detail_status: false,
+                // 优惠明细弹窗内商品列表显示隐藏更多
+                discount_detail_goods_list_status: false,
+                // 预下单计算开关
+                is_cart_show_discount: 0,
+                scroll_style: '',
+                // 底部购买导航样式
+                bottom_fixed_style: '',
+                // 互联网医院问诊数据
+                plugins_hospital_prescription_data: null,
+                plugins_hospital_prescription_status: false
+            };
+        },
+
+        props: {
+            // 来源类型
+            propSourceType: {
+                type: String,
+                default: '', // 默认主页面。当传入page时为子页面
+            },
+            // 底部菜单高度
+            propCartNavBottomValue: {
+                type: Number,
+                default: 0
+            }
+        },
+
+        components: {
+            componentNoData,
+            componentGoodsList,
+            componentNavBack,
+            componentRealstoreCart,
+            componentBottomLine,
+            componentPopup
+        },
+
+        // 属性值改变监听
+        watch: {
+            // 购物车类型是否改变
+            propCartType(value, old_value) {
+                // 数据加载
+                this.init();
+            },
+            // 底部购买导航距离
+            propCartNavBottomValue(value, old_value) {
+                // 页面样式处理
+                this.page_style_handle();
+            }
+        },
+
+        created: function () {
+            // 数据加载
+            this.init();
+
+            // 初始化配置
+            this.init_config();
+        },
+
+        methods: {
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    this.setData({
+                        currency_symbol: app.globalData.get_config('currency_symbol'),
+                        common_site_type: app.globalData.get_config('config.common_site_type'),
+                        common_is_exhibition_mode_btn_text: app.globalData.get_config('config.common_is_exhibition_mode_btn_text') || this.$t('cart.cart.31h34v'),
+                        common_is_cart_show_guess_you_like: parseInt(app.globalData.get_config('config.common_is_cart_show_guess_you_like', 0)),
+                        common_app_customer_service_tel: app.globalData.get_config('config.common_app_customer_service_tel'),
+                        is_cart_show_discount: parseInt(app.globalData.get_config('plugins_base.intellectstools.data.is_cart_show_discount', 0)),
+                    });
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 获取数据
+            init(params = {}) {
+                // 网络检查
+                if ((params || null) == null || (params.loading || 0) == 0) {
+                    app.globalData.network_type_handle(this, 'init');
+                    return false;
+                }
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.setData({
+                        user: user,
+                        no_cart_data_btn_text: this.$t('cart.cart.wb5465')
+                    });
+
+                    // 获取数据
+                    this.get_data();
+
+                    // 猜你喜欢、仅首次读取、还未加载过
+                    if (this.is_first == 1 && this.goods_is_loading == 0) {
+                        this.get_data_list(1);
+                    }
+                } else {
+                    this.setData({
+                        is_first: 0,
+                        user: null,
+                        data_list: [],
+                        plugins_realstore_info: null,
+                        no_cart_data_btn_text: this.$t('login.login.6yfr9g'),
+                        data_list_loding_status: 0,
+                        data_list_loding_msg: this.$t('extraction-apply.extraction-apply.m3xdif'),
+                    });
+
+                    // 有用户信息，是否需要绑定手机
+                    if(this.user == null) {
+                        var cache_user = app.globalData.get_user_cache_info() || null;
+                        if(cache_user != null && app.globalData.user_is_bind_mobile(cache_user)) {
+                            this.setData({
+                                no_cart_data_btn_text: this.$t('login.login.np9177')
+                            });
+                        }
+                    }
+
+                    // 猜你喜欢
+                    this.get_data_list(1);
+                }
+
+                // 页面样式处理
+                this.page_style_handle();
+
+                // 分享菜单处理
+                app.globalData.page_share_handle();
+            },
+
+            // 获取数据
+            get_data(type = 0) {
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                });
+
+                // 门店购物车
+                if (this.cart_type_value == 'realstore' && (this.plugins_realstore_info || null) != null) {
+                    // 门店购物车初始化、避免上一个页面更改了门店下单类型
+                    this.realstore_cart_data_init();
+                    // 门店请求参数
+                    var type_data = this.$refs.realstore_cart.buy_use_type_data();
+                    var post_data = {
+                        buy_use_type_data_index: type_data.data_index,
+                        id: this.plugins_realstore_info.id,
+                    };
+                    this.get_cart_data(type, app.globalData.get_request_url('cartdata', 'detail', 'realstore'), post_data);
+                } else {
+                    // 商城购物车
+                    this.get_cart_data(type, app.globalData.get_request_url('index', 'cart'));
+                }
+            },
+
+            // 获取购物车数据
+            get_cart_data(type, url, post_data = {}) {
+                uni.request({
+                    url: url,
+                    method: 'POST',
+                    data: post_data,
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var data_list = data.data || [];
+                            if (data_list.length > 0) {
+                                // 选中状态处理
+                                var not_use = uni.getStorageSync(app.globalData.data.cache_user_cart_not_use_data_key) || {};
+                                for (var i in data_list) {
+                                    if ((not_use[data_list[i]['id']] || null) == null || not_use[data_list[i]['id']] != data_list[i]['stock']) {
+                                        data_list[i]['selected'] = true;
+                                    }
+                                }
+                                // 缓存记录用户未选中的购物车数据
+                                uni.setStorageSync(app.globalData.data.cache_user_cart_not_use_data_key, not_use);
+                            }
+
+                            // 设置数据
+                            this.setData({
+                                is_first: 0,
+                                data_is_loading: 0,
+                                data_list: data_list,
+                                data_list_loding_status: data_list.length == 0 ? 0 : 3,
+                                data_list_loding_msg: this.$t('cart.cart.j8on74'),
+                                plugins_intellectstools_data: data.plugins_intellectstools_data || null,
+                            });
+
+                            // 门店数据初始化
+                            var realstore = data.plugins_realstore_data || null;
+                            this.setData({
+                                plugins_realstore_data: realstore,
+                            });
+                            // 门店为空、还没有初始门店信息，初始门店信息不在当前列表中则 赋值门店初始信息和门店购物车初始化
+                            if(app.globalData.data.is_cart_header_close_realstore != 1) {
+                                if(
+                                    realstore == null ||
+                                    this.plugins_realstore_info == null ||
+                                    !realstore
+                                        .map(function (v) {
+                                            return v.id;
+                                        })
+                                        .includes(this.plugins_realstore_info.id)
+                                ) {
+                                    this.setData({
+                                        plugins_realstore_info: realstore == null ? null : realstore[0],
+                                    });
+                                    this.realstore_cart_data_init();
+                                }
+                            }
+
+                            // 选择处理
+                            this.cart_selected_calculate();
+
+                            // 购物车导航角标
+                            app.globalData.set_tab_bar_badge('cart', data.buy_number);
+                        } else {
+                            this.setData({
+                                is_first: 0,
+                                data_is_loading: 0,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+
+                        // 分享菜单处理、延时执行，确保基础数据已加载完成
+                        setTimeout(function () {
+                            app.globalData.page_share_handle();
+                        }, 3000);
+
+                        // 页面样式处理
+                        this.page_style_handle();
+                    },
+                    fail: () => {
+                        this.setData({
+                            is_first: 0,
+                            data_is_loading: 0,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        
+                        // 页面样式处理
+                        this.page_style_handle();
+                    },
+                });
+            },
+
+            // 数量输入事件
+            goods_buy_number_blur(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var buy_number = parseInt(e.detail.value) || 1;
+                this.goods_buy_number_func(index, buy_number);
+            },
+
+            // 数量操作事件
+            goods_buy_number_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var type = parseInt(e.currentTarget.dataset.type) || 0;
+                var temp_number = parseInt(this.data_list[index]['stock']);
+                var buy_number = type == 0 ? temp_number - 1 : temp_number + 1;
+                this.goods_buy_number_func(index, buy_number, type);
+            },
+
+            // 删除弹窗
+            model_tips(id) {
+                var self = this;
+                uni.showModal({
+                    title: self.$t('common.warm_tips'),
+                    content: self.$t('cart.cart.3v6ulk'),
+                    confirmText: self.$t('common.confirm'),
+                    cancelText: self.$t('common.not_yet'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            self.cart_delete(id, 'delete');
+                        }
+                    },
+                });
+            },
+
+            // 数量处理方法
+            goods_buy_number_func(index, buy_number, type = null) {
+                var temp_data_list = this.data_list;
+                var buy_min_number = parseInt(temp_data_list[index]['spec_buy_min_number']) || 1;
+                var buy_max_number = parseInt(temp_data_list[index]['spec_buy_max_number']) || 0;
+                var inventory = parseInt(temp_data_list[index]['inventory']);
+                var inventory_unit = temp_data_list[index]['inventory_unit'];
+                let new_type = type === 0 ? 'del' : 'add';
+                if (buy_number < buy_min_number) {
+                    buy_number = buy_min_number;
+                    this.data_list[index].stock = buy_min_number;
+                    if (buy_min_number > 1) {
+                        app.globalData.showToast(this.$t('recommend-detail.recommend-detail.265vyu') + buy_min_number + inventory_unit);
+                        this.model_tips(temp_data_list[index]['id']);
+                        return false;
+                    }
+                }
+
+                if (buy_max_number > 0 && buy_number > buy_max_number) {
+                    buy_number = buy_max_number;
+                    app.globalData.showToast(this.$t('goods-category.goods-category.z1eh3v') + buy_max_number + inventory_unit);
+                    return false;
+                }
+
+                if (buy_number > inventory) {
+                    buy_number = inventory;
+                    app.globalData.showToast(this.$t('recommend-detail.recommend-detail.2sis3v') + inventory + inventory_unit);
+                    return false;
+                }
+
+                if (temp_data_list[index]['stock'] == 1 && buy_number == 1) {
+                    this.model_tips(temp_data_list[index]['id']);
+                    return false;
+                }
+
+                // 更新数据库
+                uni.showLoading({
+                    title: this.$t('common.processing_in_text'),
+                    mask: true,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('stock', 'cart'),
+                    method: 'POST',
+                    data: {
+                        id: temp_data_list[index]['id'],
+                        goods_id: temp_data_list[index]['goods_id'],
+                        stock: buy_number,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            // 猜你喜欢商品处理
+                            var temp_stock = parseInt(temp_data_list[index]['stock']);
+                            if (type === null) {
+                                if (temp_stock > buy_number) {
+                                    type = 0;
+                                    var number = temp_stock - buy_number;
+                                } else {
+                                    type = 1;
+                                    var number = buy_number - temp_stock;
+                                }
+                            } else {
+                                var number = type == 0 ? temp_stock - buy_number : buy_number - temp_stock;
+                            }
+                            this.goods_change(temp_data_list[index]['goods_id'], type, number);
+
+                            // 购物车数据更新
+                            var not_use = uni.getStorageSync(app.globalData.data.cache_user_cart_not_use_data_key) || {};
+                            var data = res.data.data;
+                            temp_data_list[index]['stock'] = data.stock;
+                            temp_data_list[index]['original_price'] = data.original_price;
+                            temp_data_list[index]['price'] = data.price;
+                            temp_data_list[index]['selected'] = true;
+                            delete not_use[temp_data_list[index]['id']];
+                            this.setData({
+                                data_list: temp_data_list,
+                            });
+
+                            // 缓存记录用户未选中的购物车数据
+                            uni.setStorageSync(app.globalData.data.cache_user_cart_not_use_data_key, not_use);
+
+                            // 选择处理
+                            this.cart_selected_calculate();
+                        } else {
+                            if (app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            } else {
+                                app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 收藏+删除
+            goods_favor_delete(id, goods_id, type) {
+                uni.request({
+                    url: app.globalData.get_request_url('favor', 'goods'),
+                    method: 'POST',
+                    data: {
+                        id: goods_id,
+                        is_mandatory_favor: 1,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            this.cart_delete(id, type);
+                        } else {
+                            if (app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            } else {
+                                app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                            }
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 批量删除操作
+            cart_all_remove_event(e) {
+                var self = this;
+                uni.showModal({
+                    title: self.$t('common.warm_tips'),
+                    content: self.$t('cart.cart.3v6ulk'),
+                    confirmText: self.$t('common.confirm'),
+                    cancelText: self.$t('common.not_yet'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            var data = [];
+                            var temp_data_list = self.data_list || [];
+                            for (var i in temp_data_list) {
+                                if ((temp_data_list[i]['selected'] || false) == true) {
+                                    data.push(temp_data_list[i]['id']);
+                                }
+                            }
+                            if (data.length <= 0) {
+                                app.globalData.showToast(self.$t('order.order.15k32o'));
+                                return false;
+                            }
+                            self.cart_delete(data.join(','), 'delete');
+                        }
+                    },
+                });
+            },
+
+            // 滑动事件
+            swipe_change(e, v) {
+                this.setData({
+                    swipe_item_index: e == 'none' ? null : v,
+                });
+            },
+
+            // 移除操作事件
+            swipe_opt_event(e) {
+                var index = e.index || 0;
+                var temp_data_list = this.data_list;
+                if (this.swipe_item_index === null) {
+                    app.globalData.showToast(this.$t('cart.cart.8q2yej'));
+                    return false;
+                }
+                if ((temp_data_list[this.swipe_item_index] || null) == null) {
+                    app.globalData.showToast(this.$t('cart.cart.9g81jk'));
+                    return false;
+                }
+
+                // 根据操作类型处理数据
+                var id = temp_data_list[this.swipe_item_index]['id'];
+                var goods_id = temp_data_list[this.swipe_item_index]['goods_id'];
+                if (index == 0) {
+                    this.goods_favor_delete(id, goods_id, 'favor');
+                } else {
+                    this.cart_delete(id, 'delete');
+                }
+            },
+
+            // 购物车删除
+            cart_delete(id, type) {
+                uni.request({
+                    url: app.globalData.get_request_url('delete', 'cart'),
+                    method: 'POST',
+                    data: {
+                        id: id,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            var temp_list = [];
+                            var temp_id_arr = id.toString().split(',');
+                            var temp_del_goods_ids = [];
+                            var temp_data_list = this.data_list;
+                            for (var i in temp_data_list) {
+                                if (temp_id_arr.indexOf(temp_data_list[i]['id'].toString()) == -1) {
+                                    temp_list.push(temp_data_list[i]);
+                                } else {
+                                    // 猜你喜欢商品处理
+                                    this.goods_change(temp_data_list[i]['goods_id'], 0, temp_data_list[i]['stock']);
+                                }
+                            }
+                            this.setData({
+                                data_list: temp_list,
+                                data_list_loding_status: temp_list.length == 0 ? 0 : this.data_list_loding_status,
+                                random_value: Math.random(),
+                            });
+                            app.globalData.showToast(type == 'delete' ? this.$t('common.del_success') : this.$t('cart.cart.346c25'), 'success');
+
+                            // 选择处理
+                            this.cart_selected_calculate();
+                        } else {
+                            if (app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(type == 'delete' ? this.$t('common.del_fail') : this.$t('cart.cart.21051p'));
+                            } else {
+                                app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                            }
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 选中处理
+            selected_event(e) {
+                var type = e.currentTarget.dataset.type || null;
+                if (type != null) {
+                    var temp_data_list = this.data_list;
+                    var temp_is_selected_all = this.is_selected_all;
+                    var not_use = uni.getStorageSync(app.globalData.data.cache_user_cart_not_use_data_key) || {};
+                    switch (type) {
+                        // 批量操作
+                        case 'all':
+                            temp_is_selected_all = temp_is_selected_all == true ? false : true;
+                            for (var i in temp_data_list) {
+                                temp_data_list[i]['selected'] = temp_is_selected_all;
+                                // 选中清除则则记录
+                                if (temp_is_selected_all) {
+                                    delete not_use[temp_data_list[i]['id']];
+                                } else {
+                                    not_use[temp_data_list[i]['id']] = temp_data_list[i]['stock'];
+                                }
+                            }
+                            break;
+                        // 节点操作
+                        case 'node':
+                            var index = e.currentTarget.dataset.index || 0;
+                            temp_data_list[index]['selected'] = temp_data_list[index]['selected'] == true ? false : true;
+                            // 选中清除则则记录
+                            if (temp_data_list[index]['selected']) {
+                                delete not_use[temp_data_list[index]['id']];
+                            } else {
+                                not_use[temp_data_list[index]['id']] = temp_data_list[index]['stock'];
+                            }
+                            break;
+                    }
+                    this.setData({
+                        data_list: temp_data_list,
+                        is_selected_all: temp_is_selected_all,
+                    });
+
+                    // 缓存记录用户未选中的购物车数据
+                    uni.setStorageSync(app.globalData.data.cache_user_cart_not_use_data_key, not_use);
+
+                    // 选择处理
+                    this.cart_selected_calculate();
+                }
+            },
+
+            // 选中计算
+            cart_selected_calculate() {
+                var cart_total = 0;
+                var total_price = 0;
+                var total_num = 0;
+                var data_count = 0;
+                var selected_count = 0;
+                var temp_data_list = this.data_list;
+                for (var i in temp_data_list) {
+                    if ((temp_data_list[i]['selected'] || false) == true) {
+                        selected_count++;
+                        if ((temp_data_list[i]['is_error'] || 0) == 0) {
+                            data_count++;
+                            total_price += parseInt(temp_data_list[i]['stock']) * parseFloat(temp_data_list[i]['price']);
+                            total_num += parseInt(temp_data_list[i]['stock']);
+                        }
+                    }
+                    cart_total += parseInt(temp_data_list[i]['stock']);
+                }
+                this.setData({
+                    already_selected_status: selected_count > 0,
+                    already_valid_selected_status: data_count > 0,
+                    is_selected_all: selected_count > 0 && selected_count >= temp_data_list.length,
+                });
+
+                // 预下单计算开关 0
+                if (this.is_cart_show_discount === 0) {
+                    this.setData({
+                        total_price: total_price.toFixed(2),
+                        total_num: total_num,
+                    });
+                } else {
+                    // 调用预下单处理、优惠信息
+                    this.pre_order_handle();
+                }
+
+                // 购物车导航角标
+                app.globalData.set_tab_bar_badge('cart', cart_total);
+            },
+
+            // 预下单处理
+            pre_order_handle() {
+                var data = this.buy_data_params();
+                if (data !== false) {
+                    uni.request({
+                        url: app.globalData.get_request_url('index', 'buy'),
+                        method: 'POST',
+                        data: {...data, ...{is_cart_init: 1}},
+                        dataType: 'json',
+                        success: (res) => {
+                            if (res.data.code == 0) {
+                                var data = res.data.data;
+                                this.setData({
+                                    total_price: data.base.actual_price,
+                                    total_num: data.base.buy_count,
+                                    goods_count: data.base.goods_count,
+                                    preferential_price: data.base.preferential_price,
+                                    increase_price: data.base.increase_price,
+                                    all_total_price: data.base.total_price,
+                                    buy_currency_symbol: data.currency_symbol,
+                                    discount_detail_list: data.goods_list,
+                                });
+                            } else {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        },
+                        fail: () => {
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 结算数据参数
+            // appoint_goods_ids  指定结算商品id，多个id逗号分割）
+            buy_data_params(appoint_goods_ids = null) {
+                // 解析当前选择的数据商品id
+                var temp_appoint_goods_ids = [];
+                if((appoint_goods_ids || null) != null) {
+                    temp_appoint_goods_ids = appoint_goods_ids.split(',').map(function(v){return parseInt(v);});
+                }
+                // 匹配商品
+                var selected_count = 0;
+                var ids = [];
+                var temp_data_list = this.data_list || [];
+                for (var i in temp_data_list) {
+                    if ((temp_data_list[i]['is_error'] || 0) == 0 && (temp_data_list[i]['selected'] || false) == true && (temp_appoint_goods_ids.length == 0 || temp_appoint_goods_ids.indexOf(parseInt(temp_data_list[i]['goods_id'])) != -1)) {
+                        ids.push(temp_data_list[i]['id']);
+                        selected_count++;
+                    }
+                }
+                if (selected_count <= 0) {
+                    this.setData({
+                        preferential_price: 0,
+                        increase_price: 0,
+                        total_price: 0,
+                        all_total_price: 0,
+                        total_num: 0,
+                        discount_detail_list: [],
+                    });
+                    return false;
+                }
+
+                // 结算参数
+                var data = {
+                    buy_type: 'cart',
+                    ids: ids.join(','),
+                };
+                // 是否门店模式
+                if (this.cart_type_value == 'realstore' && (this.plugins_realstore_info || null) != null) {
+                    var type_data = this.$refs.realstore_cart.buy_use_type_data();
+                    data['buy_use_type_data_index'] = type_data.data_index;
+                    data['realstore_id'] = this.plugins_realstore_info.id;
+                }
+                return data;
+            },
+
+            // 结算
+            buy_submit_event(e) {
+                // 结算参数
+                var buy_data = this.buy_data_params();
+                if (buy_data === false) {
+                    app.globalData.showToast(this.$t('cart.cart.3sy0mp'));
+                    return false;
+                }
+
+                // 是否开启了互联网医院处方问诊
+                var is_goods_is_prescription = parseInt(app.globalData.get_config('plugins_base.hospital.data.is_goods_is_prescription', 0));
+                if(is_goods_is_prescription == 1) {
+                    this.plugins_hospital_prescription_handle(buy_data);
+                    return false;
+                }
+
+                // 进入结算页面
+                this.to_buy_handle(buy_data);
+            },
+
+            // 互联网医院处方问诊
+            plugins_hospital_prescription_handle(buy_data) {
+                uni.showLoading({
+                    title: this.$t('common.processing_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('savecheck', 'prescription', 'hospital'),
+                    method: 'POST',
+                    data: buy_data,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            if((data.choice_data || null) != null && data.choice_data.length > 0) {
+                                this.setData({
+                                    plugins_hospital_prescription_data: data,
+                                    plugins_hospital_prescription_status: true
+                                });
+                            } else {
+                                this.to_buy_handle(buy_data);
+                            }
+                        } else {
+                            if (app.globalData.is_login_check(res.data)) {
+                                this.to_buy_handle(buy_data);
+                            } else {
+                                app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 互联网医院问诊确认事件
+            hospital_prescription_confirm_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var data = this.plugins_hospital_prescription_data.choice_data[index];
+                var buy_data = this.buy_data_params(data.goods_ids);
+                // 问诊开方
+                if(data.type == 'prescription') {
+                    this.to_buy_handle(buy_data, '/pages/plugins/hospital/prescription/prescription');
+                } else {
+                    // 普通结算
+                    this.to_buy_handle(buy_data);
+                }
+            },
+
+            // 互联网医院问诊弹窗关闭
+            hospital_prescription_close_event(e) {
+                this.setData({
+                    plugins_hospital_prescription_status: false
+                });
+            },
+
+            // 进入购买
+            to_buy_handle(buy_data, pages = '/pages/buy/buy') {
+                app.globalData.url_open(pages+'?data=' + encodeURIComponent(base64.encode(JSON.stringify(buy_data))));
+            },
+
+            // 展示型事件
+            exhibition_submit_event(e) {
+                app.globalData.call_tel(this.common_app_customer_service_tel);
+            },
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 猜你喜欢
+            get_data_list(is_mandatory) {
+                if(this.common_is_cart_show_guess_you_like == 1) {
+                    // 分页是否还有数据
+                    if ((is_mandatory || 0) == 0) {
+                        if (this.goods_bottom_line_status == true) {
+                            return false;
+                        }
+                    }
+
+                    // 是否加载中
+                    if (this.goods_is_loading == 1) {
+                        return false;
+                    }
+                    this.setData({
+                        goods_is_loading: 1,
+                    });
+
+                    // 获取数据
+                    uni.request({
+                        url: app.globalData.get_request_url('datalist', 'search'),
+                        method: 'POST',
+                        data: {
+                            page: this.goods_page,
+                        },
+                        dataType: 'json',
+                        success: (res) => {
+                            if (res.data.code == 0) {
+                                var data = res.data.data;
+                                if (data.data.length > 0) {
+                                    if (this.goods_page <= 1) {
+                                        var temp_data_list = data.data;
+                                    } else {
+                                        var temp_data_list = this.goods_list || [];
+                                        var temp_data = data.data;
+                                        for (var i in temp_data) {
+                                            temp_data_list.push(temp_data[i]);
+                                        }
+                                    }
+                                    this.setData({
+                                        goods_list: temp_data_list,
+                                        random_value: Math.random(),
+                                        goods_total: data.total,
+                                        goods_page_total: data.page_total,
+                                        goods_page: this.goods_page + 1,
+                                        goods_is_loading: 0,
+                                    });
+
+                                    // 是否还有数据
+                                    this.setData({
+                                        goods_bottom_line_status: this.goods_page > 1 && this.goods_page > this.goods_page_total,
+                                    });
+                                } else {
+                                    this.setData({
+                                        goods_total: 0,
+                                        goods_is_loading: 0,
+                                    });
+                                    if (this.goods_page <= 1) {
+                                        this.setData({
+                                            goods_list: [],
+                                            random_value: Math.random(),
+                                            goods_bottom_line_status: false,
+                                        });
+                                    }
+                                }
+                            } else {
+                                this.setData({
+                                    goods_is_loading: 0,
+                                });
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        },
+                        fail: () => {
+                            this.setData({
+                                goods_is_loading: 0,
+                            });
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 猜你喜欢加入购物车回调
+            cart_success_event(e) {
+                // 更新猜你喜欢列表数据
+                this.setData({
+                    goods_list: e.goods_list,
+                    random_value: Math.random(),
+                });
+                // 重新加载数据
+                this.get_data();
+            },
+
+            // 猜你喜欢数据更新
+            goods_change(goods_id, type, number = 0) {
+                var temp_goods_list = this.goods_list || [];
+                if (temp_goods_list.length > 0) {
+                    number = parseInt(number);
+                    for (var i in temp_goods_list) {
+                        if (temp_goods_list[i]['id'] == goods_id) {
+                            var user_cart_count = parseInt(temp_goods_list[i]['user_cart_count'] || 0);
+                            temp_goods_list[i]['user_cart_count'] = type == 0 ? user_cart_count - number : user_cart_count + number;
+                        }
+                    }
+                    this.setData({
+                        goods_list: temp_goods_list,
+                        random_value: Math.random(),
+                    });
+                }
+            },
+
+            // 商品事件
+            goods_event(e) {
+                // 商品数据缓存处理
+                var goods = this.data_list[e.currentTarget.dataset.index];
+                goods['id'] = goods.goods_id;
+                app.globalData.goods_data_cache_handle(goods.id, goods);
+
+                // 调用公共打开url地址
+                app.globalData.url_event(e);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 购物车类型事件
+            cart_type_event(e) {
+                if (this.data_is_loading == 0) {
+                    this.setData({
+                        data_list_loding_status: 1,
+                        cart_type_value: e.currentTarget.dataset.type || 'shop',
+                    });
+                    // 重新加载数据
+                    this.get_data();
+                    // 页面样式处理
+                    this.page_style_handle();
+                }
+            },
+
+            // 门店选择事件
+            realstore_choice_open_event(e) {
+                this.setData({
+                    plugins_realstore_choice_status: true,
+                });
+            },
+
+            // 门店选择弹层关闭
+            realstore_choice_close_event(e) {
+                this.setData({
+                    plugins_realstore_choice_status: false,
+                });
+            },
+
+            // 门店弹窗选择
+            realstore_choice_item_event(e) {
+                this.setData({
+                    data_list_loding_status: 1,
+                    plugins_realstore_choice_status: false,
+                    plugins_realstore_info: this.plugins_realstore_data[e.currentTarget.dataset.index],
+                });
+                // 重新初始化门店数据
+                this.realstore_cart_data_init();
+                // 重新加载数据
+                this.get_data();
+            },
+
+            // 门店购物车数据初始化
+            realstore_cart_data_init() {
+                if ((this.plugins_realstore_info || null) != null) {
+                    // 初始化门店购物车
+                    this.$refs.realstore_cart.init({ source: 'system-cart', info: this.plugins_realstore_info });
+                    // 初始当前门店下单类型
+                    var type_data = this.$refs.realstore_cart.buy_use_type_data();
+                    this.setData({
+                        plugins_realstore_buy_use_type_active_index: type_data.active_index,
+                    });
+                }
+            },
+
+            // 门店下单类型切换
+            realstore_buy_type_switch_event(e) {
+                this.$refs.realstore_cart.buy_use_type_event();
+            },
+
+            // 下单类型切换事件回调
+            realstore_buy_type_switch_back_event(params) {
+                this.setData({
+                    data_list_loding_status: 1,
+                    plugins_realstore_buy_use_type_active_index: params.buy_use_type_active_index,
+                });
+                // 重新加载数据
+                this.get_data();
+            },
+            // 打开优惠明细弹窗
+            discount_detail_open_event(e) {
+                this.setData({
+                    discount_detail_status: !this.discount_detail_status,
+                    discount_detail_goods_list_status: false,
+                });
+            },
+            // 关闭优惠明细弹窗
+            discount_detail_close_event(e) {
+                this.setData({
+                    discount_detail_status: false,
+                });
+            },
+            // 打开优惠明细商品列表更多或关闭
+            open_goods_list_event() {
+                if (this.data_list.length > 4) {
+                    this.setData({
+                        discount_detail_goods_list_status: !this.discount_detail_goods_list_status,
+                    });
+                } else {
+                    this.setData({
+                        discount_detail_goods_list_status: false,
+                    });
+                }
+            },
+            // 无购物车数据按钮事件
+            no_cart_data_btn_event(e) {
+                var url = ((this.user || null) == null) ? '/pages/login/login?event_callback=init' : this.home_page_url;
+                app.globalData.url_open(url);
+            },
+
+            // 页面样式处理
+            page_style_handle() {
+                var value = 0;
+                var value_unit = 'px';
+                if(app.globalData.data.is_use_native_tabbar == 1) {
+                    // #ifdef H5
+                    if(this.propSourceType != 'page') {
+                        value += uni.getWindowInfo().windowBottom || 50;
+                    }
+                    // #endif
+                } else {
+                    value += this.propCartNavBottomValue;
+                    // #ifdef H5
+                    if(app.globalData.is_pc()) {
+                        var system = app.globalData.get_system_info(null, null, true);
+                        if(system.windowWidth <= 960) {
+                            value *= 2;
+                            value_unit = 'rpx';
+                        }
+                    }
+                    // #endif
+                }
+                this.setData({
+                    bottom_fixed_style: 'bottom:'+value+value_unit,
+                    scroll_style: 'height: calc(100vh - ' + (value+(this.cart_type_value == 'realstore' ? 200 : 70)-(this.is_first == 1 ? 100 : 0))+'rpx)',
+                });
+            }
+        }
+    };
+</script>
+<style scoped>
+    /**
+    * 商品列表
+    */
+    .scroll-box {
+        height: 100vh;
+    }
+    .scroll-box .content {
+        padding-bottom: 60rpx;
+    }
+    .scroll-box.cart .content {
+        padding-bottom: calc(180rpx + env(safe-area-inset-bottom));
+    }
+    .cart-goods-title {
+        line-height: 44rpx;
+        min-height: 86rpx;
+    }
+    .cart-goods-image {
+        width: 156rpx;
+        height: 156rpx;
+    }
+    .cart-goods-base {
+        width: calc(100% - 170rpx);
+    }
+    .cart-goods-item .selected {
+        margin-top: 60rpx;
+    }
+
+    /**
+     * 错误提示
+     */
+    .cart-goods-item .error-msg {
+        left: 80rpx;
+        top: 78rpx;
+        width: 160rpx;
+        filter: blur(0.3px);
+    }
+    .cart-goods-item .error-msg text {
+        padding: 2rpx 10rpx;
+        box-shadow: 0 2px 10px rgb(181 181 181 / 95%);
+    }
+
+    /**
+     * 底部
+     */
+    .cart-goods-item .goods-bottom {
+        height: 58rpx;
+    }
+
+    /**
+    * 数量操作
+    */
+    .cart-number-content {
+        right: 0;
+        top: 0;
+    }
+    .cart-number-content .number-submit {
+        width: 60rpx;
+        font-weight: bold;
+    }
+    .cart-number-content .number-input {
+        width: 30px;
+        border-width: 0 1px;
+        border-style: solid;
+        border-color: #efefef;
+    }
+    .cart-number-content .number-submit,
+    .cart-number-content .number-input {
+        padding: 0;
+        height: 50rpx;
+        line-height: 50rpx;
+    }
+
+    /**
+    * 空购物车
+    */
+    .cart-no-data-box {
+        padding: 140rpx 0 80rpx 0;
+    }
+    .cart-no-data-box .image {
+        width: 160rpx;
+    }
+
+    /**
+    * 操作导航
+    */
+    .bottom-fixed-content {
+        height: 106rpx;
+    }
+    .cart-nav-base {
+        width: calc(75% - 20rpx);
+    }
+    .cart-nav-submit {
+        padding-right: 16rpx;
+        white-space: nowrap;
+    }
+    .cart-nav-submit .nav-btn {
+        font-size: 32rpx;
+        padding: 0 32rpx;
+        height: 70rpx;
+        line-height: 70rpx;
+        border-radius: 0;
+    }
+    .bottom-fixed .price {
+        width: calc(100% - 170rpx);
+        padding: 16rpx 0 16rpx 16rpx;
+    }
+    .bottom-fixed .sales-price {
+        max-width: calc(100% - 80rpx);
+    }
+    .bottom-fixed .price .discount-details {
+        height: 32rpx;
+        background: #f2f2f2;
+        padding: 0 12rpx;
+        border-radius: 16rpx;
+        margin-left: 18rpx;
+    }
+    .cart-nav-remove-submit {
+        padding: 0rpx 18rpx;
+    }
+
+    /*
+    * 展示型
+    */
+    .cart-exhibition-mode .exhibition-btn {
+        line-height: 80rpx;
+    }
+    .cart-exhibition-mode-data .items {
+        padding-left: 0;
+    }
+    .cart-exhibition-mode-data .error-msg {
+        left: 26rpx;
+    }
+
+    /**
+	 * 猜你喜欢
+	 */
+    .guess-like {
+        position: relative;
+        text-align: center;
+        display: inline-block;
+    }
+    .guess-like::before,
+    .guess-like::after {
+        content: '';
+        width: 76px;
+        height: 1px;
+        background: #dddddd;
+        position: absolute;
+        top: 50%;
+        transform: translateY(-50%);
+    }
+    .guess-like::before {
+        left: calc(100% + 20rpx);
+    }
+    .guess-like::after {
+        right: calc(100% + 20rpx);
+    }
+
+    /**
+     * 顶部导航
+     */
+    .cart-right-title {
+        padding-right: 40rpx;
+    }
+    .cart-top-nav {
+        width: 260rpx;
+    }
+    .cart-top-nav .item {
+        width: 50%;
+        height: 54rpx;
+        line-height: 54rpx;
+    }
+    .realstore-nav {
+        height: 92rpx;
+        background: linear-gradient(180deg, #fffaf1 0%, #ffffff 100%);
+    }
+
+    /**
+     * 门店弹窗选择
+     */
+    .plugins-realstore-choice-container {
+        max-height: 60vh;
+        overflow-y: scroll;
+        overflow-x: hidden;
+        margin-top: 20rpx;
+    }
+
+    /**
+     * 查看明细弹窗
+     */
+    .discount_detail-popup-title {
+        position: absolute;
+        left: 0;
+        right: 0;
+        background: #f6f6f6;
+        top: 0;
+        z-index: 2;
+        padding: 24rpx;
+    }
+    .discount_detail-popup-goods-list {
+        margin-top: 84rpx;
+    }
+    .discount-detail-popup-z-index {
+        z-index: 1002 !important;
+    }
+    .discount_detail-popup {
+        margin-bottom: 140rpx;
+        height: calc(70vh - 122rpx);
+        overflow-y: auto;
+    }
+    .scroll-box-popup {
+        height: 480rpx;
+    }
+    .scroll-box-popup.close {
+        transition: all 0.3s ease;
+        height: 234rpx;
+    }
+    .scroll-box-popup .content {
+        padding-bottom: 0 !important;
+    }
+    .scroll-box-popup .content .item {
+        width: 25%;
+    }
+    .scroll-box-popup .content .item .cart-goods-image {
+        width: 100%;
+    }
+    .scroll-box-popup .cart-selected {
+        background-color: #fff;
+        height: 46rpx;
+        border-radius: 50%;
+        padding: 0 4rpx;
+    }
+    .scroll-box-popup .alias {
+        margin-left: 20rpx;
+        padding: 0 12rpx;
+        line-height: 40rpx;
+        height: 40rpx;
+        font-size: 20rpx;
+        background: #eee;
+        border-radius: 20rpx;
+    }
+</style>
diff --git a/components/categorylimit-warm-tips/categorylimit-warm-tips.vue b/components/categorylimit-warm-tips/categorylimit-warm-tips.vue
new file mode 100644
index 0000000..dca1071
--- /dev/null
+++ b/components/categorylimit-warm-tips/categorylimit-warm-tips.vue
@@ -0,0 +1,54 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="popup_status && (propData || null) != null">
+            <view class="plugins-categorylimit-warm-tips-mask wh-auto ht-auto pf"></view>
+            <view class="plugins-categorylimit-warm-tips-content pf bg-white border-radius-main padding-xxl tc">
+                <image :src="propData.warm_tips_alert_images" class="dis-block wh-auto radius" mode="aspectFit"></image>
+                <view v-if="(propData.warm_tips_alert_msg || null) != null" class="margin-top-lg cr-base">{{propData.warm_tips_alert_msg}}</view>
+                <button type="button" class="bg-main br-main cr-white round text-size-md margin-top-xxxl" @tap="close_event">{{$t('common.confirm')}}</button>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                popup_status: true,
+            };
+        },
+        props: {
+            propData: {
+            	type: [String,Object],
+            	default: ''
+            }
+        },
+        methods: {
+            // 关闭弹窗
+            close_event(e) {
+                this.setData({
+                    popup_status: false
+                });
+            }
+        }
+    };
+</script>
+<style scoped>
+    .plugins-categorylimit-warm-tips-mask {
+        left: 0;
+        top: 0;
+        background: rgb(0, 0, 0, 0.6);
+        z-index: 10;
+    }
+    .plugins-categorylimit-warm-tips-content {
+        z-index: 11;
+        width: calc(100% - 240rpx);
+        left: 50%;
+        top: 50%;
+        height: -webkit-max-content;
+        height: max-content;
+        transform: translate(-50%, -50%);
+    }
+</style>
\ No newline at end of file
diff --git a/components/choice-location/choice-location.vue b/components/choice-location/choice-location.vue
new file mode 100644
index 0000000..0436458
--- /dev/null
+++ b/components/choice-location/choice-location.vue
@@ -0,0 +1,169 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="propIsShowAddressChoice" class="choice-location pr wh-auto oh" :style="propLocationContainerStyle" @tap.stop="choose_user_location">
+            <view class="flex-row gap-2 align-c oh" :style="propLocationImgContainerStyle">
+                <view v-if="propIsLeftIconArrow" class="dis-inline-block va-m lh">
+                    <block v-if="(propLeftImgValue || null) != null && propLeftImgValue.length > 0">
+                        <image :src="propLeftImgValue[0].url" class="dis-block" mode="heightFix"></image>
+                    </block>
+                    <block v-else>
+                        <iconfont :name="propLeftIconValue" :size="propIconLocationSize" propClass="lh" :color="propIconLocationColor || propBaseColor" :propContainerDisplay="propContainerDisplay"></iconfont>
+                    </block>
+                </view>
+                <view :class="'va-m dis-inline-block margin-left-xs single-text text' + (propType == 'header' ? ' text-size-md' : ' text-size-xs')" :style="'max-width:' + propTextMaxWidth + ';color:' + (propTextColor || propBaseColor) + ';'">{{ location.text || '' }}</view>
+                <view v-if="propIsRightIconArrow" class="va-m lh dis-inline-block margin-left-xs">
+                    <block v-if="(propRightImgValue || null) != null && propRightImgValue.length > 0">
+                        <image :src="propRightImgValue[0].url" class="dis-block" mode="heightFix"></image>
+                    </block>
+                    <block v-else>
+                        <iconfont :name="propRightIconValue" :size="propIconArrowSize" propClass="lh-xs" :color="propIconArrowColor || propBaseColor" :propContainerDisplay="propContainerDisplay"></iconfont>
+                    </block>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                location: {},
+                cloice_location_timer: null,
+            };
+        },
+        props: {
+            propIsShowAddressChoice: {
+                type: Boolean,
+                default: true,
+            },
+            propBaseColor: {
+                type: String,
+                default: '#fff',
+            },
+            propTextDefaultName: {
+                type: String,
+                default: '',
+            },
+            propTextColor: {
+                type: String,
+                default: '',
+            },
+            propTextMaxWidth: {
+                type: String,
+                default: '100%',
+            },
+            propIconLocationColor: {
+                type: String,
+                default: '',
+            },
+            propIconLocationSize: {
+                type: String,
+                default: '28rpx',
+            },
+            propIconArrowColor: {
+                type: String,
+                default: '',
+            },
+            propIconArrowSize: {
+                type: String,
+                default: '24rpx',
+            },
+            propIsLeftIconArrow: {
+                type: Boolean,
+                default: true,
+            },
+            propLeftImgValue: {
+                type: [Array,String],
+                default: '',
+            },
+            propLeftIconValue: {
+                type: String,
+                default: 'icon-location',
+            },
+            propIsRightIconArrow: {
+                type: Boolean,
+                default: true,
+            },
+            propRightImgValue: {
+                type: [Array,String],
+                default: '',
+            },
+            propRightIconValue: {
+                type: String,
+                default: 'icon-arrow-bottom',
+            },
+            propType: {
+                type: String,
+                default: 'header',
+            },
+            propLocationContainerStyle: {
+                type: String,
+                default: '',
+            },
+            propLocationImgContainerStyle: {
+                type: String,
+                default: '',
+            },
+            propContainerDisplay: {
+                type: String,
+                default: 'inline-block',
+            }
+        },
+        // 页面被展示
+        created: function () {
+            this.init();
+        },
+        methods: {
+            // 初始化
+            init() {
+                let location = app.globalData.choice_user_location_init();
+                if ((this.propTextDefaultName || null) != null) {
+                    var default_name = this.$t('shopxo-uniapp.app.4v6q86');
+                    if (location.text == default_name) {
+                        location.text = this.propTextDefaultName;
+                    }
+                }
+                this.setData({
+                    location: location,
+                });
+            },
+
+            // 选择位置监听
+            choose_user_location(e) {
+                // 定时任务
+                clearInterval(this.cloice_location_timer);
+                var self = this;
+                var timer = setInterval(function () {
+                    var result = app.globalData.choice_user_location_init() || null;
+                    if (result != null && (result.status == 1 || result.status == 3)) {
+                        self.setData({
+                            location: result,
+                        });
+                        clearInterval(self.cloice_location_timer);
+
+                        // 回调事件
+                        self.$emit('onBack', result);
+                    }
+                }, 1000);
+                this.setData({
+                    cloice_location_timer: timer,
+                });
+
+                // 进入位置选择
+                app.globalData.choose_user_location_event();
+            },
+        },
+    };
+</script>
+<style scoped>
+    .choice-location {
+        height: 56rpx;
+        line-height: 56rpx;
+    }
+    .dis-block {
+        width: 100%;
+        height: 56rpx;
+    }
+</style>
diff --git a/components/common/common.vue b/components/common/common.vue
new file mode 100644
index 0000000..44614d7
--- /dev/null
+++ b/components/common/common.vue
@@ -0,0 +1,250 @@
+<template>
+    <view :class="theme_view">
+        <!-- 底部菜单 -->
+        <block v-if="is_tabbar">
+            <component-diy-footer :propKey="key" :propValue="app_tabbar" @onFooterHeight="footer_height_value_event"></component-diy-footer>
+            <view v-if="propIsFooterSeat && footer_height_value > 0" :style="'height:'+footer_height_value+'rpx;'"></view>
+        </block>
+
+        <!-- 微信隐私提示弹窗 -->
+        <view v-if="is_show_privacy" class="agreement-page bs-bb pf wh-auto ht-auto left-0 top-0 z-i-deep-must">
+            <view class="agreement-content border-radius-main bg-white">
+                <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 }}{{$t('common.warm_tips')}}</view>
+                </view>
+                <view class="margin-top-lg text-size-sm cr-base content-desc">
+                    <block v-if="(privacy_content || null) == null">{{$t('agreement.agreement.w38e3v')}}{{ title }}{{$t('agreement.agreement.hjn568')}}</block>
+                    <block v-else>{{ privacy_content }}</block>
+                </view>
+                <view class="cr-blue margin-top-lg">
+                    <view>
+                        <text @tap="agreement_event" data-value="userregister">《{{ title }}{{$t('agreement.agreement.iy7863')}}</text>
+                    </view>
+                    <view class="margin-top-sm">
+                        <text @tap="agreement_event" data-value="userprivacy">《{{ title }}{{$t('agreement.agreement.jwi8n1')}}</text>
+                    </view>
+                </view>
+                <view class="buttom tc margin-top-xxxl padding-top-lg">
+                    <button type="default" size="mini" class="btn br-grey cr-base bg-white text-size-sm round margin-right-xxxl" @tap="exit_event">{{$t('agreement.agreement.062co8')}}</button>
+                    <button type="default" size="mini" class="btn br-main cr-white bg-main text-size-sm round margin-left-xxxl" open-type="agreePrivacyAuthorization" @agreeprivacyauthorization="agree_privacy_auth_event">{{$t('agreement.agreement.60t34e')}}</button>
+                </view>
+            </view>
+        </view>
+
+        <!-- app管理 -->
+        <component-app-admin ref="app_admin" :propIsHideStar="true"></component-app-admin>
+
+        <!-- 用户基础 -->
+        <component-user-base ref="user_base" :propIsGrayscale="propIsGrayscale"></component-user-base>
+
+        <!-- 弹屏广告 -->
+        <component-popupscreen ref="popupscreen" :propIsGrayscale="propIsGrayscale"></component-popupscreen>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentDiyFooter from '@/components/diy/footer';
+    import componentAppAdmin from '@/components/app-admin/app-admin';
+    import componentUserBase from '@/components/user-base/user-base';
+    import componentPopupscreen from '@/components/popupscreen/popupscreen';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                logo: app.globalData.get_application_logo_square(),
+                title: app.globalData.get_application_title(),
+                is_show_privacy: false,
+                privacy_content: null,
+                key: '',
+                is_tabbar: false,
+                app_tabbar: null,
+                footer_height_value: 0,
+            };
+        },
+        props: {
+            // 是否灰度
+            propIsGrayscale: {
+                type: Boolean,
+                default: false,
+            },
+            // 是否显示底部菜单占位
+            propIsFooterSeat: {
+                type: Boolean,
+                default: true,
+            },
+            // 是否引入app管理
+            propIsAppAdmin: {
+                type: Boolean,
+                default: true,
+            },
+            // 是否引入用户基础信息提示
+            propIsUserBase: {
+                type: Boolean,
+                default: true,
+            },
+            // 是否引入弹屏广告
+            propIsPopupscreen: {
+                type: Boolean,
+                default: true,
+            },
+        },
+        components: {
+            componentDiyFooter,
+            componentAppAdmin,
+            componentUserBase,
+            componentPopupscreen
+        },
+        // 页面被展示
+        created: function () {
+            // 初始化配置
+            this.init_config();
+        },
+        methods: {
+            // 显示响应方法
+            on_show(params = {}) {
+                //隐藏系统tabbar
+                if(app.globalData.data.is_use_native_tabbar != 1) {
+                    app.globalData.system_hide_tabbar();
+                }
+
+                // 初始化配置
+                this.init_config(false, params);
+
+                // 系统底部菜单
+                this.footer_init();
+            },
+
+            // 初始化配置
+            init_config(status = false, params = {}) {
+                if ((status || false) == true) {
+                    // 初始化数据
+                    this.init(params);
+                } else {
+                    app.globalData.is_config(this, 'init_config', params);
+                }
+            },
+
+            // 初始化数据
+            init(params = {}) {
+                // 系统底部菜单
+                this.footer_init();
+
+                // app管理
+                if (this.propIsAppAdmin && (this.$refs.app_admin || null) != null) {
+                    this.$refs.app_admin.init(params);
+                }
+
+                // 用户头像和昵称设置提示
+                if (this.propIsUserBase && (this.$refs.user_base || null) != null) {
+                    this.$refs.user_base.init(params);
+                }
+
+                // 弹屏广告
+                if (this.propIsPopupscreen && (this.$refs.popupscreen || null) != null) {
+                    this.$refs.popupscreen.init(params);
+                }
+
+                // #ifdef MP-WEIXIN
+                // 微信协议验证
+                if (app.globalData.data.is_weixin_privacy_setting == 1) {
+                    uni.getPrivacySetting({
+                        success: (res) => {
+                            if (res.needAuthorization) {
+                                this.setData({
+                                    is_show_privacy: true,
+                                    privacy_content: app.globalData.get_config('config.common_app_mini_weixin_privacy_content', null),
+                                });
+                            }
+                        }
+                    });
+                }
+                // #endif
+            },
+
+            // 底部菜单初始化
+            footer_init(status = 0) {
+                var is_use_native_tabbar = app.globalData.data.is_use_native_tabbar == 1;
+                var upd_data = {
+                    is_tabbar: is_use_native_tabbar ? false : app.globalData.is_tabbar_pages()
+                };
+                if(upd_data['is_tabbar']) {
+                    upd_data['key'] = Math.random();
+                    upd_data['app_tabbar'] = app.globalData.get_config('app_tabbar') || null;
+                }
+                this.setData(upd_data);
+
+                // 如果没有菜单数据则读取一次
+                if(!is_use_native_tabbar && status == 0 && (upd_data['app_tabbar'] || null) == null) {
+                    app.globalData.init_config(0, this, 'footer_init', 1);
+                }
+            },
+
+            // 底部菜单高度回调事件
+            footer_height_value_event(value) {
+                this.setData({
+                    footer_height_value: (value*2)+20
+                });
+                this.$emit('onFooterHeight', value);
+
+                // 存储底部菜单高度
+                app.globalData.app_system_tabbar_height_save(value);
+            },
+
+            // 协议事件
+            agreement_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value == null) {
+                    app.globalData.showToast(this.$t('login.login.4wc3hr'));
+                    return false;
+                }
+                // 是否存在协议 url 地址
+                var key = 'agreement_' + value + '_url';
+                var url = app.globalData.get_config('config.' + key) || null;
+                if (url == null) {
+                    app.globalData.showToast(this.$t('login.login.x0nxxf'));
+                    return false;
+                }
+                // 打开 webview
+                app.globalData.open_web_view(url);
+            },
+
+            // 授权回调
+            agree_privacy_auth_event() {
+                this.setData({
+                    is_show_privacy: false
+                });
+            },
+
+            // 退出小程序
+            exit_event(e) {
+                uni.exitMiniProgram();
+            },
+        }
+    };
+</script>
+<style scoped>
+    .agreement-page {
+        background-color: rgba(0, 0, 0, 0.6);
+        height: 100vh;
+        padding: 40rpx;
+    }
+    .agreement-content {
+        padding: 40rpx;
+        position: absolute;
+        top: 15%;
+        width: calc(100% - 160rpx);
+    }
+    .agreement-content .logo {
+        width: 160rpx;
+        height: 160rpx;
+    }
+    .agreement-content .content-desc {
+        line-height: 46rpx;
+        max-height: calc(30vh);
+        overflow-y: auto;
+    }
+    .agreement-content .buttom .btn {
+        min-width: 200rpx;
+    }
+</style>
\ No newline at end of file
diff --git a/components/copyright/copyright.vue b/components/copyright/copyright.vue
new file mode 100644
index 0000000..0e77343
--- /dev/null
+++ b/components/copyright/copyright.vue
@@ -0,0 +1,33 @@
+<template>
+    <view :class="theme_view">
+        <view class="copyright">
+            <view class="text">{{application_title}} {{version}}</view>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                application_title: app.globalData.get_application_title(),
+                version: app.globalData.data.version
+            };
+        },
+        components: {},
+        props: {},
+        methods: {}
+    };
+</script>
+<style>
+    .copyright {
+        color: #cfcfcf;
+        text-align: center;
+        padding: 20rpx 0;
+    }
+    .copyright .text {
+        font-size: 26rpx;
+        font-weight: 400;
+    }
+</style>
\ No newline at end of file
diff --git a/components/countdown/countdown.vue b/components/countdown/countdown.vue
new file mode 100644
index 0000000..bc48bde
--- /dev/null
+++ b/components/countdown/countdown.vue
@@ -0,0 +1,211 @@
+<template>
+    <view :class="theme_view">
+        <view class="countdown" v-if="is_show && !is_end">
+            <block v-if="propMsecShow">
+                <view class="fr time" :style="time_style">{{ msec }}</view>
+                <view class="fr ds" :style="ds_style">{{ propSecondDs }}</view>
+            </block>
+            <view class="fr time" :style="time_style">{{ second }}</view>
+            <view class="fr ds" :style="ds_style">{{ propMinuteDs }}</view>
+            <view class="fr time" :style="time_style">{{ minute }}</view>
+            <view class="fr ds" :style="ds_style">{{ propHourDs }}</view>
+            <view class="fr time" :style="time_style">{{ hour }}</view>
+        </view>
+        <view v-if="is_show && is_end" class="timer-title">{{ propMsg || this.$t('index.index.443683') }}</view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                hour: '00',
+                minute: '00',
+                second: '00',
+                msec: 0,
+                is_show: true,
+                is_end: false,
+                timer: null,
+                timers: null,
+            };
+        },
+        components: {},
+        props: {
+            propHour: {
+                type: [String, Number],
+                default: '00',
+            },
+            propMinute: {
+                type: [String, Number],
+                default: '00',
+            },
+            propSecond: {
+                type: [String, Number],
+                default: '00',
+            },
+            propEndShow: {
+                type: Boolean,
+                default: false,
+            },
+            propMsecShow: {
+                type: Boolean,
+                default: false,
+            },
+            propMsg: {
+                type: String,
+                default: '',
+            },
+            propHourDs: {
+                type: String,
+                default: ':',
+            },
+            propMinuteDs: {
+                type: String,
+                default: ':',
+            },
+            propSecondDs: {
+                type: String,
+                default: ':',
+            },
+            propTimePadding: {
+                type: [Number, String],
+                default: 0,
+            },
+            propTimeSize: {
+                type: [Number, String],
+                default: 24,
+            },
+            propTimeBackgroundColor: {
+                type: String,
+                default: 'linear-gradient(180deg, #FF601B 0%, #FE1B33 100%);',
+            },
+            propTimeColor: {
+                type: String,
+                default: '#FFF',
+            },
+            propTimeWeight: {
+                type: [Number, String],
+                default: '400',
+            },
+            propDsColor: {
+                type: String,
+                default: '#4B5459',
+            },
+            propDsSize: {
+                type: [Number, String],
+                default: 24,
+            },
+            propDsWeight: {
+                type: [Number, String],
+                default: '400',
+            },
+        },
+        computed: {
+            time_style() {
+                return 'padding: 0 ' + this.propTimePadding + 'rpx;background:' + this.propTimeBackgroundColor + ';color:' + this.propTimeColor + ';font-size:' + this.propTimeSize + 'rpx;font-weight:' + this.propTimeWeight;
+            },
+            ds_style() {
+                return 'color:' + this.propDsColor + ';font-size:' + this.propDsSize + 'rpx;font-weight:' + this.propDsWeight;
+            },
+        },
+        created: function (e) {
+            // 参数处理
+            this.hour = this.propHour;
+            this.minute = this.propMinute;
+            this.second = this.propSecond;
+
+            // 定时处理
+            this.countdown();
+        },
+        // #ifndef VUE2
+        destroyed() {
+            clearInterval(this.timer);
+            clearInterval(this.timers);
+        },
+        // #endif
+        // #ifdef VUE3
+        unmounted() {
+            clearInterval(this.timer);
+            clearInterval(this.timers);
+        },
+        // #endif
+        methods: {
+            // 倒计时处理
+            countdown() {
+                // 销毁之前的任务
+                clearInterval(this.timer);
+                clearInterval(this.timers);
+
+                // 秒
+                var self = this;
+                var hour = parseInt(self.hour);
+                var minute = parseInt(self.minute);
+                var second = parseInt(self.second);
+                self.timer = setInterval(function () {
+                    if (second <= 0) {
+                        if (minute > 0) {
+                            minute--;
+                            second = 59;
+                        } else if (hour > 0) {
+                            hour--;
+                            minute = 59;
+                            second = 59;
+                        }
+                    } else {
+                        second--;
+                    }
+
+                    self.hour = hour < 10 ? '0' + hour : hour;
+                    self.minute = minute < 10 ? '0' + minute : minute;
+                    self.second = second < 10 ? '0' + second : second;
+                    if (self.propHour <= 0 && self.propMinute <= 0 && self.propSecond <= 0) {
+                        // 停止时间
+                        clearInterval(self.timer);
+                        clearInterval(self.timers);
+                        self.is_end = true;
+
+                        // 活动已结束、是否结束还展示
+                        if (!self.propEndShow) {
+                            self.is_show = false;
+                        }
+                    }
+                }, 1000);
+
+                // 毫秒
+                var count = 0;
+                self.timers = setInterval(function () {
+                    count++;
+                    self.msec = count;
+                    if (count > 9) {
+                        count = 0;
+                    }
+                    if (!self.is_show) {
+                        clearInterval(self.timers);
+                    }
+                }, 100);
+            },
+        },
+    };
+</script>
+<style scoped>
+    .countdown {
+        line-height: 38rpx;
+    }
+    .countdown .timer-title {
+        color: #666;
+        margin-right: 10rpx;
+    }
+    .countdown .time {
+        padding: 0;
+        -moz-border-radius: 8rpx;
+        border-radius: 8rpx;
+        color: #fff;
+        min-width: 40rpx;
+        text-align: center;
+    }
+    .countdown .ds {
+        color: #4b5459;
+        padding: 0 8rpx;
+    }
+</style>
diff --git a/components/coupon-card/coupon-card.vue b/components/coupon-card/coupon-card.vue
new file mode 100644
index 0000000..70d70f8
--- /dev/null
+++ b/components/coupon-card/coupon-card.vue
@@ -0,0 +1,230 @@
+<template>
+    <view :class="theme_view">
+        <view class="padding-bottom padding-horizontal-main">
+            <view class="coupon-card oh pr flex-row">
+                <view class="card-left flex-col jc-sa align-c" :class="propStatusType > 3 ? 'failure cr-grey-9' : 'cr-white'">
+                    <view class="price">
+                        <text v-if="propData.type == '0'" class="symbol text-size">{{ currency_symbol }}</text>
+                        <text class="num text-size-xxl">{{ propData.discount_value }}</text>
+                        <text v-if="propData.type !== '0'" class="unit text-size-md">{{ propData.type_unit }}</text>
+                    </view>
+                    <text v-if="(propData.desc || null) != null" class="desc text-size-xs single-text">{{ propData.desc }}</text>
+                </view>
+                <view class="card-right flex-1 flex-width flex-row jc-sb align-c" :class="propStatusType > 3 ? 'failure cr-grey-9' : ''">
+                    <view class="card-info flex-1 flex-width padding-right-main" :class="propStatusType > 3 ? 'failure cr-grey-9' : 'cr-black'">
+                        <view class="title text-size-lg single-text" :class="propData.time_start">{{ propData.use_limit_type_name }}</view>
+                        <view v-if="propStartTime && propEndTime" class="date text-size-xs cr-grey-9 single-text padding-top-sm">{{ propStartTime }}-{{ propEndTime }}</view>
+                        <view v-if="propIsProgress && propData.process_data" class="progress padding-top-sm flex-row align-c">
+                            <block v-if="propData.process_data.type == 0">
+                                <text class="text-size-xs cr-grey-9"> {{ propData.process_data.msg }} </text>
+                            </block>
+                            <block v-else>
+                                <progress class="flex-1" :percent="propData.process_data.value" stroke-width="6" activeColor="#FF7004" backgroundColor="#fff" border-radius="3" />
+                                <view class="percent text-size-xss cr-grey-9 padding-left-main"> {{ propData.process_data.msg }} </view>
+                            </block>
+                        </view>
+                        <view v-if="propData.expire_tips" class="padding-top-sm text-size-xs cr-red">{{ propData.expire_tips }}</view>
+                    </view>
+                    <view class="card-type">
+                        <!-- 按钮状态 0-领取，1-已领取，2-已抢完，3-去使用,4-已使用，5-已过期 -->
+                        <view v-if="propStatusType == 0" class="card-btn dis-inline-block cr-white" @tap="receive">{{ propStatusOperableName || this.$t('coupon-card.coupon-card.m9316y') }}</view>
+                        <view v-else-if="propStatusType == 1" class="card-btn dis-inline-block cr-red br-red received">{{ propStatusOperableName || this.$t('coupon-card.coupon-card.m9316y') }}</view>
+                        <view v-else-if="propStatusType == 2" class="card-btn dis-inline-block cr-white robbed">{{ propStatusOperableName || this.$t('coupon-card.coupon-card.m9316y') }}</view>
+                        <view v-else-if="propStatusType == 3" :data-value="home_page_url" @tap="url_event" class="cp">
+                            <view class="card-btn dis-inline-block cr-white">
+                                {{ propStatusOperableName || this.$t('coupon-card.coupon-card.m9316y') }}
+                            </view>
+                        </view>
+                        <view v-else-if="propStatusType == 4" class="card-image pa top-0 right-0">
+                            <image class="image" :src="coupon_static_url + 'coupon-used.png'" mode="scaleToFill"></image>
+                        </view>
+                        <view v-else-if="propStatusType == 5" class="card-image pa top-0 right-0">
+                            <image class="image" :src="coupon_static_url + 'coupon-expire.png'" mode="scaleToFill"></image>
+                        </view>
+                        <view v-else @tap="receive">{{$t('coupon-card.coupon-card.j318xx')}}</view>
+                    </view>
+                </view>
+                <view class="card-circle-top" :style="{ background: `${propBg}` }"></view>
+                <view class="card-circle-bottom" :style="{ background: `${propBg}` }"></view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    var coupon_static_url = app.globalData.get_static_url('coupon', true);
+    var tabbar_pages = app.globalData.app_tabbar_pages();
+    export default {
+        name: 'coupon-card',
+        props: {
+            propData: {
+                type: Object,
+                default: () => {
+                    return {
+                        // id: "0",
+                        // // 领取数量
+                        // already_send_count: 0,
+                        // // 总数
+                        // process_data: {
+                        //     type: 1, // 0 无限制
+                        //     value: 20,
+                        //     msg: "已领20%",
+                        // },
+                        // // 日期有效日期 // 2023.08.30-2023.09.1
+                        // date: "",
+                        // expire_tips: "",
+                        // time_start: "",
+                        // time_end: "",
+                    };
+                },
+            },
+            // 监听
+            propRandom: {
+                type: Number,
+                default: 0,
+            },
+            // 半圆背景
+            propBg: {
+                type: String,
+                default: '#fff',
+            },
+            // 进度条
+            propIsProgress: {
+                type: Boolean,
+                default: false,
+            },
+            // 是否可重复领取
+            propRepeatedClaim: {
+                type: Boolean,
+                default: false,
+            },
+            // 是否可点击
+            propDisabled: {
+                type: Boolean,
+                default: false,
+            },
+            // 下标
+            propIndex: {
+                type: [Number,String],
+                default: 0,
+            },
+            // 按钮状态 0-领取，1-已领取，2-已抢完，3-去使用,4-已使用，5-已过期
+            propStatusType: {
+                type: Number,
+                default: 0,
+            },
+            // 按钮名称： 领取 已领取 已抢完 去使用
+            propStatusOperableName: {
+                type: String,
+                default: '',
+            },
+            // 优惠券有效期
+            propStartTime:{
+                type: String,
+                default: '',
+            },
+            propEndTime:{
+                type: String,
+                default: '',
+            }
+        },
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                coupon_static_url: coupon_static_url + 'app/',
+                // 符号
+                currency_symbol: app.globalData.currency_symbol(),
+                // 首页地址
+                home_page_url: tabbar_pages[0],
+            };
+        },
+        methods: {
+            // 领取
+            receive(e) {
+                this.$emit('call-back', this.propIndex, this.propData.id);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+
+<style scoped>
+    .coupon-card {
+        border-radius: 24rpx;
+        height: 208rpx;
+    }
+
+    .card-left {
+        width: 176rpx;
+        padding: 24rpx 12rpx;
+        background: linear-gradient(95deg, #ff994b 0%, #ff6e00 100%);
+    }
+
+    .card-left.failure {
+        background: linear-gradient(95deg, #eeeeee 0%, #fafafa 100%);
+    }
+
+    .card-right {
+        padding: 32rpx 24rpx 32rpx 46rpx;
+        background-color: #ffe4d1;
+    }
+
+    .card-right.failure {
+        background: linear-gradient(95deg, #f8f8f8 0%, #e0dede 100%);
+    }
+
+    .card-info.failure {
+        padding-right: 116rpx;
+    }
+
+    .card-btn {
+        width: 116rpx;
+        text-align: center;
+        padding: 6rpx 0;
+        background: linear-gradient(93deg, #ff9747 0%, #ff6e01 100%);
+        border-radius: 13px;
+    }
+
+    .robbed {
+        background: #fbd3b7;
+    }
+
+    .received {
+        border-radius: 13px;
+        background: transparent;
+    }
+
+    ::v-deep .uni-progress-bar,
+    ::v-deep .uni-progress-inner-bar {
+        border-radius: 6rpx;
+    }
+
+    .card-circle-top,
+    .card-circle-bottom {
+        width: 40rpx;
+        height: 40rpx;
+        background-color: #fff;
+        border-radius: 50%;
+        position: absolute;
+        left: 180rpx;
+        z-index: 1;
+    }
+
+    .card-circle-top {
+        top: -20rpx;
+    }
+
+    .card-circle-bottom {
+        bottom: -20rpx;
+    }
+
+    .card-image .image {
+        width: 136rpx;
+        height: 108rpx;
+    }
+</style>
diff --git a/components/diy/article-list.vue b/components/diy/article-list.vue
new file mode 100644
index 0000000..7784af4
--- /dev/null
+++ b/components/diy/article-list.vue
@@ -0,0 +1,430 @@
+<template>
+    <!-- 文章列表 -->
+    <view class="oh" :style="style_container">
+        <view class="oh" :style="style_img_container">
+            <view class="pr oh" :style="style">
+                <view v-if="!['4'].includes(article_theme)" class="flex-wrap" :class="article_theme_class" :style="article_theme !== '3' ? article_spacing : ''">
+                    <view v-for="(item, index) in data_list" :key="index" class="item oh" :style="article_style" :data-value="item.data.url" @tap="url_event">
+                        <view :class="article_theme == '0' ? 'flex-row oh' : 'flex-col oh ht-auto'" :style="article_img_style">
+                            <template v-if="article_theme !== '3'">
+                                <view class="oh pr flex-row">
+                                    <template v-if="item.new_cover.length > 0">
+                                        <image :src="item.new_cover[0].url" class="img" :style="img_radius + img_size" mode="aspectFill" />
+                                    </template>
+                                    <template v-else>
+                                        <image :src="item.data.cover" class="img" :style="img_radius + img_size" mode="aspectFill" />
+                                    </template>
+                                    <!-- 角标 -->
+                                    <subscriptIndex :propValue="propValue"></subscriptIndex>
+                                </view>
+                            </template>
+                            <view v-if="field_show.includes('0') || field_show.includes('1') || field_show.includes('2') || field_show.includes('3')" class="jc-sb flex-1" :class="article_theme == '3' ? 'flex-row align-c' : 'flex-col'" :style="article_theme !== '0' ? content_padding : ''">
+                                <view class="flex-col" :class="article_theme == '3' ? 'flex-1 flex-width' : ''" :style="'gap:' + name_desc_space + 'px;'">
+                                    <view v-if="field_show.includes('3')" class="title" :class="article_theme == '3' ? 'text-line-1' : 'text-line-2'" :style="article_name">{{ item.new_title ? item.new_title : item.data.title }}</view>
+                                    <view v-if="field_show.includes('2')" :class="'desc ' + field_desc_row == '2' ? 'text-line-2' : 'text-line-1'" :style="article_desc">{{ item.data.describe || '' }}</view>
+                                </view>
+                                <view class="flex-row jc-sb gap-8" :class="article_theme == '3' ? 'margin-left' : 'align-e margin-top'">
+                                    <view :style="article_date">{{ field_show.includes('0') ? item.data.add_time : '' }}</view>
+                                    <view v-show="field_show.includes('1')" class="flex-row align-c gap-3" :style="article_page_view">
+                                        <iconfont name="icon-eye" propContainerDisplay="flex"></iconfont>
+                                        <view>
+                                            {{ item.data.access_count ? item.data.access_count : '' }}
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <view v-else class="oh" :class="article_theme_class">
+                    <swiper class="swiper" circular :autoplay="is_roll ? true : false" :interval="interval_time" :next-margin="next_margin" :display-multiple-items="slides_per_group" :style="'height:' + carousel_height_computer">
+                        <swiper-item v-for="(item1, index1) in article_carousel_list" :key="index1">
+                            <view class="flex-row ht-auto" :style="article_spacing">
+                                <view v-for="(item, index) in item1.carousel_list" :key="index" class="item oh ht-auto" :style="article_style" :data-value="item.data.url" @tap="url_event">
+                                    <view class="oh flex-col ht-auto" :style="article_img_style">
+                                        <view class="oh pr wh-auto ht-auto flex-row">
+                                            <template v-if="item.new_cover.length > 0">
+                                                <image :src="item.new_cover[0].url" class="img" :style="img_radius + 'height:100%;'" mode="aspectFill" />
+                                            </template>
+                                            <template v-else>
+                                                <image :src="item.data.cover" class="img" :style="img_radius + 'height:100%;'" mode="aspectFill" />
+                                            </template>
+                                            <template v-if="field_show.includes('3') && name_float == '1'">
+                                                <view class="text-line-1" :style="article_name + float_name_style">{{ item.new_title ? item.new_title : item.data.title }}</view>
+                                            </template>
+                                            <!-- 角标 -->
+                                            <subscriptIndex :propValue="propValue"></subscriptIndex>
+                                        </view>
+                                        <view v-if="field_show.includes('0') || field_show.includes('1') || field_show.includes('2') || (field_show.includes('3') && name_float == '0')" class="jc-sb flex-1 flex-col" :style="article_theme !== '0' ? content_padding : ''">
+                                            <view class="flex-col" :style="'gap:' + name_desc_space + 'px;'">
+                                                <view v-if="field_show.includes('3') && name_float == '0'" class="title text-line-2" :style="article_name + article_name_height_computer">{{ item.new_title ? item.new_title : item.data.title }}</view>
+                                                <view v-if="field_show.includes('2')" :class="'desc ' + field_desc_row == '2' ? 'text-line-2' : 'text-line-1'" :style="article_desc">{{ item.data.describe || '' }}</view>
+                                            </view>
+                                            <view :class="'flex-row jc-sb gap-8 align-e' + ((field_show.includes('3') && name_float == '0') || field_show.includes('2') ? ' margin-top' : '')">
+                                                <view :style="article_date">{{ field_show.includes('0') ? item.data.add_time : '' }}</view>
+                                                <view v-show="field_show.includes('1')" class="flex-row align-c gap-3" :style="article_page_view">
+                                                    <iconfont name="icon-eye" propContainerDisplay="flex"></iconfont>
+                                                    <view>
+                                                        {{ item.data.access_count ? item.data.access_count : '' }}
+                                                    </view>
+                                                </view>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                        </swiper-item>
+                    </swiper>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import { isEmpty, common_styles_computer, common_img_computer, padding_computer, radius_computer, get_math, gradient_handle, background_computer, gradient_computer, margin_computer, box_shadow_computer, border_computer, old_margin } from '@/common/js/common/common.js';
+    import subscriptIndex from '@/components/diy/modules/subscript/index.vue';
+    var system = app.globalData.get_system_info(null, null, true);
+    var sys_width = app.globalData.window_width_handle(system.windowWidth);
+    export default {
+        components: {
+            subscriptIndex,
+        },
+        props: {
+            propValue: {
+                type: Object,
+                default: () => {},
+            },
+            // 是否使用公共样式
+            propIsCommonStyle: {
+                type: Boolean,
+                default: true,
+            },
+            // 关键key
+            propKey: {
+                type: [String, Number],
+                default: '',
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 1000000,
+            },
+        },
+        data() {
+            return {
+                style_container: '',
+                style_img_container: '',
+                style: '',
+                // 数据
+                data_list: [],
+                // 风格
+                article_theme: '0',
+
+                // 是否显示
+                field_show: ['0', '1'],
+                // 文章
+                article_name: '',
+                // 描述
+                article_desc: '',
+                // 日期
+                article_date: '',
+                // 浏览量
+                article_page_view: '',
+                // 内容圆角
+                content_radius: '',
+                // 图片圆角
+                img_radius: '',
+                // 内间距
+                content_padding: '',
+                // 内容间距
+                content_spacing: '',
+                // 文章间距
+                article_spacing: '',
+                // article_item_height: '',
+
+                article_style: '',
+                article_img_style: '',
+                // 轮播图定时轮播
+                interval_time: 2000,
+                // 轮播图是否滚动
+                is_roll: 1,
+
+                article_theme_class: '',
+                // 轮播高度
+                carousel_height_computer: '',
+                // 文章内容高度
+                article_name_height_computer: '',
+                // 文章名称浮动样式
+                float_name_style: '',
+                name_float: '0',
+                // 图片大小
+                img_size: '',
+                // 文章轮播数据
+                article_carousel_list: [],
+                // 文章描述间距
+                name_desc_space: 0,
+                // 一行显示的数量
+                slides_per_group: 1,
+                next_margin: '0rpx',
+                field_desc_row: '1',
+            };
+        },
+        watch: {
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        created() {
+            this.init();
+        },
+        methods: {
+            // 初始化数据
+            init() {
+                const new_content = this.propValue.content || {};
+                const new_style = this.propValue.style || {};
+                // 描述样式
+                const desc_size = new_style.desc_size;
+                let desc_style = 'font-size:' + desc_size + 'px;line-height:' + desc_size + 'px;height:' + desc_size + 'px;color:' + new_style.desc_color + ';';
+                if (new_content.field_desc_row == '2') {
+                    desc_style = 'font-size:' + desc_size + 'px;line-height:' + (desc_size > 0 ? desc_size + 3 : 0 ) + 'px;height:'+ (desc_size > 0 ? (desc_size + 3) * 2 : 0) + 'px;color:' + new_style.desc_color + ';';
+                }
+                this.setData({
+                    field_desc_row: new_content.field_desc_row,
+                    name_float: !isEmpty(new_content.name_float) ? new_content.name_float : '0',
+                    // 判断是自动还是手动
+                    data_list:
+                        new_content.data_type == '0'
+                            ? new_content.data_list
+                            : new_content.data_auto_list && new_content.data_auto_list.length > 0
+                            ? new_content.data_auto_list.map((item) => ({
+                                  id: get_math(),
+                                  new_title: '',
+                                  new_cover: [],
+                                  data: item,
+                              }))
+                            : [],
+                    article_theme_class: this.article_theme_class_computer(new_content.theme),
+                    article_theme: new_content.theme,
+                    field_show: new_content.field_show,
+                    // 样式
+                    article_name: 'font-size:' + new_style.name_size + 'px;' + 'font-weight:' + new_style.name_weight + ';' + 'color:' + new_style.name_color + ';',
+                    article_desc: desc_style,
+                    article_date: 'font-size:' + new_style.time_size + 'px;' + 'font-weight:' + new_style.time_weight + ';' + 'color:' + new_style.time_color + ';',
+                    article_page_view: 'font-size:' + new_style.page_view_size + 'px;' + 'font-weight:' + new_style.page_view_weight + ';' + 'color:' + new_style.page_view_color + ';',
+                    content_radius: radius_computer(new_style.content_radius),
+                    img_radius: radius_computer(new_style.img_radius),
+                    // 内间距
+                    content_padding: padding_computer(new_style.padding),
+                    // 内容间距
+                    content_spacing: `gap: ${new_style.content_spacing}px;`,
+                    // 文章间距
+                    article_spacing: `gap: ${new_style.article_spacing}px;`,
+                    // 描述间距
+                    name_desc_space: parseInt(new_style.name_desc_space),
+                    next_margin: new_style.rolling_fashion == 'translation' ? '-' + new_style.article_spacing_margin + 'px' : '0rpx',
+                    // 文章内容高度
+                    slides_per_group: new_style.rolling_fashion == 'translation' ?  Number(new_content.carousel_col) + 1 : 1,
+
+                });
+                // 默认数据
+                const product_style_list = [
+                    { name: '单列展示', value: '0', width:110, height: 83 },
+                    { name: '两列展示（纵向）', value: '1', width:180, height: 180 },
+                    { name: '大图展示', value: '2', width:0, height: 180 },
+                    { name: '无图模式', value: '3', width:0, height: 0 },
+                    { name: '左右滑动展示', value: '4', width:0, height: 0 },
+                ];
+                const scale = sys_width / 390;
+                let img_style = ``;
+                if (['0'].includes(new_content.theme)) {
+                    // 图片宽度
+                    if (typeof new_style.content_img_width == 'number') {
+                        img_style += `width: ${ new_style.content_img_width * scale }px;`;
+                    } else {
+                        const list = product_style_list.filter(item => item.value == new_content.theme);
+                        if (list.length > 0) {
+                            img_style += `width: ${ list[0].width * scale }px;`;
+                        } else {
+                            img_style += 'width: auto;';
+                        }
+                    }
+                }
+                if (!['3', '4'].includes(new_content.theme)) {
+                    // 图片宽度
+                    if (typeof new_style.content_img_height == 'number') {
+                        img_style += `height: ${ new_style.content_img_height * scale }px;`;
+                    } else {
+                        const list = product_style_list.filter(item => item.value == new_content.theme);
+                        if (list.length > 0) {
+                            img_style += `height: ${ list[0].height * scale }px;`;
+                        } else {
+                            img_style += 'height: auto;';
+                        }
+                    }
+                }
+                // 背景图的处理
+                const article_data = {
+                    background_img_style: new_style?.article_background_img_style || '',
+                    background_img: new_style?.article_background_img || '',
+                }
+                const article_margin = new_style.value?.margin || old_margin;
+                const margin_width = article_margin.margin_left + article_margin.margin_right;
+                // 渐变效果
+                const all_style = gradient_handle(new_style?.article_color_list || [], new_style?.article_direction || '') + margin_computer(article_margin) + box_shadow_computer(new_style) + border_computer(new_style);
+                // 文章样式
+                if (this.article_theme == '0') {
+                    this.setData({
+                        img_size: img_style,
+                        article_style:  this.content_radius + all_style,
+                        article_img_style: this.content_spacing + this.content_padding + background_computer(article_data)
+                    });
+                } else if (this.article_theme == '1') {
+                    this.setData({
+                        img_size: img_style,
+                        article_style: `width: calc(50% - ${new_style.article_spacing + (margin_width * 2) / 2}px);` + this.content_radius + all_style,
+                        article_img_style: background_computer(article_data)
+                    });
+                } else if (this.article_theme == '2') {
+                    this.setData({
+                        img_size: img_style,
+                        article_style: this.content_radius + all_style,
+                        article_img_style: background_computer(article_data)
+                    });
+                } else if (this.article_theme == '3') {
+                    this.setData({
+                        style: `padding: 0 ${new_style.content_spacing}px;background:#fff;` + this.content_radius,
+                    });
+                } else if (this.article_theme == '4') {
+                    // 更新轮播图的key，确保更换时能重新更新轮播图
+                    const temp_carousel_col = new_content.carousel_col || '1';
+                    // 计算间隔的空间。(gap * gap数量) / 模块数量
+                    let gap = temp_carousel_col !== '0' ? ((new_style.article_spacing * temp_carousel_col - 1) + (margin_width * temp_carousel_col)) / temp_carousel_col : '0';
+                    const multicolumn_columns_width = new_style.rolling_fashion == 'translation' ? `margin-right: ${ new_style.article_spacing + article_margin.margin_right }px;width:100%;` : `width:calc(${100 / (Number(temp_carousel_col) + 1)}% - ${gap * 2}rpx);min-width:calc(${100 / (Number(temp_carousel_col) + 1)}% - ${gap * 2}rpx);`;
+                    const { name_bg_color_list = [], name_bg_direction = '180deg', name_bg_radius, name_bg_padding, name_bg_margin } = new_style;
+                    const data = {
+                        color_list: name_bg_color_list,
+                        direction: name_bg_direction,
+                    }
+                    let location = 'position:absolute;bottom:0;left:0;right:0;'
+                    // 轮播宽度
+                    this.setData({
+                        // 滚动时间
+                        interval_time: (new_style.interval_time || 2) * 1000,
+                        // 是否滚动修改
+                        is_roll: new_style.is_roll,
+                        // article_item_height: `height: ${new_style.article_height }px`,
+                        article_style: this.content_radius + all_style + multicolumn_columns_width,
+                        // 轮播高度
+                        carousel_height_computer: new_style.article_height * scale + 'px',
+                        // 文章内容高度
+                        article_name_height_computer: `height:${new_style.name_size * 2.4 * 2}rpx;line-height:${new_style.name_size * 1.2 * 2}rpx;`,
+                        float_name_style: gradient_computer(data) + (!isEmpty(name_bg_radius) ? radius_computer(name_bg_radius) : '') + (!isEmpty(name_bg_padding) ? padding_computer(name_bg_padding) : '' ) + (!isEmpty(name_bg_padding) ? margin_computer(name_bg_margin) : '') + location,
+                        article_img_style: background_computer(article_data)
+                    });
+                    // 文章轮播数据
+                    const cloneList = JSON.parse(JSON.stringify(this.data_list));
+                    // 如果是分页滑动情况下，根据选择的行数和每行显示的个数来区分具体是显示多少个
+                    if (new_style.rolling_fashion != 'translation') {
+                        if (cloneList.length > 0) {
+                            // 每页显示的数量
+                            const num = Number(temp_carousel_col) + 1;
+                            // 存储数据显示
+                            let nav_list = [];
+                            // 拆分的数量
+                            const split_num = Math.ceil(cloneList.length / num);
+                            for (let i = 0; i < split_num; i++) {
+                                nav_list.push({ carousel_list: cloneList.slice(i * num, (i + 1) * num) });
+                            }
+                            this.setData({
+                                article_carousel_list: nav_list,
+                            });
+                        } else {
+                            // 否则的话，就返回全部的信息
+                            this.setData({
+                                article_carousel_list: [{ carousel_list: cloneList }],
+                            });
+                        }
+                    } else {
+                        // 存储数据显示
+                        let nav_list = [];
+                        cloneList.forEach((item) => {
+                            nav_list.push({
+                                carousel_list: [item],
+                            });
+                        });
+                        this.setData({
+                            article_carousel_list: nav_list,
+                        });
+                    }
+                }
+
+                if (this.propIsCommonStyle) {
+                    this.setData({
+                        style_container: common_styles_computer(new_style.common_style),
+                        style_img_container: common_img_computer(new_style.common_style, this.propIndex),
+                    });
+                }
+            },
+            // 文章主题样式
+            article_theme_class_computer(theme) {
+                switch (theme) {
+                    case '0':
+                        return 'style1 flex-col';
+                    case '1':
+                        return 'style2 flex-row flex-wrap';
+                    case '2':
+                        return 'style3 flex-col';
+                    case '3':
+                        return 'style4 flex-col';
+                    default:
+                        return 'style5';
+                }
+            },
+            // 跳转链接
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+        },
+    };
+</script>
+<style lang="scss" scoped>
+    .style1 {
+        .item {
+            max-width: 100%;
+        }
+    }
+    .style2 {
+        .item {
+            .img {
+                width: 100%;
+            }
+        }
+    }
+    .style3 {
+        .item {
+            width: 100%;
+            .img {
+                width: 100%;
+            }
+        }
+    }
+    .style4 {
+        .item {
+            width: 100%;
+            &:not(:last-child) {
+                border-bottom: 2rpx solid #eee;
+            }
+        }
+    }
+    .style5 {
+        .item {
+            width: 100%;
+            .img {
+                width: 100%;
+            }
+        }
+    }
+</style>
diff --git a/components/diy/article-tabs.vue b/components/diy/article-tabs.vue
new file mode 100644
index 0000000..cfc7138
--- /dev/null
+++ b/components/diy/article-tabs.vue
@@ -0,0 +1,264 @@
+<template>
+    <!-- 文章列表 -->
+    <view class="article-tabs ou" :class="'article-tabs-' + propKey" :style="style_container">
+        <view class="ou" :style="style_img_container">
+            <componentDiyModulesTabsView :propKey="propKey" :propValue="article_tabs" :propIsTop="top_up == '1'" :propTop="sticky_top" :propStyle="tabs_style" :propsTabsContainer="tabs_container" :propsTabsImgContainer="tabs_img_container" :propCustomNavHeight="propIsTabsUseSafeDistance ? (propCustomNavHeight * 2 + 'rpx') : '0rpx'" :propTabsBackground="tabs_background" :propTabsSlidingFixedBg="tabs_sliding_fixed_bg" @onTabsTap="tabs_click_event"></componentDiyModulesTabsView>
+            <view :style="article_margin_top">
+                <view :style="article_container">
+                    <view :style="article_img_container">
+                        <componentDiyArticleList :propKey="diy_key" :propValue="article_tabs" :propIsCommonStyle="false"></componentDiyArticleList>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import { common_styles_computer, common_img_computer, padding_computer, margin_computer, background_computer, gradient_computer, radius_computer, isEmpty, box_shadow_computer, border_computer, old_border_and_box_shadow, old_margin, old_padding } from '@/common/js/common/common.js';
+    import componentDiyModulesTabsView from '@/components/diy/modules/tabs-view';
+    import componentDiyArticleList from '@/components/diy/article-list'; // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        props: {
+            propValue: {
+                type: Object,
+                default: () => {},
+            },
+            // 距离顶部高度
+            propTop: {
+                type: Number,
+                default: 0,
+            },
+            // 自定义导航栏高度
+            propCustomNavHeight: {
+                type: Number,
+                default: 33,
+            },
+            // 滚动距离
+            propScrollTop: {
+                type: Number,
+                default: 0,
+            },
+            // 顶部导航是否开启沉浸模式
+            propIsImmersionModel: {
+                type: Boolean,
+                default: false,
+            },
+            propKey: {
+                type: [String, Number],
+                default: '',
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 1000000,
+            },
+            // 选项卡是否使用安全距离
+            propIsTabsUseSafeDistance: {
+                type: Boolean,
+                default: true
+            }
+        },
+        components: {
+            componentDiyModulesTabsView,
+            componentDiyArticleList,
+        },
+        data() {
+            return {
+                style_container: '',
+                style_img_container: '',
+                style: '',
+                article_tabs: {},
+                // 是否滑动置顶
+                top_up: '0',
+                tabs_style: '',
+                tabs_top: 0,
+                tabs_background: 'background:transparent',
+                custom_nav_height: 33,
+                diy_key: '',
+                // 选项卡背景设置
+                article_margin_top: '',
+                tabs_container: '',
+                tabs_img_container: '',
+                tabs_sliding_fixed_bg: '',
+                // 商品区域背景设置
+                article_container: '',
+                article_img_container: '',
+                // #ifdef MP
+                nav_safe_space: bar_height + 5,
+                // #endif
+                // #ifdef H5 || MP-TOUTIAO
+                nav_safe_space: bar_height + 7,
+                // #endif
+                // #ifdef APP
+                nav_safe_space: bar_height + 0,
+                // #endif
+                // 选项卡默认数据
+                tabs_index: 0,
+                sticky_top: 0,
+            };
+        },
+        watch: {
+            // 监听滚动距离
+            propScrollTop(newVal) {
+                if (newVal + this.sticky_top + this.custom_nav_height > this.tabs_top + this.nav_safe_space && this.top_up == '1') {
+                    let new_style = this.propValue.style || {};
+                    let tabs_bg = new_style.common_style.color_list;
+                    let new_tabs_background = '';
+                    if (tabs_bg.length > 0 && (tabs_bg[0].color || null) != null) {
+                        new_tabs_background = gradient_computer(new_style.common_style);
+                    }
+                    let new_tabs_background_img = background_computer(new_style.common_style);
+                    if (new_tabs_background_img.length > 0) {
+                        new_tabs_background_img += 'background-position: top left;';
+                    }
+                    this.tabs_background = (new_tabs_background.length > 0 ? new_tabs_background : 'background:#fff;') + new_tabs_background_img;
+                } else {
+                    this.tabs_background = 'background:transparent';
+                }
+            },
+            propTop(val) {
+                this.init();
+            },
+            propKey(val) {
+                this.setData({
+                    diy_key: val,
+                });
+                // 初始化
+                this.init();
+            },
+        },
+        created() {
+            this.init();
+        },
+        mounted() {
+            this.$nextTick(() => {
+                const self = this;
+                setTimeout(() => {
+                    self.getTop();
+                });
+                // #ifdef H5 || MP-TOUTIAO
+                // 获取自定义导航栏高度
+                this.setData({
+                    custom_nav_height: this.propCustomNavHeight,
+                });
+                // #endif
+            });
+        },
+        methods: {
+            // 初始化数据
+            init() {
+                let new_content = this.propValue.content || {};
+                let new_style = this.propValue.style || {};
+                let new_data = JSON.parse(JSON.stringify(this.propValue));
+
+                const new_tabs_data = new_data.content.tabs_list[this.tabs_index] || {};
+                new_data.content.theme = new_data.content.article_theme;
+                new_data.content.data_type = new_tabs_data.data_type;
+                new_data.content.category = new_tabs_data.category;
+                new_data.content.carousel_col = new_data.content.article_carousel_col;
+                new_data.content.data_list = new_tabs_data.data_list;
+                new_data.content.data_auto_list = new_tabs_data.data_auto_list;
+                new_data.content.data_ids = new_tabs_data.data_ids;
+                new_data.content.number = new_tabs_data.number;
+                new_data.content.sort = new_tabs_data.sort;
+                new_data.content.sort_rules = new_tabs_data.sort_rules;
+                new_data.content.field_show = new_data.content.field_show;
+                new_data.content.is_cover = new_tabs_data.is_cover;
+                // 公共样式
+                const common_style = new_style.common_style;
+                let tabs_style_obj = {
+                    padding_top: common_style.padding_top - this.propCustomNavHeight < 0 ? 0 : common_style.padding_top - this.propCustomNavHeight,
+                    padding_left: common_style.padding_left,
+                    padding_right: common_style.padding_right,
+                };
+                let new_tabs_style = padding_computer(tabs_style_obj) + margin_computer(tabs_style_obj) + `position:relative;left: -${tabs_style_obj.padding_left * 2}rpx;right: -${tabs_style_obj.padding_right * 2}rpx;width:100%;`;
+                // 如果是历史数据的话，就执行默认添加下边距
+                if (isEmpty(new_style.tabs_padding)) {
+                    new_tabs_style += 'padding-bottom: 20rpx;';
+                }
+                const { tabs_bg_color_list = [], tabs_bg_direction = '', tabs_bg_background_img_style = '', tabs_bg_background_img = [], tabs_radius = old_radius, tabs_padding = old_padding, article_content_color_list = [], article_content_direction = '', article_content_background_img_style = '', article_content_background_img = [], article_content_margin = old_margin, article_content_padding = old_padding, article_content_radius = old_radius } = new_style;
+                // 选项卡背景设置
+                const tabs_data = {
+                    color_list: tabs_bg_color_list,
+                    direction: tabs_bg_direction,
+                    background_img_style: tabs_bg_background_img_style,
+                    background_img: tabs_bg_background_img,
+                };
+                // 文章区域背景设置
+                const article_content_data = {
+                    color_list: article_content_color_list,
+                    direction: article_content_direction,
+                    background_img_style: article_content_background_img_style,
+                    background_img: article_content_background_img,
+                };
+                const article_content = new_style?.article_content || old_border_and_box_shadow;
+                const tabs_content = new_style?.tabs_content || old_border_and_box_shadow;
+                this.setData({
+                    top_up: new_content.tabs_top_up,
+                    sticky_top: this.propTop + (new_style?.tabs_margin?.margin_top || 0),
+                    article_tabs: new_data,
+                    style_container: common_styles_computer(common_style),
+                    style_img_container: common_img_computer(common_style, this.propIndex),
+                    tabs_style: new_tabs_style,
+                    article_margin_top:  'margin-top:' + (new_style?.article_content_spacing || 0) * 2 + 'rpx',
+                    tabs_sliding_fixed_bg: gradient_computer(tabs_data),
+                    tabs_container: gradient_computer(tabs_data) + radius_computer(tabs_radius) + margin_computer(new_style?.tabs_margin || old_margin) + border_computer(tabs_content) + box_shadow_computer(tabs_content) + 'overflow: hidden;',
+                    tabs_img_container: background_computer(tabs_data) + padding_computer(tabs_padding) + 'box-sizing: border-box;overflow: hidden;',
+                    article_container: gradient_computer(article_content_data) + margin_computer(article_content_margin) + radius_computer(article_content_radius) + box_shadow_computer(article_content) + border_computer(article_content) + 'overflow: hidden;',
+                    article_img_container: background_computer(article_content_data) + padding_computer(article_content_padding) + 'box-sizing: border-box;overflow: hidden;',
+                });
+            },
+            // tabs切换事件
+            tabs_click_event(index) {
+                let new_data = JSON.parse(JSON.stringify(this.propValue));
+                new_data.content.theme = new_data.content.article_theme;
+                new_data.content.data_type = new_data.content.tabs_list[index].data_type;
+                new_data.content.category = new_data.content.tabs_list[index].category;
+                new_data.content.carousel_col = new_data.content.article_carousel_col;
+                new_data.content.data_list = new_data.content.tabs_list[index].data_list;
+                new_data.content.data_auto_list = new_data.content.tabs_list[index].data_auto_list;
+                new_data.content.data_ids = new_data.content.tabs_list[index].data_ids;
+                new_data.content.number = new_data.content.tabs_list[index].number;
+                new_data.content.sort = new_data.content.tabs_list[index].sort;
+                new_data.content.sort_rules = new_data.content.tabs_list[index].sort_rules;
+                new_data.content.field_show = new_data.content.field_show;
+                new_data.content.is_cover = new_data.content.tabs_list[index].is_cover;
+                this.setData({
+                    tabs_index: index,
+                    article_tabs: new_data,
+                    diy_key: Math.random(),
+                });
+            },
+            // 获取商品距离顶部的距离
+            getTop() {
+                const query = uni.createSelectorQuery().in(this);
+                query
+                    .select('.article-tabs-' + this.propKey)
+                    .boundingClientRect((res) => {
+                        if ((res || null) != null) {
+                            let new_data = typeof this.propValue == 'string' ? JSON.parse(JSON.stringify(this.propValue)) : this.propValue;
+                            const new_style = new_data.style || {};
+                            this.setData({
+                                tabs_top: res.top - (new_style.common_style?.margin_top || 0) + (new_style?.tabs_margin?.margin_top || 0),
+                            });
+                        }
+                    })
+                    .exec();
+            },
+        },
+    };
+</script>
+<style lang="scss" scoped>
+    .tabs-container {
+        position: relative;
+        width: 100%;
+        left: 0;
+        right: 0;
+    }
+</style>
diff --git a/components/diy/auxiliary-blank.vue b/components/diy/auxiliary-blank.vue
new file mode 100644
index 0000000..973d869
--- /dev/null
+++ b/components/diy/auxiliary-blank.vue
@@ -0,0 +1,64 @@
+<template>
+    <view :style="style_container">
+        <view :style="style_img_container">
+            <view :style="style"></view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { common_styles_computer, common_img_computer } from '@/common/js/common/common.js';
+    export default {
+        props: {
+            propValue: {
+                type: Object,
+                default: () => {
+                    return {};
+                },
+            },
+            propKey: {
+                type: [String, Number],
+                default: '',
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 1000000,
+            },
+        },
+        data() {
+            return {
+                style_container: '',
+                style_img_container: '',
+                style: '',
+            };
+        },
+        watch: {
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        created() {
+            this.init();
+        },
+        methods: {
+            init() {
+                const { height } = this.propValue.content;
+                const { line_color, common_style } = this.propValue.style;
+                this.setData({
+                    style: `height: ${height * 2}rpx;background: ${line_color || 'transparent'};`,
+                    style_container: common_styles_computer(common_style),
+                    style_img_container: common_img_computer(common_style, this.propIndex),
+                });
+            },
+        },
+    };
+</script>
+
+<style scoped lang="scss">
+    .right-0 {
+        top: 50%;
+        transform: translateY(-50%);
+    }
+</style>
diff --git a/components/diy/auxiliary-line.vue b/components/diy/auxiliary-line.vue
new file mode 100644
index 0000000..b3fa1c1
--- /dev/null
+++ b/components/diy/auxiliary-line.vue
@@ -0,0 +1,64 @@
+<template>
+    <!-- 横线 -->
+    <view :style="style_container">
+        <view :style="style_img_container">
+            <view :style="style"></view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { common_styles_computer, common_img_computer } from '@/common/js/common/common.js';
+    export default {
+        props: {
+            propValue: {
+                type: Object,
+                default: () => ({}),
+            },
+            // key
+            propKey: {
+                type: [String,Number],
+                default: '',
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 1000000,
+            },
+        },
+        data() {
+            return {
+                style_container: '',
+                style_img_container: '',
+                style: '',
+            };
+        },
+        watch: {
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        created() {
+            this.init();
+        },
+        methods: {
+            // 初始化数据
+            init() {
+                const new_content = this.propValue.content || {};
+                const new_style = this.propValue.style || {};
+                // 边框设置
+                let border_content = `border-bottom-style: ${new_content?.styles || 'solid'};`;
+                // 边框颜色设置
+                let border_style = `border-bottom-width: ${new_style.line_width * 2 || 2}rpx; border-bottom-color: ${new_style.line_color || 'rgba(204, 204, 204, 1)'};`;
+                this.setData({
+                    style: border_content + border_style,
+                    style_container: common_styles_computer(new_style.common_style),
+                    style_img_container: common_img_computer(new_style.common_style, this.propIndex),
+                });
+            },
+        },
+    };
+</script>
+
+<style></style>
diff --git a/components/diy/carousel.vue b/components/diy/carousel.vue
new file mode 100644
index 0000000..e316d6c
--- /dev/null
+++ b/components/diy/carousel.vue
@@ -0,0 +1,371 @@
+<template>
+    <view class="pr" :style="style_container + swiper_bg_style">
+        <view class="pa top-0 wh-auto ht-auto" :style="swiper_bg_img_style"></view>
+        <view class="pr" :style="style_img_container + (!isEmpty(swiper_bg_img_style) ? swiper_bg_img_style_null : '')">
+            <swiper circular="true" :autoplay="form.is_roll == '1'" :interval="form.interval_time * 1000" :display-multiple-items="slides_per_group" :duration="500" :style="{ height: swiper_height }" :previous-margin="previousMargin" :next-margin="nextMargin" @change="slideChange">
+                <block v-if="form.carousel_type == 'card'">
+                    <swiper-item v-for="(item, index) in new_list" :key="index">
+                        <view class="flex-row align-c wt-auto ht-auto" :data-value="item.carousel_link.page" @tap="url_open">
+                            <view class="swiper-item" :style="img_style" :class="['scale-defalt', { 'scale-1': animationData === index }]">
+                                <view class="wh-auto ht-auto">
+                                    <imageEmpty :propImageSrc="item.carousel_img[0]" :propStyle="img_style" :propImgFit="img_fit" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
+                                </view>
+                            </view>
+                            <view v-if="new_style.video_is_show == '1' && item.carousel_video.length > 0" :class="{ 'x-middle': new_style.video_location == 'center', 'right-0': new_style.video_location == 'flex-end' }" class="video-class pa oh" :style="{'bottom': new_style.video_bottom * 2 + 'rpx'}">
+                                <view class="flex-row gap-5 align-c" :style="video_style" :data-value="item.carousel_video" @tap.stop="video_play">
+                                    <block v-if="new_style.video_type == 'img'">
+                                        <view class="video_img">
+                                            <imageEmpty :propImageSrc="new_style.video_img[0]" propImgFit="aspectFill" propErrorStyle="width: 28rpx;height: 28rpx;"></imageEmpty>
+                                        </view>
+                                    </block>
+                                    <block v-else>
+                                        <iconfont :name="!isEmpty(new_style.video_icon_class) ? 'icon-' + new_style.video_icon_class : 'icon-bofang'" size="'28rpx'" :color="new_style.video_icon_color" propContainerDisplay="flex"></iconfont>
+                                    </block>
+                                    <text v-if="!isEmpty(item.video_title)" :style="{ color: new_style.video_title_color, 'font-size': new_style.video_title_size * 2 + 'rpx', 'text-wrap': 'nowrap' }">{{ item.video_title }}</text>
+                                </view>
+                            </view>
+                        </view>
+                    </swiper-item>
+                </block>
+                <block v-else>
+                    <swiper-item v-for="(item, index) in new_list" :key="index">
+                        <view class="ht-auto" :style="['oneDragOne', 'twoDragOne'].includes(form.carousel_type) ? 'padding-right:' + new_style.image_spacing * 2 + 'rpx;' : ''" :data-value="item.carousel_link.page" @tap="url_open">
+                            <view class="wh-auto ht-auto pr" :style="img_style">
+                                <imageEmpty :propImageSrc="item.carousel_img[0]" :propStyle="img_style" :propImgFit="img_fit" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
+                            </view>
+                            <view v-if="new_style.video_is_show == '1' && item.carousel_video.length > 0" :class="{ 'x-middle': new_style.video_location == 'center', 'right-0': new_style.video_location == 'flex-end' }" class="video-class pa oh" :style="{'bottom': new_style.video_bottom * 2 + 'rpx'}">
+                                <view class="flex-row gap-5 align-c" :style="video_style" :data-value="item.carousel_video" @tap.stop="video_play">
+                                    <block v-if="new_style.video_type == 'img'">
+                                        <view class="video_img">
+                                            <imageEmpty :propImageSrc="new_style.video_img[0]" propImgFit="aspectFill" propErrorStyle="width: 28rpx;height: 28rpx;"></imageEmpty>
+                                        </view>
+                                    </block>
+                                    <block v-else>
+                                        <iconfont :name="!isEmpty(new_style.video_icon_class) ? 'icon-' + new_style.video_icon_class : 'icon-bofang'" size="'28rpx'" :color="new_style.video_icon_color" propContainerDisplay="flex"></iconfont>
+                                    </block>
+                                    <text v-if="!isEmpty(item.video_title)" :style="{ color: new_style.video_title_color, 'font-size': new_style.video_title_size * 2 + 'rpx', 'text-wrap': 'nowrap' }">{{ item.video_title }}</text>
+                                </view>
+                            </view>
+                        </view>
+                    </swiper-item>
+                </block>
+            </swiper>
+            <view v-if="new_style.is_show == '1'" :class="['left', 'right'].includes(new_style.indicator_new_location) ? 'indicator_up_down_location' : 'indicator_about_location'" :style="indicator_location_style">
+                <template v-if="new_style.indicator_style == 'num'">
+                    <view :style="indicator_style" class="dot-item">
+                        <text :style="{ color: new_style.actived_color }">{{ actived_index + 1 }}</text>
+                        <text>/{{ form.carousel_list.length }}</text>
+                    </view>
+                </template>
+                <template v-else>
+                    <view v-for="(item, index2) in form.carousel_list" :key="index2" :style="indicator_style + (actived_index == index2 ? 'background:' + new_style.actived_color : '')" class="dot-item" />
+                </template>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import { common_styles_computer, common_img_computer, radius_computer, isEmpty, gradient_computer, padding_computer, get_indicator_location_style, get_indicator_style, background_computer } from '@/common/js/common/common.js';
+    import imageEmpty from '@/components/diy/modules/image-empty.vue';
+    var system = app.globalData.get_system_info(null, null, true);
+    var sys_width = app.globalData.window_width_handle(system.windowWidth);
+    export default {
+        components: {
+            imageEmpty,
+        },
+        props: {
+            propValue: {
+                type: Object,
+                default: () => {
+                    return {};
+                },
+            },
+            propIsCommon: {
+                type: Boolean,
+                default: true,
+            },
+            propKey: {
+                type: [String,Number],
+                default: '',
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 1000000,
+            },
+            propOuterContainerPadding: {
+                type: Number,
+                default: 0,
+            }
+        },
+        data() {
+            return {
+                form: {},
+                new_style: {},
+                // 通用样式显示
+                style_container: '',
+                style_img_container: '',
+                // 图片的设置
+                img_style: '',
+                // 指示器的样式
+                indicator_style: '',
+                seat_list: [],
+                new_list: [],
+                // 指示器选中的位置
+                actived_index: 0,
+                interval_types: '',
+                img_fit: '',
+                dot_style: '',
+                video_style: '',
+                popup_width: '0rpx',
+                popup_height: '0rpx',
+                // 样式二的处理
+                animation: '',
+                animationData: 0,
+                previousMargin: '0rpx',
+                nextMargin: '0rpx',
+                slides_per_group: 1,
+                // hackReset: true,
+                // 轮播图的高度
+                swiper_height: 50,
+                // 轮播时的背景样式
+                swiper_bg_style: '',
+                swiper_bg_img_style: '',
+                swiper_bg_img_style_null: `background-image: url('')`
+            };
+        },
+        watch: {
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        created() {
+            this.init();
+        },
+        methods: {
+            isEmpty,
+            init() {
+                const new_form = this.propValue.content;
+                const new_style = this.propValue.style;
+                // 获取当前手机的宽度
+                const { windowWidth } = uni.getSystemInfoSync();
+                // 将80%的宽度分成16份
+                const block = (windowWidth * 0.8) / 16;
+
+                const { common_style, actived_color } = new_style;
+                // scaleToFill 对应 fill aspectFit 对应 contain  aspectFill 对应 cover
+                let fit = '';
+                if (new_form.img_fit == 'contain') {
+                    fit = 'aspectFit';
+                } else if (new_form.img_fit == 'fill') {
+                    fit = 'scaleToFill';
+                } else if (new_form.img_fit == 'cover') {
+                    fit = 'aspectFill';
+                }
+                const { margin_left, margin_right, padding_left, padding_right } = new_style.common_style;
+                const width = sys_width - margin_left - margin_right - padding_left - padding_right - this.propOuterContainerPadding;
+                const scale = width / 390;
+                this.setData({
+                    form: new_form,
+                    new_style: new_style,
+                    seat_list: this.get_seat_list(new_form),
+                    new_list: new_form.carousel_list.concat(this.get_seat_list(new_form)),
+                    popup_width: block * 16 * 2 + 'rpx', // 视频的宽度，依照16:9比例来算
+                    popup_height: block * 9 * 2 + 'rpx',  // 视频的高度
+                    style_container: this.propIsCommon ? common_styles_computer(common_style) : '', // 公共样式显示
+                    style_img_container: this.propIsCommon ? common_img_computer(common_style, this.propIndex) : '', // 公共样式显示
+                    img_style: radius_computer(new_style), // 图片的设置
+                    indicator_style: get_indicator_style(new_style), // 指示器的样式
+                    indicator_location_style: get_indicator_location_style(new_style),
+                    dot_style: `bottom: ${ new_style.indicator_bottom * scale }px;`, // 指示器位置
+                    img_fit: fit, // 图片风格 默认为aspectFill
+                    video_style: this.get_video_style(new_style), // 视频播放按钮显示逻辑   
+                    swiper_height: new_form.height * scale + 'px', // 轮播图高度
+                    swiper_bg_style: this.get_swiper_bg_style(new_form, 0),
+                    swiper_bg_img_style: this.get_swiper_bg_img_style(new_form, 0),
+                });
+                // 风格二显示逻辑
+                if (new_form.carousel_type == 'card') {
+                    // this.$nextTick(() => {
+                        this.setData({
+                            previousMargin: '41px',
+                            nextMargin: '41px',
+                            animationData: 0,
+                        });
+                    // });
+                } else if (new_form.carousel_type != 'inherit') {
+                    // 风格三，四显示逻辑
+                    // this.$nextTick(() => {
+                        this.setData({
+                            nextMargin: '50px',
+                            slides_per_group: new_form.carousel_type == 'twoDragOne' ? 2 : 1,
+                        });
+                    // });
+                }
+            },
+            get_swiper_bg_style(form, actived_index) {
+                if (!this.propIsCommon) {
+                    return '';
+                }
+                const style = form?.carousel_list?.[actived_index]?.style;
+                if (style && !isEmpty(style.color_list)) {
+                    const color_list = style.color_list;
+                    const list = color_list.filter((item) => !isEmpty(item.color));
+                    if (list.length > 0) {
+                        try {
+                            return gradient_computer(style);
+                        } catch (error) {
+                            return '';
+                        }
+                    }
+                    return '';
+                }
+                return '';
+            },
+            get_swiper_bg_img_style(form, actived_index) {
+                if (!this.propIsCommon) {
+                    return '';
+                }
+                const { carousel_img, style = {} } = form?.carousel_list[actived_index] || {};
+                // 如果是自定义的图片 判断图片是否存在
+                if (!isEmpty(carousel_img) && style?.background_type == 'carousel') {
+                    // 如果是使用轮播图，判断轮播图是否存在
+                    const data = {
+                        background_img: carousel_img,
+                        background_img_style: style?.background_img_style || '2',
+                    }
+                    return background_computer(data) + (style.is_background_img_blur == '1' ? `filter: blur(14px);opacity: 0.6;` : '');
+                } else if (!isEmpty(style?.background_img)) {
+                    return background_computer(style) + (style.is_background_img_blur == '1' ? `filter: blur(14px);opacity: 0.6;` : '');
+                }
+                return '';
+            },
+            get_seat_list(form) {
+                if (form.carousel_list.length > 3) {
+                    return [];
+                } else {
+                    let seat_list = [];
+                    const list = JSON.parse(JSON.stringify(form.carousel_list));
+                    switch (list.length) {
+                        case 1:
+                            seat_list = [...list, ...list, ...list];
+                            break;
+                        case 2:
+                            seat_list.push(...list);
+                            break;
+                        case 3:
+                            seat_list.push(...list);
+                            break;
+                        default:
+                            break;
+                    }
+                    return seat_list;
+                }
+            },
+            slideChange(e) {
+                let actived_index = e.detail.current;
+                if (e.detail.current > this.form.carousel_list.length - 1) {
+                    const seat_length = this.seat_list.length;
+                    if (this.form.carousel_list.length > 1) {
+                        actived_index = actived_index - seat_length;
+                    } else {
+                        actived_index = 0;
+                    }
+                }
+                if (!this.propIsCommon) {
+                    this.$emit('slideChange', actived_index);
+                }
+                this.setData({
+                    animationData: e.detail.current,
+                    actived_index: actived_index,
+                    swiper_bg_style: this.get_swiper_bg_style(this.form, actived_index),
+                    swiper_bg_img_style: this.get_swiper_bg_img_style(this.form, actived_index),
+                });
+            },
+            get_video_style(new_style) {
+                const { video_radius, video_color_list, video_direction, video_title_color, video_padding } = new_style;
+                let style = ``;
+                if (!isEmpty(video_radius)) {
+                    style += radius_computer(video_radius);
+                }
+                const data = {
+                    color_list: video_color_list,
+                    direction: video_direction,
+                };
+                style += gradient_computer(data) + padding_computer(video_padding) + `color: ${video_title_color};box-sizing: border-box;`;
+                return style;
+            },
+            video_play(e) {
+                const list = e.currentTarget.dataset.value;
+                if (!isEmpty(list)) {
+                    this.$emit('onVideoPlay', list[0].url, this.popup_width, this.popup_height);
+                }
+            },
+            url_open(link) {
+                app.globalData.url_event(link);
+            },
+        },
+    };
+</script>
+
+<style scoped lang="scss">
+    .dot-center {
+        left: 50%;
+        transform: translateX(-50%);
+    }
+    .dot-right {
+        right: 0;
+    }
+    .dot {
+        z-index: 1;
+        padding-left: 20rpx;
+        padding-right: 20rpx;
+        .dot-item {
+            margin: 0 6rpx;
+        }
+    }
+    .swiper-container {
+        display: flex;
+        align-items: center;
+    }
+
+    .swiper-item {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: center;
+        align-items: center;
+        margin-left: auto;
+        margin-right: auto;
+        height: 90%;
+        width: 90%;
+        text-align: center;
+    }
+
+    .scale-defalt {
+        position: relative;
+        border-radius: 20rpx;
+        transform: scale(1);
+        transition: -webkit-transform 400ms linear, transform 400ms linear;
+        transform-origin: 50% 50% 0px;
+        &.scale-1 {
+            transform: scale(1.1);
+        }
+    }
+    .video_img {
+        max-width: 120rpx;
+        height: 28rpx;
+    }
+    .video-class {
+        max-width: 100%;
+        padding-right: 20rpx;
+        padding-left: 20rpx;
+    }
+    .x-middle {
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+    }
+</style>
diff --git a/components/diy/coupon.vue b/components/diy/coupon.vue
new file mode 100644
index 0000000..c089e54
--- /dev/null
+++ b/components/diy/coupon.vue
@@ -0,0 +1,1013 @@
+<template>
+    <!-- 优惠券 -->
+    <view class="coupon-theme-container" :style="style_container">
+        <view class="pr" :style="style_img_container">
+            <view class="hide-scrollbar">
+                <template v-if="theme == '1'">
+                    <view class="coupon-theme-1" :style="'gap:' + theme_style.spacing">
+                        <view v-for="(item, index) in data_list" :key="index" class="item" :style="'background: ' + theme_style.background">
+                            <view class="coupon-theme-1-content tc" :style="'background-image: url(' + theme_bg_img.url_1 + ');background-size: 100% 100%;'">
+                                <view class="name text-line-1" :style="'color:' + theme_style.name_color">{{ item.name }}</view>
+                                <view class="price" :style="'color:' + theme_style.price_color">
+                                    <text v-if="item.type == '0'" class="symbol">{{ currency_symbol }}</text>
+                                    <text class="number">{{ item.discount_value }}</text>
+                                    <text v-if="item.type == '1'" class="symbol">折</text>
+                                </view>
+                            </view>
+                            <view class="coupon-btn" :class="[0, 3].includes(item.status_type) ? '' : 'btn-already'" :style="'color:' + theme_style.btn_color + ';background:' + theme_style.btn_background" :data-value="home_page_url" :data-type="item.status_type" :data-index="index" :data-id="item.id" @tap="receive_event">{{ item.status_operable_name }}</view>
+                        </view>
+                    </view>
+                </template>
+                <template v-else-if="theme == '2'">
+                    <view class="coupon-theme-2" :style="'gap:' + theme_style.spacing">
+                        <view v-for="(item, index) in data_list" :key="index" class="item" :style="'background-image: url(' + theme_bg_img.url_2 + ');background-size: 100% 100%;'">
+                            <view class="tc">
+                                <view class="price" :style="'color:' + theme_style.price_color">
+                                    <text v-if="item.type == '0'" class="symbol">{{ currency_symbol }}</text>
+                                    <text class="number">{{ item.discount_value }}</text>
+                                    <text v-if="item.type == '1'" class="symbol">折</text>
+                                </view>
+                                <view class="name text-line-1" :style="'color:' + theme_style.name_color">{{ item.name }}</view>
+                                <view class="desc text-line-1" :style="'color:' + theme_style.desc_color">{{ item.desc }}</view>
+                            </view>
+                            <view class="coupon-btn" :class="[0, 3].includes(item.status_type) ? '' : 'btn-already'" :style="'color:' + theme_style.btn_color + ';background:' + theme_style.btn_background" :data-value="home_page_url" :data-type="item.status_type" :data-index="index" :data-id="item.id" @tap="receive_event">{{ item.status_operable_name }}</view>
+                        </view>
+                    </view>
+                </template>
+                <template v-else-if="theme == '3'">
+                    <view class="coupon-theme-3" :style="'gap:' + theme_style.spacing">
+                        <view v-for="(item, index) in data_list" :key="index" class="item" :style="'background: ' + theme_style.background">
+                            <view class="left" :style="'background: ' + theme_style.background_inside">
+                                <view class="price-before" :style="'border-right: 2rpx dashed ' + theme_style.border_style">
+                                    <view class="price" :style="'color:' + theme_style.price_color">
+                                        <text v-if="item.type == '0'" class="symbol">{{ currency_symbol }}</text>
+                                        <text class="number">{{ item.discount_value }}</text>
+                                        <text v-if="item.type == '1'" class="symbol self-e">折</text>
+                                    </view>
+                                </view>
+                                <view class="text padding-left-xs padding-right-sm">
+                                    <view class="name text-line-1" :style="'color:' + theme_style.name_color">{{ item.name }}</view>
+                                    <view class="desc text-line-1" :style="'color:' + theme_style.desc_color">{{ item.use_limit_type_name }}</view>
+                                    <view v-if="item.limit_send_count && item.limit_send_count > 0" class="limit text-line-1" :style="'color:' + theme_style.limit_send_count">(限领{{ item.limit_send_count }}张)</view>
+                                </view>
+                            </view>
+                            <view class="right" :class="item.status_operable_name.length > 3 ? ' long-name' : ' short-name'">
+                                <view class="right-before" :style="'background: ' + theme_style.background"></view>
+                                <view class="coupon-btn" :class="[0, 3].includes(item.status_type) ? '' : 'btn-already'" :style="'color:' + theme_style.btn_color" :data-value="home_page_url" :data-type="item.status_type" :data-index="index" :data-id="item.id" @tap="receive_event">
+                                    <text class="text">{{ item.status_operable_name }}</text>
+                                    <iconfont name="icon-arrow-right-round" class="icon" propContainerDisplay="flex"></iconfont>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </template>
+                <template v-else-if="theme == '4'">
+                    <view class="coupon-theme-4" :style="'background: ' + theme_style.background">
+                        <view class="hide-scrollbar">
+                            <view class="left" :style="'gap: ' + theme_style.spacing">
+                                <view v-for="(item, index) in data_list" :key="index" class="item" :style="'background: ' + theme_style.background_inside">
+                                    <view class="type" :style="'background: ' + theme_style.type_background + ';color:' + theme_style.type_color">
+                                        <view class="type-before" :style="'background: ' + theme_style.type_background"></view>
+                                        <text>{{ item.type_name }}</text>
+                                        <view class="type-after" :style="'background: ' + theme_style.type_background"></view>
+                                    </view>
+                                    <view class="price" :style="'color:' + theme_style.price_color">
+                                        <text v-if="item.type == '0'" class="symbol">{{ currency_symbol }}</text>
+                                        <text class="number">{{ item.discount_value }}</text>
+                                        <text v-if="item.type == '1'" class="symbol">折</text>
+                                    </view>
+                                    <view class="name text-line-1" :style="'color:' + theme_style.name_color">{{ item.name }}</view>
+                                </view>
+                            </view>
+                        </view>
+                        <view class="right">
+                            <view class="right-before" :style="'background: ' + theme_style.background"></view>
+                            <view class="pr z-i flex-col jc-c align-c">
+                                <view class="title text-line-1" :style="'color:' + theme_style.content_title_color">{{ content_title }}</view>
+                                <view class="desc text-line-1" :style="'color:' + theme_style.content_desc_color">{{ content_desc }}</view>
+                                <view class="coupon-btn" :class="data_list.filter((item) => item.status_type == 0).length > 0 ? '' : 'btn-already'" :style="'color:' + theme_style.btn_color + ';background:' + theme_style.btn_background" @tap="receive_all_event">
+                                    {{ data_list.filter((item) => item.status_type == 0).length > 0 ? '立即领取' : '不可领取' }}
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </template>
+                <template v-else-if="theme == '5'">
+                    <view class="coupon-theme-5" :style="'gap:' + theme_style.spacing">
+                        <view v-for="(item, index) in data_list" :key="index" class="item">
+                            <view class="left" :style="'background-image: url(' + theme_bg_img.url_3 + ');background-size: 100% 100%;'">
+                                <view class="price" :style="'color:' + theme_style.price_color">
+                                    <text v-if="item.type == '0'" class="symbol">{{ currency_symbol }}</text>
+                                    <text class="number">{{ item.discount_value }}</text>
+                                    <text v-if="item.type == '1'" class="symbol">折</text>
+                                </view>
+                                <view class="name text-line-1" :style="'color:' + theme_style.name_color">{{ item.name }}</view>
+                            </view>
+                            <view class="right" :style="'background: ' + theme_style.background">
+                                <view class="coupon-btn" :class="[0, 3].includes(item.status_type) ? '' : 'btn-already'" :style="'color:' + theme_style.btn_color" :data-value="home_page_url" :data-type="item.status_type" :data-index="index" :data-id="item.id" @tap="receive_event">{{ item.status_operable_name }}</view>
+                            </view>
+                        </view>
+                    </view>
+                </template>
+                <template v-else-if="theme == '6'">
+                    <view class="coupon-theme-6" :style="'gap:' + theme_style.spacing">
+                        <view v-for="(item, index) in data_list" :key="index" class="item" :style="'background: ' + theme_style.background">
+                            <view class="pr oh">
+                                <view class="top-before" :style="'background: ' + theme_style.background"></view>
+                                <view class="top" :style="'background: ' + theme_style.background_inside">
+                                    <view class="price" :style="'color:' + theme_style.price_color">
+                                        <text v-if="item.type == '0'" class="symbol">{{ currency_symbol }}</text>
+                                        <text class="number">{{ item.discount_value }}</text>
+                                        <text v-if="item.type == '1'" class="symbol">折</text>
+                                    </view>
+                                    <view class="name text-line-1" :style="'color:' + theme_style.name_color">{{ item.name }}</view>
+                                </view>
+                                <view class="top-after" :style="'background: ' + theme_style.background"></view>
+                            </view>
+                            <view class="bottom">
+                                <view class="coupon-btn" :class="[0, 3].includes(item.status_type) ? '' : 'btn-already'" :style="'color:' + theme_style.btn_color" :data-value="home_page_url" :data-type="item.status_type" :data-index="index" :data-id="item.id" @tap="receive_event">{{ item.status_operable_name }}</view>
+                            </view>
+                        </view>
+                    </view>
+                </template>
+                <template v-else-if="theme == '7'">
+                    <view class="coupon-theme-7" :style="'gap:' + theme_style.spacing">
+                        <view v-for="(item, index) in data_list" :key="index" class="item" :style="'background: ' + theme_style.background">
+                            <view class="item-before" :style="'background: ' + theme_style.theme_7_background"></view>
+                            <view class="flex-row flex-1">
+                                <view class="left">
+                                    <view class="price" :style="'color:' + theme_style.price_color">
+                                        <text v-if="item.type == '0'" class="symbol">{{ currency_symbol }}</text>
+                                        <text class="number">{{ item.discount_value }}</text>
+                                        <text v-if="item.type == '1'" class="symbol">折</text>
+                                    </view>
+                                    <view class="name text-line-1" :style="'color:' + theme_style.name_color">{{ item.name }}</view>
+                                </view>
+                                <view class="right">
+                                    <view class="right-before" :style="'border: 2rpx dashed ' + theme_style.theme_7_background"></view>
+                                    <view class="coupon-btn" :class="[0, 3].includes(item.status_type) ? '' : 'btn-already'" :style="'color:' + theme_style.btn_color" :data-value="home_page_url" :data-type="item.status_type" :data-index="index" :data-id="item.id" @tap="receive_event">{{ item.status_operable_name }}</view>
+                                </view>
+                            </view>
+                            <view class="item-after" :style="'background: ' + theme_style.theme_7_background"></view>
+                        </view>
+                    </view>
+                </template>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    var tabbar_pages = app.globalData.app_tabbar_pages();
+    import { common_styles_computer, common_img_computer, gradient_computer } from '@/common/js/common/common.js';
+    export default {
+        props: {
+            propValue: {
+                type: Object,
+                default: () => ({}),
+            },
+            propKey: {
+                type: [String,Number],
+                default: '',
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 1000000,
+            },
+        },
+        data() {
+            return {
+                currency_symbol: app.globalData.currency_symbol(),
+                style_container: '',
+                style_img_container: '',
+                data_list: [],
+                // 主题
+                theme: '0',
+                // 主题样式
+                theme_style: {},
+                // 主题4 标题
+                content_title: '',
+                // 主题4 描述
+                content_desc: '',
+                theme_bg_img: {
+                    url_1: '',
+                    url_2: '',
+                    url_3: '',
+                },
+                // 首页地址
+                home_page_url: tabbar_pages[0],
+            };
+        },
+        watch: {
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        created() {
+            this.init();
+        },
+        methods: {
+            // 初始化数据
+            init() {
+                const new_content = this.propValue.content || {};
+                const new_style = this.propValue.style || {};
+                const temp_theme = new_content.theme;
+                // 主题
+                const new_background = gradient_computer(
+                    {
+                        color_list: new_style.background,
+                        direction: new_style.direction,
+                    },
+                    false
+                );
+                const new_background_inside = gradient_computer(
+                    {
+                        color_list: new_style.background_inside,
+                        direction: new_style.direction_inside,
+                    },
+                    false
+                );
+                const new_btn_background = gradient_computer(
+                    {
+                        color_list: new_style.btn_background,
+                        direction: new_style.btn_direction,
+                    },
+                    false
+                );
+                this.setData({
+                    content_title: new_content.title || '',
+                    content_desc: new_content.desc || '',
+                    // 判断是自动还是手动
+                    data_list: new_content.data_type == '1' ? new_content.data_list : new_content.data_auto_list,
+                    theme: temp_theme,
+                    theme_style: {
+                        price_color: new_style.price_color,
+                        name_color: new_style.name_color,
+                        // 判断是否向对象添加desc_color属性
+                        ...(!['1', '5', '6', '7'].includes(temp_theme) && {
+                            desc_color: new_style.desc_color,
+                        }),
+                        ...(!['1', '2', '4', '5', '6', '7'].includes(temp_theme) && {
+                            limit_send_count: new_style.limit_send_count,
+                        }),
+                        ...(!['5', '6', '7'].includes(temp_theme) && {
+                            btn_background: new_btn_background,
+                        }),
+                        btn_color: new_style.btn_color,
+                        ...(!['2'].includes(temp_theme) && {
+                            background: new_background,
+                        }),
+                        ...(!['1', '2', '5', '7'].includes(temp_theme) && {
+                            background_inside: new_background_inside,
+                        }),
+                        spacing: new_style.spacing + 'px',
+                        ...(!['1', '2', '3', '5', '6', '7'].includes(temp_theme) && {
+                            type_background: new_style.type_background,
+                        }),
+                        ...(!['1', '2', '3', '5', '6', '7'].includes(temp_theme) && {
+                            type_color: new_style.type_color,
+                        }),
+                        ...(!['1', '2', '3', '5', '6', '7'].includes(temp_theme) && {
+                            content_title_color: new_style.content_title_color,
+                        }),
+                        ...(!['1', '2', '3', '5', '6', '7'].includes(temp_theme) && {
+                            content_desc_color: new_style.content_desc_color,
+                        }),
+                        ...(['3'].includes(temp_theme) && {
+                            border_style: new_style.background[0].color,
+                        }),
+                        ...(['7'].includes(temp_theme) && {
+                            theme_7_background: new_style.common_style.color_list[0].color,
+                        }),
+                    },
+                    theme_bg_img: {
+                        url_1: new_content.theme_1_static_img[0].url,
+                        url_2: new_content.theme_2_static_img[0].url,
+                        url_3: new_content.theme_5_static_img[0].url,
+                    },
+                    style_container: common_styles_computer(new_style.common_style),
+                    style_img_container: common_img_computer(new_style.common_style, this.propIndex),
+                });
+            },
+            // 领取优惠券
+            receive_event(e) {
+                const coupon_status_type = e.currentTarget.dataset.type;
+                const coupon_index = e.currentTarget.dataset.index;
+                const coupon_id = e.currentTarget.dataset.id;
+                switch (coupon_status_type) {
+                    case 0:
+                        // 登录校验
+                        var user = app.globalData.get_user_info(this, 'coupon_receive_event');
+                        if (user != false) {
+                            var temp_list = this.data_list;
+                            if (temp_list[coupon_index]['is_operable'] != 0) {
+                                uni.showLoading({
+                                    title: this.$t('common.processing_in_text'),
+                                });
+                                this.coupon_api(coupon_id, coupon_index);
+                            }
+                        }
+                        break;
+                    case 3:
+                        app.globalData.url_event(e);
+                        break;
+                }
+            },
+            // 全部领取
+            receive_all_event() {
+                const filter_data_list = this.data_list.map((item) => {
+                    if (item.is_operable != 0 && item.status_type == 0) {
+                        return item.id;
+                    }
+                });
+                this.coupon_api(filter_data_list.join(','));
+            },
+            // 优惠劵领取事件
+            coupon_api(val, index) {
+                uni.request({
+                    url: app.globalData.get_request_url('receive', 'coupon', 'coupon'),
+                    method: 'POST',
+                    data: {
+                        coupon_id: val,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            app.globalData.showToast(res.data.msg, 'success');
+                            if (index) {
+                                temp_list = res.data.data.coupon || [];
+                            } else {
+                                temp_list[index] = res.data.data.coupon || {};
+                            }
+                            this.setData({
+                                data_list: temp_list,
+                            });
+                        } else {
+                            if (app.globalData.is_login_check(res.data, this, 'coupon_receive_event')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+        },
+    };
+</script>
+<style lang="scss" scoped>
+    .coupon-theme-1 {
+        display: flex;
+        flex-direction: row;
+
+        .item {
+            flex-basis: auto;
+            flex-shrink: 0;
+            width: 168rpx;
+            height: 168rpx;
+            border-radius: 20rpx;
+            margin-top: 20rpx;
+
+            .name {
+                padding: 10rpx 10rpx 0 10rpx;
+                margin-bottom: 10rpx;
+                font-size: 20rpx;
+                box-sizing: border-box;
+            }
+
+            .price {
+                padding: 10rpx 0 16rpx 0;
+                box-sizing: border-box;
+
+                .symbol {
+                    font-size: 24rpx;
+                    position: relative;
+                    bottom: 6rpx;
+                }
+
+                .number {
+                    font-size: 52rpx;
+                    line-height: 48rpx;
+                    font-weight: bold;
+                    padding: 0 8rpx;
+                    box-sizing: border-box;
+                }
+            }
+
+            .coupon-theme-1-content {
+                width: calc(100% - 20rpx);
+                margin: 0 10rpx;
+                background-size: 100% 100%;
+                position: relative;
+                top: -20rpx;
+            }
+
+            .coupon-btn {
+                margin: 0 auto;
+                width: 142rpx;
+                height: 35.112rpx;
+                line-height: 35.112rpx;
+                text-align: center;
+                font-size: 18rpx;
+                border-radius: 46rpx;
+                position: relative;
+                top: -10rpx;
+            }
+        }
+    }
+
+    .coupon-theme-2 {
+        display: flex;
+        flex-direction: row;
+
+        .item {
+            flex-basis: auto;
+            flex-shrink: 0;
+            background-size: 100% 100%;
+            width: 170rpx;
+            height: 200rpx;
+            padding: 10rpx;
+            box-sizing: border-box;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+
+            .price {
+                padding: 6rpx 0;
+                box-sizing: border-box;
+
+                .symbol {
+                    font-size: 16rpx;
+                }
+
+                .number {
+                    font-size: 52rpx;
+                    font-weight: bold;
+                    padding: 0 8rpx;
+                    box-sizing: border-box;
+                }
+            }
+
+            .name {
+                font-size: 16rpx;
+                font-weight: bold;
+                margin-bottom: 8rpx;
+            }
+
+            .desc {
+                font-size: 16rpx;
+            }
+
+            .coupon-btn {
+                margin: 0 auto;
+                width: 110rpx;
+                height: 32rpx;
+                line-height: 32rpx;
+                text-align: center;
+                font-size: 18rpx;
+                border-radius: 46rpx;
+                margin-top: 10rpx;
+                margin-bottom: 4rpx;
+            }
+        }
+    }
+
+    .coupon-theme-3 {
+        display: flex;
+
+        .item {
+            overflow: hidden;
+            height: 176rpx;
+            border-radius: 32rpx;
+            flex-basis: auto;
+            flex-shrink: 0;
+            width: 100%;
+            padding: 16rpx;
+            box-sizing: border-box;
+            display: flex;
+
+            .left {
+                flex: 1;
+                width: 0;
+                border-radius: 16rpx;
+                padding: 12rpx 24rpx 6rpx 24rpx;
+                box-sizing: border-box;
+                display: flex;
+                align-items: center;
+
+                .price-before {
+                    height: calc(100% + 120rpx);
+                    display: flex;
+                    align-items: center;
+                }
+
+                .price {
+                    text-align: center;
+                    width: 200rpx;
+                    position: relative;
+                    display: flex;
+                    align-items: flex-start;
+
+                    .symbol {
+                        font-size: 36rpx;
+                        font-weight: 600;
+                    }
+
+                    .number {
+                        font-size: 64rpx;
+                        font-weight: 600;
+                        padding: 0 8rpx;
+                        box-sizing: border-box;
+                        line-height: 60rpx;
+                    }
+                }
+
+                .text {
+                    flex: 1;
+                    width: 0;
+                    display: flex;
+                    flex-direction: column;
+                    align-items: center;
+                    text-align: center;
+                    box-sizing: border-box;
+
+                    .name {
+                        font-size: 36rpx;
+                        font-weight: bold;
+                        line-height: 50rpx;
+                    }
+
+                    .desc {
+                        font-size: 28rpx;
+                        font-weight: bold;
+                        line-height: 40rpx;
+                    }
+
+                    .limit {
+                        font-size: 24rpx;
+                    }
+                }
+            }
+
+            .right {
+                width: 172rpx;
+                position: relative;
+                padding: 0 36rpx;
+                box-sizing: border-box;
+                text-align: center;
+                display: flex;
+                align-items: center;
+
+                &.short-name {
+                    height: 132rpx;
+                    justify-content: center;
+                    padding: 0 10rpx;
+
+                    .coupon-btn {
+                        display: flex;
+                        align-items: center;
+                        justify-content: center;
+                        gap: 6rpx;
+                        width: 100%;
+                    }
+                }
+
+                .right-before {
+                    position: absolute;
+                    top: 50%;
+                    transform: translateY(-50%);
+                    width: 200%;
+                    height: 200%;
+                    left: -32rpx;
+                    border-radius: 100%;
+                }
+
+                .coupon-btn {
+                    position: relative;
+                    font-size: 36rpx;
+                    text-align: center;
+
+                    .text {
+                        height: 100rpx;
+                        display: flex;
+                        align-items: center;
+                        justify-content: center;
+                    }
+
+                    .icon {
+                        font-size: 40rpx;
+                        line-height: 32rpx;
+                    }
+                }
+            }
+        }
+    }
+
+    .coupon-theme-4 {
+        overflow: hidden;
+        border-radius: 32rpx;
+        padding: 16rpx;
+        box-sizing: border-box;
+        display: flex;
+
+        .left {
+            width: 428rpx;
+            display: flex;
+            flex-direction: row;
+
+            .item {
+                overflow: hidden;
+                flex-basis: auto;
+                flex-shrink: 0;
+                width: 144rpx;
+                height: 144rpx;
+                border-radius: 20rpx;
+                position: relative;
+                display: flex;
+                flex-direction: column;
+                justify-content: flex-end;
+                align-items: center;
+                padding: 8rpx;
+                box-sizing: border-box;
+
+                .type {
+                    position: absolute;
+                    top: 0;
+                    left: 50%;
+                    transform: translateX(-50%);
+                    font-size: 20rpx;
+                    line-height: 28rpx;
+
+                    .type-before {
+                        position: absolute;
+                        width: 30rpx;
+                        height: 60rpx;
+                        left: -16rpx;
+                        border-radius: 100%;
+                        top: -32rpx;
+                        z-index: -1;
+                    }
+
+                    .type-after {
+                        position: absolute;
+                        width: 30rpx;
+                        height: 60rpx;
+                        right: -16rpx;
+                        border-radius: 100%;
+                        top: -32rpx;
+                        z-index: -1;
+                    }
+                }
+
+                .price {
+                    text-align: center;
+                    position: relative;
+                    display: flex;
+                    align-items: flex-end;
+
+                    .symbol {
+                        font-size: 24rpx;
+                    }
+
+                    .number {
+                        font-size: 48rpx;
+                        line-height: 48rpx;
+                        font-weight: 600;
+                        padding-left: 8rpx;
+                        box-sizing: border-box;
+                    }
+                }
+
+                .name {
+                    font-size: 22rpx;
+                    line-height: 32rpx;
+                }
+            }
+        }
+
+        .right {
+            flex: 1;
+            width: 0;
+            position: relative;
+
+            .right-before {
+                width: 360rpx;
+                height: 360rpx;
+                position: absolute;
+                left: -14rpx;
+                top: 50%;
+                transform: translateY(-50%);
+                border-radius: 100%;
+            }
+
+            .title {
+                font-size: 32rpx;
+                font-weight: bold;
+                line-height: 44rpx;
+            }
+
+            .desc {
+                margin-top: 6rpx;
+                font-size: 24rpx;
+                line-height: 34rpx;
+            }
+
+            .coupon-btn {
+                width: 144rpx;
+                height: 44rpx;
+                font-size: 24rpx;
+                line-height: 44rpx;
+                text-align: center;
+                border-radius: 24rpx;
+                margin-top: 12rpx;
+            }
+        }
+    }
+
+    .coupon-theme-5 {
+        display: flex;
+        flex-direction: row;
+
+        .item {
+            flex-basis: auto;
+            flex-shrink: 0;
+            border-radius: 12rpx;
+            width: 252rpx;
+            height: 128rpx;
+            position: relative;
+
+            .left {
+                position: absolute;
+                left: 0;
+                width: 200rpx;
+                height: 100%;
+                padding: 12rpx;
+                box-sizing: border-box;
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                justify-content: center;
+                z-index: 1;
+
+                .price {
+                    text-align: center;
+                    position: relative;
+                    display: flex;
+                    align-items: flex-end;
+                    margin-bottom: 10rpx;
+
+                    .symbol {
+                        font-size: 24rpx;
+                        font-weight: bold;
+                    }
+
+                    .number {
+                        font-size: 48rpx;
+                        font-weight: bold;
+                        line-height: 40rpx;
+                        padding-left: 8rpx;
+                        box-sizing: border-box;
+                    }
+                }
+
+                .name {
+                    font-size: 24rpx;
+                }
+            }
+
+            .right {
+                width: 92rpx;
+                padding-left: 40rpx;
+                box-sizing: border-box;
+                border-radius: 12rpx;
+                position: absolute;
+                top: 0;
+                bottom: 0;
+                right: 0;
+                height: 100%;
+                text-align: center;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+
+                .coupon-btn {
+                    position: relative;
+                    font-size: 24rpx;
+                    font-weight: bold;
+                    text-align: center;
+                    letter-spacing: 4rpx;
+                }
+            }
+        }
+    }
+
+    .coupon-theme-6 {
+        display: flex;
+        .item {
+            flex-basis: auto;
+            flex-shrink: 0;
+            border-radius: 24rpx;
+            padding: 12rpx;
+            width: 268rpx;
+            height: 188rpx;
+            position: relative;
+            box-sizing: border-box;
+
+            .top-before {
+                position: absolute;
+                left: -14rpx;
+                top: 50%;
+                transform: translateY(-50%);
+                width: 28rpx;
+                height: 28rpx;
+                border-radius: 50%;
+                z-index: 2;
+            }
+
+            .top-after {
+                position: absolute;
+                right: -14rpx;
+                top: 50%;
+                transform: translateY(-50%);
+                width: 28rpx;
+                height: 28rpx;
+                border-radius: 50%;
+                z-index: 2;
+            }
+
+            .top {
+                width: 100%;
+                padding: 8rpx;
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                justify-content: center;
+                z-index: 1;
+                border-radius: 12rpx;
+                position: relative;
+                overflow: hidden;
+                box-sizing: border-box;
+
+                .price {
+                    text-align: center;
+                    position: relative;
+                    display: flex;
+                    align-items: flex-end;
+                    margin-bottom: 2rpx;
+
+                    .symbol {
+                        font-size: 40rpx;
+                        font-weight: bold;
+                    }
+
+                    .number {
+                        font-size: 64rpx;
+                        font-weight: bold;
+                        line-height: 64rpx;
+                        padding-left: 8rpx;
+                        box-sizing: border-box;
+                    }
+                }
+
+                .name {
+                    font-size: 24rpx;
+                }
+            }
+
+            .bottom {
+                margin-top: 8rpx;
+                text-align: center;
+
+                .coupon-btn {
+                    position: relative;
+                    font-size: 28rpx;
+                    line-height: 44rpx;
+                    font-weight: bold;
+                    text-align: center;
+                }
+            }
+        }
+    }
+
+    .coupon-theme-7 {
+        display: flex;
+
+        .item {
+            flex-basis: auto;
+            flex-shrink: 0;
+            border-radius: 8rpx;
+            width: 236rpx;
+            height: 128rpx;
+            position: relative;
+            overflow: hidden;
+            display: flex;
+
+            .item-before {
+                position: absolute;
+                left: 160rpx;
+                top: -12rpx;
+                width: 24rpx;
+                height: 24rpx;
+                border-radius: 50%;
+            }
+
+            .item-after {
+                position: absolute;
+                left: 160rpx;
+                bottom: -12rpx;
+                width: 24rpx;
+                height: 24rpx;
+                border-radius: 50%;
+            }
+
+            .left {
+                width: 172rpx;
+                padding: 8rpx;
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                justify-content: center;
+                position: relative;
+                box-sizing: border-box;
+
+                .price {
+                    text-align: center;
+                    position: relative;
+                    display: flex;
+                    align-items: flex-end;
+                    margin-bottom: 10rpx;
+
+                    .symbol {
+                        font-size: 24rpx;
+                        font-weight: bold;
+                    }
+
+                    .number {
+                        font-size: 48rpx;
+                        font-weight: bold;
+                        line-height: 40rpx;
+                        padding-left: 8rpx;
+                        box-sizing: border-box;
+                    }
+                }
+
+                .name {
+                    font-size: 24rpx;
+                }
+            }
+
+            .right {
+                flex: 1;
+                width: 0;
+                padding-left: 14rpx;
+                position: relative;
+                box-sizing: border-box;
+
+                .right-before {
+                    position: absolute;
+                    left: -1rpx;
+                    top: 0;
+                    bottom: 0;
+                    width: 0;
+                    height: 100%;
+                    opacity: 0.61;
+                }
+
+                .coupon-btn {
+                    box-sizing: border-box;
+                    padding: 8rpx;
+                    width: 100%;
+                    font-size: 20rpx;
+                    font-weight: bold;
+                    text-align: center;
+                    letter-spacing: 4rpx;
+                    height: 100%;
+                    display: flex;
+                    align-items: center;
+                }
+            }
+        }
+    }
+
+    // 已领取
+    .btn-already {
+        color: #e3ca90 !important;
+    }
+
+    .hide-scrollbar {
+        overflow: auto;
+
+        &::-webkit-scrollbar {
+            display: none;
+            width: 0;
+            height: 0;
+            color: transparent;
+        }
+    }
+</style>
diff --git a/components/diy/custom.vue b/components/diy/custom.vue
new file mode 100644
index 0000000..07f04b4
--- /dev/null
+++ b/components/diy/custom.vue
@@ -0,0 +1,337 @@
+<template>
+    <view :style="style_container">
+        <view :style="style_img_container">
+            <view :style="style_content_container">
+                <view class="w h pr" :style="style_content_img_container">
+                    <template v-if="!isEmpty(form.data_source) && form.data_source_is_loop !== '0'">
+                        <template v-if="data_source_content_list.length > 0 && form.data_source_direction == 'vertical'">
+                            <view class="flex-row flex-wrap" :style="'row-gap:' + new_style.row_gap + 'px;column-gap:' + new_style.column_gap + 'px;'">
+                                <view v-for="(item, index) in data_source_content_list" :key="index" class="ht-auto" :style="gap_width">
+                                    <view v-for="(item1, index1) in item.split_list" :key="index1">
+                                        <view :style="style_chunk_container">
+                                            <view class="wh-auto ht-auto oh" :style="style_chunk_img_container">
+                                                <dataRendering :propKey="propKey" :propCustomList="form.custom_list" :propIndex="index1" :propSourceList="item1" :propConfigLoop="form.data_source_is_loop || '1'" :propGroupSourceList="data_source_content_list" :propFieldList="field_list" :propDataHeight="form.height" :propScale="scale" :propDataIndex="index" :propDataSplitIndex="index1" :propIsCustom="form.is_custom_data == '1'" :propShowData="show_data" @url_event="url_event"></dataRendering>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                        </template>
+                        <view v-else-if="data_source_content_list.length > 0 && ['vertical-scroll', 'horizontal'].includes(form.data_source_direction)" class="oh ht-auto">
+                            <swiper class="w flex" circular="true" :vertical="form.data_source_direction != 'horizontal'" :autoplay="new_style.is_roll == '1'" :interval="new_style.interval_time * 1000" :duration="500" :display-multiple-items="slides_per_view" :style="{ width: '100%', height: swiper_height + 'px' }" @change="slideChange">
+                                <swiper-item v-for="(item, index) in data_source_content_list" :key="index">
+                                    <view :class="form.data_source_direction != 'horizontal' ? 'ht-auto ' : 'flex-row'" :style="form.data_source_direction == 'horizontal' ? 'column-gap:' + new_style.column_gap + 'px;' : ''">
+                                        <view v-for="(item1, index1) in item.split_list" :key="index1" class="wh-auto ht-auto" :style="style_chunk_container + swiper_width + (form.data_source_direction == 'horizontal' ? gap_width : 'margin-bottom:' + content_outer_spacing_magin)">
+                                            <view class="wh-auto ht-auto oh" :style="style_chunk_img_container">
+                                                <dataRendering :propKey="propKey" :propCustomList="form.custom_list" :propIndex="index1" :propSourceList="item1" :propConfigLoop="form.data_source_is_loop || '1'" :propGroupSourceList="data_source_content_list" :propFieldList="field_list" :propScale="scale" :propDataIndex="index" :propDataSplitIndex="index1" :propIsCustom="form.is_custom_data == '1'" :propShowData="show_data" @url_event="url_event"></dataRendering>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </swiper-item>
+                            </swiper>
+                            <view v-if="new_style.is_show == '1' && data_source_content_list.length > 1" :class="['left', 'right'].includes(new_style.indicator_new_location) ? 'indicator_up_down_location' : 'indicator_about_location'" :style="indicator_location_style">
+                                <block v-if="new_style.indicator_style == 'num'">
+                                    <view :style="indicator_style" class="dot-item">
+                                        <text :style="{ color: new_style.actived_color }">{{ actived_index + 1 }}</text>
+                                        <text>/{{ data_source_content_list.length }}</text>
+                                    </view>
+                                </block>
+                                <block v-else>
+                                    <view v-for="(item, index) in data_source_content_list" :key="index" :style="indicator_style + (actived_index == index ? 'background:' + new_style.actived_color : '')" class="dot-item" />
+                                </block>
+                            </view>
+                        </view>
+                        <template v-else>
+                            <view :style="style_chunk_container">
+                                <view class="wh-auto ht-auto oh" :style="style_chunk_img_container">
+                                    <dataRendering :propKey="propKey" :propCustomList="form.custom_list" :propIndex="0" :propConfigLoop="form.data_source_is_loop || '1'" :propFieldList="field_list" :propDataHeight="form.height" :propScale="scale" @url_event="url_event"></dataRendering>
+                                </view>
+                            </view>
+                        </template>
+                    </template>
+                    <template v-else-if="!isEmpty(form.data_source) && form.data_source_is_loop == '0'">
+                        <view class="h" :style="style_chunk_container">
+                            <view class="w h oh" :style="style_chunk_img_container">
+                                <dataRendering :propKey="propKey" :propCustomList="form.custom_list" :propIndex="0" :propSourceList="{}" :propConfigLoop="form.data_source_is_loop || '1'" :propGroupSourceList="data_source_content_list" :propFieldList="field_list" :propDataHeight="form.height" :propScale="scale" :propIsCustom="form.is_custom_data == '1'" :propShowData="show_data" @url_event="url_event"></dataRendering>
+                            </view>
+                        </view>
+                    </template>
+                    <template v-else>
+                        <view :style="style_chunk_container">
+                            <view class="wh-auto ht-auto oh" :style="style_chunk_img_container">
+                                <dataRendering :propKey="propKey" :propCustomList="form.custom_list" :propIndex="0" :propConfigLoop="form.data_source_is_loop || '1'" :propFieldList="field_list" :propDataHeight="form.height" :propScale="scale" @url_event="url_event"></dataRendering>
+                            </view>
+                        </view>
+                    </template>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { common_styles_computer, common_img_computer, percentage_count, isEmpty, get_indicator_style, get_indicator_location_style, border_width } from '@/common/js/common/common.js';
+    import dataRendering from '@/components/diy/modules/custom/data-rendering.vue';
+    const app = getApp();
+    var system = app.globalData.get_system_info(null, null, true);
+    var sys_width = app.globalData.window_width_handle(system.windowWidth);
+
+    export default {
+        components: {
+            dataRendering
+        },
+        props: {
+            propValue: {
+                type: Object,
+                default: () => {
+                    return {};
+                },
+            },
+            propKey: {
+                type: [String, Number],
+                default: '',
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 1000000,
+            },
+            propIsCommonStyle: {
+                type: Boolean,
+                default: true,
+            },
+            propOuterContainerPadding: {
+                type: Number,
+                default: 0,
+            }
+        },
+        data() {
+            return {
+                form: {},
+                new_style: {},
+                scale: 1,
+                style_container: '',
+                style_img_container: '',
+                div_width: 0,
+                div_height: 0,
+                custom_list_length: 0,
+                source_list: {
+                    // 存放手动输入的id
+                    data_ids: [],
+                    // 手动输入
+                    data_list: [],
+                    // 自动
+                    data_auto_list: [],
+                },
+                data_source_content_list: [],
+                data_source: '',
+                // 内容样式
+                style_content_container: '',
+                style_content_img_container: '',
+                // 数据样式
+                style_chunk_container: '',
+                style_chunk_img_container: '',
+                // 指示器选中的下标
+                actived_index: 0,
+                // 轮播高度
+                swiper_height: 0,
+                swiper_width: 'width: 100%;',
+                // 指示器样式
+                indicator_location_style: '',
+                indicator_style: '',
+                slides_per_view: 1,
+                show_data: { data_key: 'id', data_name: 'name' },
+                old_data_style: {
+                    color_list: [{ color: 'rgb(244, 252, 255)', color_percentage: undefined }],
+                    direction: '180deg',
+                    background_img_style: '2',
+                    background_img: [],
+                    radius: 0,
+                    radius_top_left: 0,
+                    radius_top_right: 0,
+                    radius_bottom_left: 0,
+                    radius_bottom_right: 0,
+                    padding: 0,
+                    padding_top: 0,
+                    padding_bottom: 0,
+                    padding_left: 0,
+                    padding_right: 0,
+                    margin: 0,
+                    margin_top: 0,
+                    margin_bottom: 0,
+                    margin_left: 0,
+                    margin_right: 0,
+                },
+                content_outer_spacing_magin: '0rpx',
+                gap_width: '',
+                field_list: [],
+            };
+        },
+        watch: {
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        mounted() {
+            this.init();
+        },
+        methods: {
+            percentage_count,
+            isEmpty,
+            init() {
+                const new_form = this.propValue.content;
+                const new_style = this.propValue.style;
+                // 不包含新创建的数组时，将历史数据放到手动添加数组中
+                if (!Object.keys(new_form.data_source_content).includes('data_auto_list') && !Object.keys(new_form.data_source_content).includes('data_list')) {
+                    //深拷贝一下，保留历史数据
+                    const data = JSON.parse(JSON.stringify(new_form.data_source_content));
+                    new_form.data_source_content = this.source_list;
+                    // 如果老数组中有数据，将数据放到新数组中
+                    if (!isEmpty(data)) {
+                        new_form.data_source_content.data_list = [ data ];
+                    }
+                }
+                // 数据来源的内容
+                let list = [];
+                if (new_form.is_custom_data == '1') {
+                    if (Number(new_form.data_source_content.data_type) === 0) {
+                        list = new_form.data_source_content?.data_list || [];
+                    } else {
+                        list = !isEmpty(new_form.data_source_content) ? 
+                                new_form.data_source_content.data_auto_list.map(item => ({
+                                    id: Math.random(),
+                                    new_cover: [],
+                                    new_title: '',
+                                    data: item,
+                                })) : [];
+                    }
+                } else {
+                    list = new_form.data_source_content?.data_list || [];
+                } 
+                // 数组处理
+                const new_list = list.length > 0 ? this.get_list(list, new_form, new_style) : [];
+                // 初始化数据
+                const { common_style, data_content_style, data_style } = new_style;
+                // 外层左右间距
+                const outer_spacing = (common_style?.margin_left || 0) + (common_style?.margin_right || 0) + (common_style?.padding_left || 0) + (common_style?.padding_right || 0) + border_width(common_style);
+                // 内容左右间距
+                const content_spacing = (data_content_style?.margin_left || 0) + (data_content_style?.margin_right || 0) + (data_content_style?.padding_left || 0) + (data_content_style?.padding_right || 0) + border_width(data_content_style);
+                // 数据左右间距
+                const internal_spacing = (data_style?.margin_left || 0) + (data_style?.margin_right || 0) + (data_style?.padding_left || 0) + (data_style?.padding_right || 0) + border_width(data_style);
+                // 一行显示的数量
+                const carousel_col = Number(new_form.data_source_carousel_col);
+                // 数据间距
+                const data_spacing = ['vertical', 'horizontal'].includes(new_form.data_source_direction) ? new_style.column_gap * (carousel_col - 1) : 0;
+                // 自定义组件宽度
+                const width = sys_width - outer_spacing - content_spacing - internal_spacing - data_spacing - this.propOuterContainerPadding;
+                const new_data_style = !isEmpty(new_style.data_style) ? new_style.data_style : this.old_data_style;
+                const new_data_content_style = !isEmpty(new_style.data_content_style)? new_style.data_content_style : this.old_data_style;
+                // 判断是平移还是整屏滚动
+                const { padding_top = 0, padding_bottom = 0, margin_bottom = 0, margin_top = 0 } = new_data_style;
+                let swiper_height = 0;
+                const scale_number = width / 390;
+                const new_scale = scale_number > 0 ? scale_number : 0;
+                // 间距
+                const space_between = new_form.data_source_direction == 'horizontal' ? new_style.column_gap : new_style.row_gap;
+                let col = Number(new_form.data_source_carousel_col);
+                // 轮播图高度控制
+                if (new_form.data_source_direction == 'horizontal') {
+                    swiper_height = new_form.height * new_scale + padding_top + padding_bottom + margin_bottom + margin_top;
+                } else {
+                    // 商品数量大于列数的时候，高度是列数，否则是当前的数量
+                    col = new_list.length > carousel_col ? carousel_col : new_list.length;
+                    swiper_height = (new_form.height * new_scale + padding_top + padding_bottom + margin_bottom + margin_top) * col + ((Number(new_form.data_source_carousel_col) - 1) * space_between);
+                }
+                // 计算间隔的空间。(gap * gap数量) / 模块数量
+                let gap = (new_style.column_gap * (carousel_col - 1)) / carousel_col;
+                // 横向的时候，根据选择的行数和每行显示的个数来区分具体是显示多少个
+                const swiper_width = (new_form.data_source_direction == 'horizontal' && new_style.rolling_fashion != 'translation') ? `width: ${ 100 / carousel_col }%;`: 'width: 100%;';
+                this.setData({
+                    form: new_form,
+                    new_style: new_style,
+                    div_width: width,
+                    scale: new_scale,
+                    custom_list_length: new_form.custom_list.length - 1,
+                    style_container: this.propIsCommonStyle ? common_styles_computer(new_style.common_style) + 'box-sizing: border-box;' : '', // 用于样式显示
+                    style_img_container: this.propIsCommonStyle ? common_img_computer(new_style.common_style, this.propIndex) : '',
+                    style_content_container: common_styles_computer(new_data_content_style) + 'box-sizing: border-box;', // 用于样式显示
+                    style_content_img_container: common_img_computer(new_data_content_style),
+                    style_chunk_container: common_styles_computer(new_data_style) + 'box-sizing: border-box;', // 用于样式显示
+                    style_chunk_img_container: common_img_computer(new_data_style),
+                    style_chunk_width: width,
+                    div_height: new_form.height,
+                    data_source_content_list: new_list,
+                    data_source: !isEmpty(new_form.data_source)? new_form.data_source : '',
+                    indicator_style: get_indicator_style(new_style), // 指示器的样式
+                    indicator_location_style: get_indicator_location_style(new_style),
+                    swiper_height: swiper_height,
+                    swiper_width: swiper_width,
+                    content_outer_spacing_magin: space_between + 'px',
+                    gap_width: `width: calc(${100 / carousel_col}% - ${gap}px);`,
+                    slides_per_view: new_style.rolling_fashion == 'translation' ? (new_form.data_source_direction != 'horizontal' ? col : new_form.data_source_carousel_col ) : 1,
+                    show_data: new_form?.show_data || { data_key: 'id', data_name: 'name' },
+                    field_list: new_form?.field_list || [],
+                });
+            },
+            get_list(list, form, new_style) {
+                // 深拷贝一下，确保不会出现问题
+                const cloneList = JSON.parse(JSON.stringify(list));
+                if (new_style.rolling_fashion != 'translation' && form.data_source_direction != 'vertical') {
+                    // 如果是分页滑动情况下，根据选择的行数和每行显示的个数来区分具体是显示多少个
+                    if (cloneList.length > 0) {
+                        // 每页显示的数量
+                        const num = form.data_source_carousel_col;
+                        // 存储数据显示
+                        let nav_list = [];
+                        // 拆分的数量
+                        const split_num = Math.ceil(cloneList.length / num);
+                        for (let i = 0; i < split_num; i++) {
+                            nav_list.push({
+                                split_list: cloneList.slice(i * num, (i + 1) * num),
+                            });
+                        }
+                        return nav_list;
+                    } else {
+                        // 否则的话，就返回全部的信息
+                        return [
+                            {
+                                split_list: cloneList,
+                            },
+                        ];
+                    }
+                } else {
+                    // 存储数据显示
+                    let nav_list = [];
+                    cloneList.forEach((item) => {
+                        nav_list.push({
+                            split_list: [item],
+                        });
+                    });
+                    return nav_list;
+                }
+            },
+            slideChange(e) {
+                this.setData({
+                    actived_index: e.detail.current,
+                });
+            },
+            url_event(e, index, split_index) {
+                if (this.data_source == 'goods' && this.data_source_content_list.length > 0) {
+                    const list = this.data_source_content_list[index];
+                    if (!isEmpty(list) && !isEmpty(list.split_list[split_index])) {
+                        const new_list = list.split_list[split_index];
+                        if (!isEmpty(new_list)) {
+                            // 缓存商品数据
+                            app.globalData.goods_data_cache_handle(new_list.data.id, new_list.data);
+                        }
+                    }
+                }
+                app.globalData.url_open(e);
+            },
+        },
+    };
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/components/diy/data-magic.vue b/components/diy/data-magic.vue
new file mode 100644
index 0000000..1778d55
--- /dev/null
+++ b/components/diy/data-magic.vue
@@ -0,0 +1,434 @@
+<template>
+    <view class="img-magic" :style="'height:' + container_size + ';' + style_container">
+        <view class="magic-container w h pr" :style="style_img_container">
+            <view class="pr" :style="'width:calc(100% + ' + outer_spacing + ');height:calc(100% + ' + outer_spacing + ');margin:-' + spacing + ';'">
+                <!-- 风格9 -->
+                <template v-if="form.style_actived == 7">
+                    <view class="flex-row align-c jc-c style-size flex-wrap">
+                        <view v-for="(item, index) in data_magic_list" :key="index" :style="'margin:' + spacing + ';' + ([0, 1].includes(index) ? 'width:calc(50% - ' + outer_spacing + ');height:calc(50% - ' + outer_spacing + ')' : 'width:calc((100% / 3) - ' + outer_spacing + ');height:calc(50% - ' + outer_spacing + ')')" class="style9">
+                            <view class="w h flex-row" :style="item.data_style.background_style + content_radius">
+                                <view class="re flex-1 oh" :style="item.data_style.background_img_style">
+                                    <template v-if="item.data_content.data_type == 'goods'">
+                                        <view class="w h flex-col" :style="'gap:'+ item.data_style.title_data_gap * 2 + 'rpx;'">
+                                            <view v-if="(!isEmpty(item.data_content.heading_title) || !isEmpty(item.data_content.subtitle)) && [0, 1].includes(index)" :class="'tl' + (item.data_style.title_line == '1' ? ' flex-row align-c' : ' flex-col')" :style="'gap:' + item.data_style.title_gap * 2 + 'rpx;'">
+                                                <template v-if="item.data_content.heading_title_type && item.data_content.heading_title_type == 'image'">
+                                                    <view v-if="item.data_content.heading_title_img.length > 0" class="re oh" :style="'width:100%;height:' + (!isEmpty(item.data_style.heading_img_height) ? item.data_style.heading_img_height * magic_scale : 0) + 'px'">
+                                                        <image :src="item.data_content.heading_title_img[0].url" class="ht-auto max-w" mode="heightFix" />
+                                                    </view>
+                                                </template>
+                                                <template v-else>
+                                                    <view class="ma-0 w text-word-break text-line-1 flex-basis-shrink" :style="item.data_style.heading_style">{{ item.data_content.heading_title || '' }}</view>
+                                                </template>
+                                                <template v-if="item.data_content.subtitle_title_type && item.data_content.subtitle_title_type == 'image'">
+                                                    <view v-if="item.data_content.subtitle_title_img.length > 0" class="re oh" :style="'width:100%;height:' + (!isEmpty(item.data_style.subtitle_img_height) ? item.data_style.subtitle_img_height * magic_scale : 0) + 'px'">
+                                                        <image :src="item.data_content.subtitle_title_img[0].url" class="ht-auto max-w" mode="heightFix" />
+                                                    </view>
+                                                </template>
+                                                <template v-else>
+                                                    <view class="ma-0 w text-word-break text-line-1 flex-basis-shrink" :style="item.data_style.subtitle_style">{{ item.data_content.subtitle || '' }}</view>
+                                                </template>
+                                            </view>
+                                            <view class="w h flex-1 oh flex-row">
+                                                <magic-carousel class="flex-1" :propKey="propKey + index" :propValue="item" :propGoodStyle="item.data_style" :propActived="form.style_actived" propType="product" :propDataIndex="index" @onCarouselChange="carousel_change"></magic-carousel>
+                                            </view>
+                                        </view>
+                                    </template>
+                                    <template v-else-if="item.data_content.data_type == 'images'">
+                                        <view class="w h flex-1 oh flex-row">
+                                            <magic-carousel class="flex-1" :propKey="propKey + index" :propValue="item" propType="img" :propActived="form.style_actived" :propDataIndex="index" @onCarouselChange="carousel_change"></magic-carousel>
+                                        </view>
+                                    </template>
+                                    <template v-else-if="item.data_content.data_type == 'custom'">
+                                        <customIndex :propKey="propKey + index" :propValue="item" :propMagicScale="magic_scale" :propDataSpacing="new_style.image_spacing" :propDataIndex="index" @onCarouselChange="carousel_change"></customIndex>
+                                    </template>
+                                    <template v-else>
+                                        <videoIndex :propKey="propKey + index" :propValue="item.data_content" :propDataStyle="item.data_style"></videoIndex>
+                                    </template>
+                                    <view v-if="item.data_style.is_show == '1' && item.data_content.list.length > 1" :class="['left', 'right'].includes(item.data_style.indicator_new_location) ? 'indicator_up_down_location' : 'indicator_about_location'" :style="item.data_style.indicator_location_style">
+                                        <template v-if="item.data_style.indicator_style == 'num'">
+                                            <view :style="item.data_style.indicator_styles" class="dot-item">
+                                                <text class="num-active" :style="{ color: item.data_style.actived_color }">{{ item.actived_index + 1 }}</text
+                                                ><text>/{{ item.data_content.list.length }}</text>
+                                            </view>
+                                        </template>
+                                        <template v-else>
+                                            <view v-for="(item3, index3) in item.data_content.list" :key="index3" :style="item.data_style.indicator_styles + style_actived_color(item, index3)" class="dot-item" />
+                                        </template>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </template>
+                <template v-else>
+                    <view v-for="(item, index) in data_magic_list" :key="index" class="cr-main cube-selected" :style="selected_style(item) + ';margin:' + spacing + ';'">
+                        <view class="w h flex-row" :style="item.data_style.background_style + content_radius">
+                            <view class="re flex-1 oh" :style="item.data_style.background_img_style">
+                                <template v-if="item.data_content.data_type == 'goods'">
+                                    <view class="w h flex-col" :style="'gap:'+ item.data_style.title_data_gap * 2 + 'rpx;'">
+                                        <view v-if="!isEmpty(item.data_content.heading_title) || !isEmpty(item.data_content.subtitle)" :class="'tl' + (item.data_style.title_line == '1' ? ' flex-row align-c' : ' flex-col')" :style="'gap:' + item.data_style.title_gap * 2 + 'rpx;'">
+                                            <template v-if="item.data_content.heading_title_type && item.data_content.heading_title_type == 'image'">
+                                                <view v-if="item.data_content.heading_title_img.length > 0" class="re oh" :style="'width:100%;height:' + (!isEmpty(item.data_style.heading_img_height) ? item.data_style.heading_img_height * magic_scale : 0) + 'px'">
+                                                    <image :src="item.data_content.heading_title_img[0].url" class="ht-auto max-w" mode="heightFix" />
+                                                </view>
+                                            </template>
+                                            <template v-else>
+                                                <view class="ma-0 w text-word-break text-line-1 flex-basis-shrink" :style="item.data_style.heading_style">{{ item.data_content.heading_title || '' }}</view>
+                                            </template>
+                                            <template v-if="item.data_content.subtitle_title_type && item.data_content.subtitle_title_type == 'image'">
+                                                <view v-if="item.data_content.subtitle_title_img.length > 0" class="re oh" :style="'width:100%;height:' + (!isEmpty(item.data_style.subtitle_img_height) ? item.data_style.subtitle_img_height * magic_scale : 0) + 'px'">
+                                                    <image :src="item.data_content.subtitle_title_img[0].url" class="ht-auto max-w" mode="heightFix" />
+                                                </view>
+                                            </template>
+                                            <template v-else>
+                                                <view class="ma-0 w text-word-break text-line-1 flex-basis-shrink" :style="item.data_style.subtitle_style">{{ item.data_content.subtitle || '' }}</view>
+                                            </template>
+                                        </view>
+                                        <view class="w h oh flex-row">
+                                            <magic-carousel class="flex-1" :propKey="propKey + index" :propValue="item" :propGoodStyle="item.data_style" propType="product" :propActived="form.style_actived" :propDataIndex="index"  @onCarouselChange="carousel_change"></magic-carousel>
+                                        </view>
+                                    </view>
+                                </template>
+                                <template v-else-if="item.data_content.data_type == 'images'">
+                                    <view class="w h oh flex-row">
+                                        <magic-carousel class="flex-1" :propKey="propKey + index" :propValue="item" propType="img" :propActived="form.style_actived" :propDataIndex="index"  @onCarouselChange="carousel_change"></magic-carousel>
+                                    </view>
+                                </template>
+                                <template v-else-if="item.data_content.data_type == 'custom'">
+                                    <customIndex :propKey="propKey + index" :propValue="item" :propMagicScale="magic_scale" :propDataSpacing="new_style.image_spacing" :propDataIndex="index" @onCarouselChange="carousel_change"></customIndex>
+                                </template>
+                                <template v-else>
+                                    <videoIndex :propKey="propKey + index" :propValue="item.data_content" :propDataStyle="item.data_style"></videoIndex>
+                                </template>
+                                <view v-if="item.data_style.is_show == '1' && item.data_content.list.length > 1" :class="['left', 'right'].includes(item.data_style.indicator_new_location) ? 'indicator_up_down_location' : 'indicator_about_location'" :style="item.data_style.indicator_location_style">
+                                    <template v-if="item.data_style.indicator_style == 'num'">
+                                        <view :style="item.data_style.indicator_styles" class="dot-item">
+                                            <text class="num-active" :style="{ color: item.data_style.actived_color }">{{ item.actived_index + 1 }}</text>
+                                            <text>/{{ item.data_content.list.length }}</text>
+                                        </view>
+                                    </template>
+                                    <template v-else>
+                                        <view v-for="(item3, index3) in item.data_content.list" :key="index3" :style="item.data_style.indicator_styles + style_actived_color(item, index3)" class="dot-item" />
+                                    </template>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </template>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import magicCarousel from '@/components/diy/modules/data-magic/magic-carousel.vue';
+    import customIndex from '@/components/diy/modules/data-magic/custom/index.vue';
+    import videoIndex from '@/components/diy/modules/data-magic/video/index.vue';
+    import { background_computer, common_styles_computer, common_img_computer, gradient_computer, radius_computer, percentage_count, isEmpty, padding_computer, margin_computer, old_border_and_box_shadow, old_margin, old_padding, box_shadow_computer, border_computer, get_indicator_location_style, get_indicator_style, border_width } from '@/common/js/common/common.js';
+    var system = app.globalData.get_system_info(null, null, true);
+    var sys_width = app.globalData.window_width_handle(system.windowWidth);
+    export default {
+        components: {
+            magicCarousel,
+            customIndex,
+            videoIndex
+        },
+        props: {
+            propValue: {
+                type: Object,
+                default: () => ({}),
+            },
+            propKey: {
+                type: [String, Number],
+                default: '',
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 1000000,
+            },
+            propOuterContainerPadding: {
+                type: Number,
+                default: 0,
+            }
+        },
+        data() {
+            return {
+                form: {},
+                new_style: {},
+                outer_spacing: '',
+                // 图片间距设置
+                spacing: '',
+                // 内容圆角设置
+                content_radius: '',
+                // 图片圆角设置
+                // content_img_radius: '',
+                data_magic_list: [],
+                cubeCellWidth: 0,
+                container_size: 0,
+                style_container: '',
+                style_img_container: '',
+                div_width: 0,
+                magic_scale: 1,
+                // is_unlimited_size: false,
+            };
+        },
+        computed: {
+            // 根据当前页面大小计算成百分比
+            selected_style() {
+                return (item) => {
+                    return `overflow: hidden;width: calc(${this.percentage(this.getSelectedWidth(item))} - ${this.outer_spacing} ); height: calc(${this.percentage(this.getSelectedHeight(item))} - ${this.outer_spacing} ); top: ${this.percentage(this.getSelectedTop(item))}; left: ${this.percentage(this.getSelectedLeft(item))};`;
+                };
+            },
+            style_actived_color() {
+                return (item, index) => {
+                    return item.actived_index == index ? `background: ${item.data_style.actived_color};` : '';
+                };
+            },
+        },
+        watch: {
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        mounted() {
+            this.init();
+        },
+        methods: {
+            isEmpty,
+            init() {
+                const new_form = this.propValue.content;
+                const new_style = this.propValue.style;
+                const container_height = !isEmpty(new_form.container_height) ? new_form.container_height : sys_width;
+                const density = !isEmpty(new_form.magic_cube_density) ? new_form.magic_cube_density : 4;
+                const { margin_left, margin_right } = new_style.common_style;
+                const width = sys_width - margin_left - margin_right - border_width(new_style.common_style) - this.propOuterContainerPadding;
+                this.setData({
+                    form: new_form,
+                    new_style: new_style,
+                    outer_spacing: new_style.image_spacing * 2 + 'rpx',
+                    spacing: new_style.image_spacing + 'rpx',
+                    content_radius: radius_computer(new_style.data_radius),
+                    // content_img_radius: radius_computer(new_style.img_radius),
+                    data_magic_list: this.get_data_magic_list(new_form.data_magic_list, new_style),
+                    style_container: common_styles_computer(new_style.common_style) + 'box-sizing: border-box;', // 用于样式显示
+                    style_img_container: common_img_computer(new_style.common_style, this.propIndex),
+                    magic_scale: width / 390,
+                    div_width: sys_width,
+                    cubeCellWidth: sys_width / density,
+                    container_size: container_height * (width / 390) + 'px',
+                });
+            },
+            get_data_magic_list(data, new_style) {
+                data.forEach((item) => {
+                    const data_content = item.data_content;
+                    const data_style = item.data_style;
+                    item.actived_index = 0;
+                    // 指示器样式
+                    data_style.indicator_styles = get_indicator_style(data_style);
+                    data_style.indicator_location_style = get_indicator_location_style(data_style);
+                    // 获取当前的margin
+                    const chunk_margin = data_style?.chunk_margin || old_margin;
+                    // 计算左右间距
+                    const left_right_width_margin = (chunk_margin?.margin_left || 0) + (chunk_margin?.margin_right || 0);
+                    // 计算上下间距
+                    const top_bottom_height_margin = (chunk_margin?.margin_top || 0) + (chunk_margin?.margin_bottom || 0);
+                    data_style.background_style = gradient_computer(data_style) + margin_computer(data_style?.chunk_margin || old_margin) + `width: calc(100% - ${ left_right_width_margin }px);height:calc(100% - ${ top_bottom_height_margin }px);` + box_shadow_computer(data_style?.data_common_style || old_border_and_box_shadow) + border_computer(data_style?.data_common_style || old_border_and_box_shadow);
+                    data_style.background_img_style = background_computer(data_style) + padding_computer(data_style?.chunk_padding || old_padding);
+                    // 商品价格处理
+                    data_style.goods_price_symbol_style = this.goods_trends_config(data_style, 'price_symbol');
+                    data_style.goods_price_unit_style = this.goods_trends_config(data_style, 'price_unit');
+
+                    let fit = '';
+                    if (data_content.img_fit == 'contain') {
+                        fit = 'aspectFit';
+                    } else if (data_content.img_fit =='fill') {
+                        fit = 'scaleToFill';
+                    } else if (data_content.img_fit == 'cover') {
+                        fit = 'aspectFill';
+                    } 
+                    data_content.fit = fit;
+                    // 商品名称和价格样式
+                    data_style.goods_title_style = this.goods_trends_config(data_style, 'title') + `line-height: ${ (item.data_style.goods_title_size + 3) * 2 }rpx;height: ${ (item.data_style.goods_title_size + 3) * 2 }rpx;`;
+                    data_style.goods_price_style = this.goods_trends_config(data_style, 'price') + `line-height: ${ item.data_style.goods_price_size * 2 }rpx;height: ${ (item.data_style.goods_title_size + 3) * 2 }rpx;`;
+                    const radius = !isEmpty(data_style.img_radius) ? data_style.img_radius : { radius: 4, radius_top_left: 4, radius_top_right: 4, radius_bottom_left: 4, radius_bottom_right: 4 };
+                    data_style.get_img_radius = radius_computer(radius);
+
+                    data_style.chunk_padding_data = padding_computer(data_style.chunk_padding) + 'box-sizing: border-box;';
+                    data_style.heading_style = this.trends_config(data_style, 'heading');
+                    data_style.subtitle_style = this.trends_config(data_style, 'subtitle');
+
+                    if (data_content.data_type == 'goods') {
+                        data_content.list = this.commodity_list(data_content.goods_list, data_content.goods_num, data_content, data_style);
+                    } else if (data_content.data_type == 'custom' && ['vertical-scroll', 'horizontal'].includes(data_content.data_source_direction)) {
+                        // 是自定义并且是轮播状态的时候，添加数据
+                        const list = this.data_source_content_list(data_content);
+                        const carousel_col = data_content?.data_source_carousel_col || 1;
+                        const num = new_style.rolling_fashion == 'translation' ? list.length : Math.ceil(list.length / carousel_col);
+                        data_content.list = Array(num);
+                    } else {
+                        data_content.list = data_content.images_list;
+                    }
+                });
+                return data;
+            },
+            // 数据来源的内容
+            data_source_content_list(data_content){
+                if (data_content.is_custom_data == '1') {
+                    if (Number(data_content.data_source_content.data_type) === 0) {
+                        return data_content.data_source_content.data_list;
+                    } else {
+                        return data_content.data_source_content.data_auto_list.map((item) => ({
+                            id: Math.random(),
+                            new_cover: [],
+                            new_title: '',
+                            data: item,
+                        }));
+                    }
+                } else {
+                    return data_content.data_source_content.data_list;
+                }
+            },
+            /*
+             ** 组装产品的数据
+             ** @param {Array} list 商品列表
+             ** @param {Number} num 显示数量
+             ** @return {Array}
+             */
+            commodity_list(list, num, data_content, data_style) {
+                if (list.length > 0) {
+                    // 深拷贝一下，确保不会出现问题
+                    const goods_list = JSON.parse(JSON.stringify(list)).map((item) => ({
+                        ...item.data,
+                        title: !isEmpty(item.new_title) ? item.new_title : item.data.title,
+                        new_cover: item.new_cover,
+                    }));
+                    // 存储数据显示
+                    let nav_list = [];
+                    // 如果是滑动，需要根据每行显示的个数来区分来拆分数据  translation 表示的是平移
+                    if (data_style.rolling_fashion != 'translation') {
+                        // 拆分的数量
+                        const split_num = Math.ceil(goods_list.length / num);
+                        for (let i = 0; i < split_num; i++) {
+                            nav_list.push({ split_list: goods_list.slice(i * num, (i + 1) * num) });
+                        }
+                        return nav_list;
+                    } else {
+                        return this.rotation_calculation(goods_list, num, data_content, data_style);
+                    }
+                } else {
+                    return [];
+                }
+            },
+            rotation_calculation(list, num, data_content, data_style)  {
+                // 存储数据显示
+                let nav_list = [];
+                const goods_outerflex = data_content.goods_outerflex;
+                const rotation_direction = data_style.rotation_direction;
+                // 如果是商品是横排的，轮播也是横排的，就不对商品进行拆分/如果商品是竖排的，轮播也是竖排的，不对商品进行拆分
+                if ((goods_outerflex == 'row' && rotation_direction == 'horizontal') || (goods_outerflex == 'col' && rotation_direction == 'vertical')) {
+                    list.forEach((item) => {
+                        nav_list.push({
+                            split_list: [item],
+                        });
+                    });
+                } else {
+                    // 拆分的数量
+                    const split_num = Math.ceil(list.length / num);
+                    for (let i = 0; i < split_num; i++) {
+                        nav_list.push({ split_list: list.slice(i * num, (i + 1) * num) });
+                    }
+                    return nav_list;
+                }
+                return nav_list;
+            },
+            getSelectedWidth(item) {
+                return (item.end.x - item.start.x + 1) * this.cubeCellWidth;
+            },
+            //计算选中层的高度。
+            getSelectedHeight(item) {
+                return (item.end.y - item.start.y + 1) * this.cubeCellWidth;
+            },
+            //计算选中层的右边距离。
+            getSelectedTop(item) {
+                return (item.start.y - 1) * this.cubeCellWidth;
+            },
+            //计算选中层的左边距离。
+            getSelectedLeft(item) {
+                return (item.start.x - 1) * this.cubeCellWidth;
+            },
+            // 计算成百分比
+            percentage(num) {
+                return percentage_count(num, this.div_width);
+            },
+            goods_trends_config(style, key) {
+                return this.text_style(style[`goods_${key}_typeface`], style[`goods_${key}_size`], style[`goods_${key}_color`]);
+            },
+            // 根据传递的参数，从对象中取值
+            trends_config(style, key) {
+                return this.text_style(style[`${key}_typeface`], style[`${key}_size`], style[`${key}_color`]);
+            },
+            text_style(typeface, size, color) {
+                return `font-weight:${typeface}; font-size: ${size * 2}rpx; color: ${color};`;
+            },
+            carousel_change(actived_index, index) {
+                if (this.data_magic_list[index]) {
+                    this.data_magic_list[index].actived_index = actived_index;
+                }
+            },
+        },
+    };
+</script>
+
+<style lang="scss" scoped>
+    // 图片魔方是一个正方形，根据宽度计算高度
+    .img-magic {
+        overflow: hidden;
+    }
+    .cube-selected {
+        position: absolute;
+        text-align: center;
+        box-sizing: border-box;
+    }
+    .text-line-1 {
+        word-break: break-word;
+        overflow-wrap: break-word;
+        word-wrap: break-word;
+    }
+    .style-size {
+        height: 100%;
+        width: 100%;
+        .style9 {
+            position: relative;
+            overflow: hidden;
+        }
+    }
+    .dot-center {
+        left: 50%;
+        transform: translateX(-50%);
+    }
+    .dot-right {
+        right: 0;
+    }
+    .dot {
+        z-index: 3;
+        .dot-item {
+            margin: 0 6rpx;
+        }
+    }
+    .gap-20 {
+        gap: 40rpx;
+    }
+    .w {
+        width: 100%;
+    }
+    .h {
+        height: 100%;
+    }
+    .flex-basis-shrink {
+        flex-basis: content;
+        flex-shrink: 1;
+    }
+</style>
diff --git a/components/diy/data-tabs.vue b/components/diy/data-tabs.vue
new file mode 100644
index 0000000..a1eccfe
--- /dev/null
+++ b/components/diy/data-tabs.vue
@@ -0,0 +1,334 @@
+<template>
+    <view class="data-tabs ou" :class="'data-tabs-' + propKey" :style="style_container">
+        <view class="ou" :style="style_img_container">
+            <componentDiyModulesTabsView :propKey="propKey" :propValue="data_tabs" :propIsTop="top_up == '1'" :propTop="sticky_top" :propStyle="tabs_style" :propsTabsContainer="tabs_container" :propsTabsImgContainer="tabs_img_container" :propCustomNavHeight="propIsTabsUseSafeDistance ? (propCustomNavHeight * 2 + 'rpx') : '0rpx'" :propTabsSlidingFixedBg="tabs_sliding_fixed_bg" :propTabsBackground="tabs_background" @onTabsTap="tabs_click_event"></componentDiyModulesTabsView>
+            <view :style="data_margin_top">
+                <view :style="data_container">
+                    <view :style="data_img_container">
+                        <template v-if="tabs_data_type == 'goods'">
+                            <view class="oh" :style="data_content_container">
+                                <view class="oh" :style="data_content_img_container">
+                                    <componentGoodsList ref="diy_goods_list" :propKey="diy_key" :propDiyIndex="propDiyIndex" :propValue="tabs_list" :propIsCommonStyle="false" @goods_buy_event="goods_buy_event"></componentGoodsList>
+                                </view>
+                            </view>
+                        </template>
+                        <template v-else-if="tabs_data_type == 'article'">
+                            <view class="oh" :style="data_content_container">
+                                <view class="oh" :style="data_content_img_container">
+                                    <componentArticleList :propKey="diy_key" :propValue="tabs_list" :propIsCommonStyle="false"></componentArticleList>
+                                </view>
+                            </view>
+                        </template>
+                        <template v-else-if="tabs_data_type == 'custom'">
+                            <componentCustomList :propKey="diy_key" :propValue="tabs_list" :propOuterContainerPadding="outer_container_width" :propIsCommonStyle="false"></componentCustomList>
+                        </template>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import { common_styles_computer, common_img_computer, padding_computer, margin_computer, background_computer, gradient_computer, isEmpty, old_border_and_box_shadow, old_margin, old_radius, old_padding, border_computer, box_shadow_computer, radius_computer, get_math } from '@/common/js/common/common.js';
+    import componentDiyModulesTabsView from '@/components/diy/modules/tabs-view';
+    import componentGoodsList from '@/components/diy/goods-list';
+    import componentArticleList from '@/components/diy/article-list';
+    import componentCustomList from '@/components/diy/custom';
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        components: {
+            componentDiyModulesTabsView,
+            componentGoodsList,
+            componentArticleList,
+            componentCustomList,
+        },
+        props: {
+            propValue: {
+                type: Object,
+                default: () => ({}),
+            },
+            propTop: {
+                type: Number,
+                default: 0,
+            },
+            propCustomNavHeight: {
+                type: Number,
+                default: 33,
+            },
+            propScrollTop: {
+                type: Number,
+                default: 0,
+            },
+            // 顶部导航是否开启沉浸模式
+            propIsImmersionModel: {
+                type: Boolean,
+                default: false,
+            },
+            propKey: {
+                type: [String, Number],
+                default: '',
+            },
+            propDiyIndex: {
+                type: Number,
+                default: 0,
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 0,
+            },
+            // 选项卡是否使用安全距离
+            propIsTabsUseSafeDistance: {
+                type: Boolean,
+                default: true
+            }
+        },
+        data() {
+            return {
+                style_container: '',
+                style_img_container: '',
+                data_tabs: {},
+                tabs_list: {},
+                // 是否滑动置顶
+                top_up: '0',
+                tabs_top: 0,
+                tabs_background: 'background:transparent',
+                custom_nav_height: 33,
+                diy_key: '',
+                // 选项卡背景设置
+                tabs_container: '',
+                tabs_img_container: '',
+                // 商品区域背景设置
+                data_margin_top: '',
+                data_container: '',
+                data_img_container: '',
+                // #ifdef MP
+                nav_safe_space: bar_height + 5,
+                // #endif
+                // #ifdef H5 || MP-TOUTIAO
+                nav_safe_space: bar_height + 7,
+                // #endif
+                // #ifdef APP
+                nav_safe_space: bar_height + 0,
+                // #endif
+                tabs_style: '',
+                // 选项卡默认数据
+                tabs_index: 0,
+                sticky_top: 0,
+                tabs_data_type: 'goods',
+                outer_container_width: 0,
+                // 数据样式
+                data_content_container: '',
+                data_content_img_container: '',
+                tabs_sliding_fixed_bg: '',
+                // 滑动固定的背景
+                tabs_sliding_fixed_bg: '',
+                data_content_style: {
+                    color_list: [{ color: '', color_percentage: undefined }],
+                    direction: '180deg',
+                    background_img_style: '2',
+                    background_img: [],
+                    radius: 0,
+                    radius_top_left: 0,
+                    radius_top_right: 0,
+                    radius_bottom_left: 0,
+                    radius_bottom_right: 0,
+                    padding: 0,
+                    padding_top: 0,
+                    padding_bottom: 0,
+                    padding_left: 0,
+                    padding_right: 0,
+                    margin: 0,
+                    margin_top: 0,
+                    margin_bottom: 0,
+                    margin_left: 0,
+                    margin_right: 0,
+                    // 边框样式
+                    border_is_show: '0',
+                    border_color: '#FF3F3F',
+                    border_style: 'solid',
+                    border_size: {
+                        padding: 1,
+                        padding_top: 1,
+                        padding_right: 1,
+                        padding_bottom: 1,
+                        padding_left: 1,
+                    },
+                    // 阴影
+                    box_shadow_color: '',
+                    box_shadow_x: 0,
+                    box_shadow_y: 0,
+                    box_shadow_blur: 0,
+                    box_shadow_spread: 0,
+                }
+            };
+        },
+        watch: {
+            propScrollTop(newVal) {
+                if (newVal + this.sticky_top + this.custom_nav_height > this.tabs_top + this.nav_safe_space && this.top_up == '1') {
+                    let new_style = this.propValue.style || {};
+                    let tabs_bg = new_style.common_style.color_list;
+                    let new_tabs_background = '';
+                    if (tabs_bg.length > 0 && (tabs_bg[0].color || null) != null) {
+                        new_tabs_background = gradient_computer(new_style.common_style);
+                    }
+                    let new_tabs_background_img = background_computer(new_style.common_style);
+                    if (new_tabs_background_img.length > 0) {
+                        new_tabs_background_img += 'background-position: top left;';
+                    }
+                    this.tabs_background = (new_tabs_background.length > 0 ? new_tabs_background : 'background:#fff;') + new_tabs_background_img;
+                } else {
+                    this.tabs_background = 'background:transparent';
+                }
+            },
+            propTop(val) {
+                this.init();
+            },
+            propKey(val) {
+                // 初始化
+                this.setData({
+                    diy_key: val,
+                });
+                this.init();
+            },
+        },
+        created() {
+            this.init();
+        },
+        mounted() {
+            this.$nextTick(() => {
+                const self = this;
+                setTimeout(() => {
+                    self.getTop();
+                });
+                // #ifdef H5 || MP-TOUTIAO
+                // 获取自定义导航栏高度
+                this.setData({
+                    custom_nav_height: this.propCustomNavHeight,
+                });
+                // #endif
+            });
+        },
+        methods: {
+            init() {
+                let new_data = typeof this.propValue == 'string' ? JSON.parse(JSON.stringify(this.propValue)) : this.propValue;
+                const new_content = new_data.content || {};
+                const new_style = new_data.style || {};
+                // 公共样式
+                const common_style = new_style.common_style;
+                let tabs_style_obj = {
+                    padding_top: (common_style.padding_top - this.propCustomNavHeight) < 0 ? 0 : common_style.padding_top - this.propCustomNavHeight,
+                    padding_left: common_style.padding_left,
+                    padding_right: common_style.padding_right,
+                };
+                let new_tabs_style = padding_computer(tabs_style_obj) + `position:relative;left: -${tabs_style_obj.padding_left * 2}rpx;right: -${tabs_style_obj.padding_right * 2}rpx;width:100%;`;
+                // 如果是历史数据的话，就执行默认添加下边距
+                if (isEmpty(new_style.tabs_padding)) {
+                    new_tabs_style += 'padding-bottom: 20rpx;';
+                }
+
+                const { tabs_bg_color_list = [], tabs_bg_direction = '', tabs_bg_background_img_style = '', tabs_bg_background_img = [], tabs_radius = old_radius, tabs_padding = old_padding, data_content_color_list = [], data_content_direction = '', data_content_background_img_style = '', data_content_background_img = [], data_content_margin = old_margin, data_content_padding = old_padding, data_content_radius = old_radius } = new_style;
+                // 选项卡背景设置
+                const tabs_data = {
+                    color_list: tabs_bg_color_list,
+                    direction: tabs_bg_direction,
+                    background_img_style: tabs_bg_background_img_style,
+                    background_img: tabs_bg_background_img,
+                };
+                // 商品区域背景设置
+                const data_content_data = {
+                    color_list: data_content_color_list,
+                    direction: data_content_direction,
+                    background_img_style: data_content_background_img_style,
+                    background_img: data_content_background_img,
+                };
+                const data_content = new_style?.data_content || old_border_and_box_shadow;
+                const tabs_content = new_style?.tabs_content || old_border_and_box_shadow;
+                
+                //显示的数据处理
+                this.tabs_click_event(0);
+                this.setData({
+                    top_up: new_content.tabs_top_up,
+                    sticky_top: this.propTop + (new_style?.tabs_margin?.margin_top || 0),
+                    data_tabs: new_data,
+                    // 自定义需要做等比缩放，因此宽度需要减去 外层通用的宽度和内容区域的宽度
+                    outer_container_width: common_style.margin_left + common_style.margin_right + common_style.padding_left + common_style.padding_right + new_style.data_content_margin.margin_left + new_style.data_content_margin.margin_right + new_style.data_content_padding.padding_left + new_style.data_content_padding.padding_right,
+                    style_container: common_styles_computer(common_style),
+                    style_img_container: common_img_computer(common_style, this.propIndex),
+                    tabs_style: new_tabs_style,
+                    tabs_sliding_fixed_bg: gradient_computer(tabs_data),
+                    tabs_container: gradient_computer(tabs_data) + radius_computer(tabs_radius) + margin_computer(new_style?.tabs_margin || old_margin) + border_computer(tabs_content) + box_shadow_computer(tabs_content) + 'overflow: hidden;',
+                    tabs_img_container: background_computer(tabs_data) + padding_computer(tabs_padding) + 'box-sizing: border-box;overflow: hidden;',
+                    data_margin_top: 'margin-top:' + (new_style?.data_content_spacing || 0) * 2 + 'rpx;',
+                    data_container: gradient_computer(data_content_data) + margin_computer(data_content_margin) + radius_computer(data_content_radius) + box_shadow_computer(data_content) + border_computer(data_content) + 'overflow: hidden;',
+                    data_img_container: background_computer(data_content_data) + padding_computer(data_content_padding) + 'box-sizing: border-box;overflow: hidden;',
+                });
+            },
+            tabs_click_event(index) {
+                let new_data = JSON.parse(JSON.stringify(this.propValue));
+                // 显示的数据处理
+                const tabs_data_list = new_data.content.tabs_list[index] || {};
+                const tabs_data_type = tabs_data_list?.tabs_data_type || '';
+                let tabs_list = {};
+                // 内容样式
+                let data_content_container = '';
+                let data_content_img_container = '';
+                if (tabs_data_type === 'goods') {
+                    tabs_list = tabs_data_list.goods_config;
+                    const new_style = tabs_data_list.goods_config.style;
+                    // 内容样式
+                    data_content_container = common_styles_computer(new_style?.data_content_style || this.data_content_style);
+                    data_content_img_container = common_img_computer(new_style?.data_content_style || this.data_content_style);
+                } else if (tabs_data_type === 'article') {
+                    tabs_list = tabs_data_list.article_config;
+                    const new_style = tabs_data_list.article_config.style;
+                    // 内容样式
+                    data_content_container = common_styles_computer(new_style?.data_content_style || this.data_content_style);
+                    data_content_img_container = common_img_computer(new_style?.data_content_style || this.data_content_style);
+                } else if (tabs_data_type === 'custom') {
+                    tabs_list = tabs_data_list.custom_config;
+                }
+                this.setData({
+                    tabs_data_type: tabs_data_type,
+                    tabs_index: index,
+                    tabs_list: tabs_list,
+                    data_content_container: data_content_container,
+                    data_content_img_container: data_content_img_container,
+                    diy_key: get_math(),
+                });
+            },
+            // 获取商品距离顶部的距离
+            getTop() {
+                const query = uni.createSelectorQuery().in(this);
+                query
+                    .select('.data-tabs-' + this.propKey)
+                    .boundingClientRect((res) => {
+                        if ((res || null) != null) {
+                            let new_data = typeof this.propValue == 'string' ? JSON.parse(JSON.stringify(this.propValue)) : this.propValue;
+                            const new_style = new_data.style || {};
+                            this.setData({
+                                tabs_top: res.top - (new_style.common_style?.margin_top || 0),
+                            });
+                        }
+                    })
+                    .exec();
+            },
+            goods_buy_event(index, goods = {}, params = {}, back_data = null) {
+                this.$emit('goods_buy_event', index, goods, params, back_data);
+            },
+            goods_cart_back_event(e) {
+                if ((this.$refs.diy_goods_list || null) != null) {
+                    this.$refs.diy_goods_list.goods_cart_back_event(e);
+                }
+            },
+        },
+    };
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/components/diy/diy.vue b/components/diy/diy.vue
new file mode 100644
index 0000000..14c6cc8
--- /dev/null
+++ b/components/diy/diy.vue
@@ -0,0 +1,784 @@
+<template>
+    <view :style="page_style">
+        <view :style="page_img_style">
+            <scroll-view :scroll-y="true" class="ht" @scroll="on_scroll_event" @scrolltolower="on_scroll_lower_event" @scrolltoupper="on_scroll_upper_event" lower-threshold="60" scroll-with-animation="true">
+                <!-- 头部小程序兼容 -->
+                <view class="pr header">
+                    <componentDiyHeader :propKey="header_data.id" :propValue="header_data.com_data" :propScrollTop="head_scroll_top" @onImmersionModelCallBack="immersion_model_call_back" @onLocationBack="choice_location_back"></componentDiyHeader>
+                </view>
+                <view :style="content_padding">
+                    <view class="content flex-col" :style="'padding-top:calc(' + (temp_is_header_top ? temp_header_top + temp_sticky_top + 'px)' : '0px)')">
+                        <view v-for="item in tabs_data" :key="item.key">
+                            <template v-if="item.is_enable == '1'">
+                                <componentDiyTabs v-if="item.key == 'tabs'" :propIndex="is_immersive_style_and_general_safe_distance_value ? item.index : -1" :propContentPadding="content_padding" :propValue="item.com_data" :propTop="get_tabs_data_prop_top" :propStickyTop="get_tabs_data_prop_sticky_top" :propIsImmersionModel="is_immersion_model && is_the_safe_distance_enabled && item.com_data.content.tabs_top_up == '1'" :propNavIsTop="is_header_top" :propTabsIsTop="true" @onComputerHeight="tabs_height_event" @onTabsTap="tabs_click_event"></componentDiyTabs>
+                                <componentDiyTabsCarousel v-else-if="item.key == 'tabs-carousel'" :propIndex="is_immersive_style_and_general_safe_distance_value ? item.index : -1" :propContentPadding="content_padding" :propValue="item.com_data" :propTop="get_tabs_data_prop_top" :propStickyTop="get_tabs_data_prop_sticky_top" :propIsImmersionModel="is_immersion_model && is_the_safe_distance_enabled" :propScrollTop="scroll_top" :propTabsIsTop="true" @onComputerHeight="tabs_height_event" @onTabsTap="tabs_click_event" @onVideoPlay="video_play"></componentDiyTabsCarousel>
+                            </template>
+                        </view>
+                        <template v-if="is_tabs_type">
+                            <template v-if="diy_data.length > 0">
+                                <view v-for="(item, index) in diy_data" :key="index" :style="'margin-top:' + (['float-window'].includes(item.key) ? '0rpx;z-index:1' : -(item.com_data.style.common_style.floating_up * 2 || 0) + 'rpx;z-index:' + (!isEmpty(item.com_data.style.common_style.module_z_index) ? item.com_data.style.common_style.module_z_index : 0))">
+                                    <!-- 基础组件 -->
+                                    <template v-if="item.is_enable == '1'">
+                                        <componentDiySearch v-if="item.key == 'search'" :propIndex="get_prop_index(item)" :propKey="item.id + index" :propValue="item.com_data"></componentDiySearch>
+                                        <componentDiyCarousel v-else-if="item.key == 'carousel'" :propOuterContainerPadding="outer_container_padding" :propIndex="get_prop_index(item)" :propKey="item.id + index" :propValue="item.com_data" @onVideoPlay="video_play"></componentDiyCarousel>
+                                        <componentDiyNavGroup v-else-if="item.key == 'nav-group'" :propIndex="get_prop_index(item)" :propKey="item.id + index" :propValue="item.com_data"></componentDiyNavGroup>
+                                        <componentDiyUserInfo v-else-if="item.key == 'user-info'" :propIndex="get_prop_index(item)" :propKey="item.id + index" :propValue="item.com_data"></componentDiyUserInfo>
+                                        <componentDiyNotice v-else-if="item.key == 'notice'" :propIndex="get_prop_index(item)" :propKey="item.id + index" :propValue="item.com_data"></componentDiyNotice>
+                                        <componentDiyVideo v-else-if="item.key == 'video'" :propIndex="get_prop_index(item)" :propKey="item.id + index" :propValue="item.com_data"></componentDiyVideo>
+                                        <componentDiyArticleList v-else-if="item.key == 'article-list'" :propIndex="get_prop_index(item)" :propKey="item.id + index" :propValue="item.com_data"></componentDiyArticleList>
+                                        <componentDiyArticleTabs v-else-if="item.key == 'article-tabs'" :propIndex="get_prop_index(item)" :propKey="item.id + index" :propValue="item.com_data" :propTop="get_diy_prop_top(item.com_data)" :propScrollTop="scroll_top" :propCustomNavHeight="get_diy_custom_nav_height(item.com_data)" :propIsTabsUseSafeDistance="getPropIsTabsUseSafeDistance"></componentDiyArticleTabs>
+                                        <componentDataTabs v-else-if="item.key == 'data-tabs'" :ref="'diy_goods_buy' + index" :propIndex="get_prop_index(item)" :propDiyIndex="index" :propKey="item.id + index" :propValue="item.com_data" :propTop="get_diy_prop_top(item.com_data)" :propScrollTop="scroll_top" :propCustomNavHeight="get_diy_custom_nav_height(item.com_data)" :propIsTabsUseSafeDistance="getPropIsTabsUseSafeDistance" @goods_buy_event="goods_buy_event"></componentDataTabs>
+                                        <componentDiyGoodsTabs v-else-if="item.key == 'goods-tabs'" :ref="'diy_goods_buy' + index" :propIndex="get_prop_index(item)" :propDiyIndex="index" :propKey="item.id + index" :propValue="item.com_data" :propTop="get_diy_prop_top(item.com_data)" :propScrollTop="scroll_top" :propCustomNavHeight="get_diy_custom_nav_height(item.com_data)" :propIsTabsUseSafeDistance="getPropIsTabsUseSafeDistance" @goods_buy_event="goods_buy_event"></componentDiyGoodsTabs>
+                                        <componentDiyGoodsList v-else-if="item.key == 'goods-list'" :ref="'diy_goods_buy' + index" :propIndex="get_prop_index(item)" :propDiyIndex="index" :propKey="item.id + index" :propValue="item.com_data" @goods_buy_event="goods_buy_event"></componentDiyGoodsList>
+                                        <componentDiyDataMagic v-else-if="item.key == 'data-magic'" :propOuterContainerPadding="outer_container_padding" :propIndex="get_prop_index(item)" :propKey="item.id + index" :propValue="item.com_data"></componentDiyDataMagic>
+                                        <componentDiyCustom v-else-if="item.key == 'custom'" :propOuterContainerPadding="outer_container_padding" :propIndex="get_prop_index(item)" :propKey="item.id + index" :propValue="item.com_data"></componentDiyCustom>
+                                        <componentDiyImgMagic v-else-if="item.key == 'img-magic'" :propOuterContainerPadding="outer_container_padding" :propIndex="get_prop_index(item)" :propKey="item.id + index" :propValue="item.com_data"></componentDiyImgMagic>
+                                        <componentDiyHotZone v-else-if="item.key == 'hot-zone'" :propIndex="get_prop_index(item)" :propKey="item.id + index" :propValue="item.com_data"></componentDiyHotZone>
+                                        <componentDiySeckill v-else-if="item.key == 'seckill'" :propOuterContainerPadding="outer_container_padding" :propIndex="get_prop_index(item)" :propKey="item.id + index" :propValue="item.com_data"></componentDiySeckill>
+                                        <!-- 插件 -->
+                                        <componentDiyCoupon v-else-if="item.key == 'coupon'" :propIndex="get_prop_index(item)" :propKey="item.id + index" :propValue="item.com_data"></componentDiyCoupon>
+                                        <!-- 工具组件 -->
+                                        <componentDiyFloatWindow v-else-if="item.key == 'float-window'" :propKey="item.id + index" :propValue="item.com_data"></componentDiyFloatWindow>
+                                        <componentDiyTitle v-else-if="item.key == 'title'" :propKey="item.id + index" :propIndex="get_prop_index(item)" :propValue="item.com_data"></componentDiyTitle>
+                                        <componentDiyAuxiliaryLine v-else-if="item.key == 'row-line'" :propIndex="get_prop_index(item)" :propKey="item.id + index" :propValue="item.com_data"></componentDiyAuxiliaryLine>
+                                        <componentDiyRichText v-else-if="item.key == 'rich-text'" :propIndex="get_prop_index(item)" :propKey="item.id + index" :propValue="item.com_data"></componentDiyRichText>
+                                        <componentDiyAuxiliaryBlank v-else-if="item.key == 'auxiliary-blank'" :propIndex="get_prop_index(item)" :propKey="item.id + index" :propValue="item.com_data"></componentDiyAuxiliaryBlank>
+                                    </template>
+                                </view>
+                            </template>
+
+                            <!-- diy底部卡槽 -->
+                            <slot name="diy-bottom-content"></slot>
+                            <slot name="diy-bottom-common"></slot>
+                        </template>
+                        <template v-else>
+                            <!-- 商品九宫格列表 -->
+                            <view v-if="goods_list.length > 0" class="padding-horizontal-main padding-top-main oh">
+                                <component-goods-list :propData="{ style_type: goods_show_type_value, goods_list: goods_list, random: random_value }" :propLabel="plugins_label_data" :propCurrencySymbol="currency_symbol"></component-goods-list>
+                            </view>
+                            <view v-else class="pr">
+                                <!-- 提示信息 -->
+                                <component-no-data :propStatus="goods_list_loding_status" :propMsg="goods_list_loding_msg" propLoadingLogoTop="30%"></component-no-data>
+                            </view>
+
+                            <!-- diy底部卡槽 -->
+                            <template v-if="goods_bottom_line_status">
+                                <slot name="diy-bottom-content"></slot>
+                            </template>
+                            <slot name="diy-bottom-common"></slot>
+                        </template>
+
+                        <view class="z-i-deep">
+                            <!-- 商品购买 -->
+                            <component-goods-buy ref="goods_buy" v-on:CartSuccessEvent="goods_cart_back_event"></component-goods-buy>
+                            <!-- 视频播放 -->
+                            <uni-popup ref="popup" type="center" border-radius="20rpx" :mask-click="false">
+                                <view class="flex-col align-c jc-c gap-10">
+                                    <video :src="video_src" id="carousel_video" :autoplay="true" :controls="true" show-fullscreen-btn class="radius-md" :style="{ width: popup_width, height: popup_height }"></video>
+                                    <iconfont name="icon-qiandao-tancguanbi" size="56rpx" color="#ccc" propContainerDisplay="flex" @tap="video_close"></iconfont>
+                                </view>
+                            </uni-popup>
+                        </view>
+                    </view>
+                </view>
+                <!-- 当前diy页面底部菜单（非公共底部菜单） -->
+                <block v-if="is_show_footer">
+                    <componentDiyFooter :propKey="footer_data.id" :propValue="footer_data.com_data" @onFooterHeight="footer_height_value_event"></componentDiyFooter>
+                    <view v-if="footer_height_value > 0" :style="'height:' + footer_height_value + 'rpx;'"></view>
+                </block>
+
+                <!-- 底部卡槽 -->
+                <slot name="bottom"></slot>
+            </scroll-view>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import { isEmpty, common_styles_computer, background_computer, padding_computer } from '@/common/js/common/common.js';
+    import componentDiyHeader from '@/components/diy/header';
+    import componentDiyFooter from '@/components/diy/footer';
+    import componentDiyTabs from '@/components/diy/tabs';
+    import componentDiySearch from '@/components/diy/search';
+    import componentDiyCarousel from '@/components/diy/carousel';
+    import componentDiyUserInfo from '@/components/diy/user-info';
+    import componentDiyNotice from '@/components/diy/notice';
+    import componentDiyVideo from '@/components/diy/video';
+    import componentDiyArticleList from '@/components/diy/article-list';
+    import componentDiyArticleTabs from '@/components/diy/article-tabs';
+    import componentDiyHotZone from '@/components/diy/hot-zone';
+    import componentDiyCoupon from '@/components/diy/coupon';
+    import componentDiyFloatWindow from '@/components/diy/float-window';
+    import componentDiyTitle from '@/components/diy/title';
+    import componentDiyAuxiliaryLine from '@/components/diy/auxiliary-line';
+    import componentDiyRichText from '@/components/diy/rich-text';
+    import componentDiyAuxiliaryBlank from '@/components/diy/auxiliary-blank';
+    import componentDiyNavGroup from '@/components/diy/nav-group';
+    import componentDiyGoodsList from '@/components/diy/goods-list';
+    import componentDiyGoodsTabs from '@/components/diy/goods-tabs';
+    import componentDiyDataMagic from '@/components/diy/data-magic';
+    import componentDiyCustom from '@/components/diy/custom';
+    import componentDiyImgMagic from '@/components/diy/img-magic';
+    import componentDiySeckill from '@/components/diy/seckill';
+    import componentDiyTabsCarousel from '@/components/diy/tabs-carousel';
+    import componentDataTabs from '@/components/diy/data-tabs';
+    import componentGoodsList from '@/components/goods-list/goods-list';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentGoodsBuy from '@/components/goods-buy/goods-buy';
+    import componentSearch from '@/components/search/search';
+    var system = app.globalData.get_system_info(null, null, true);
+    var sys_width = app.globalData.window_width_handle(system.windowWidth);
+
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        name: 'diy',
+        props: {
+            propValue: {
+                type: Object,
+                default: () => ({}),
+            },
+            propDataId: {
+                type: [String, Number],
+                default: '',
+            },
+            propKey: {
+                type: [String, Number],
+                default: 0,
+            },
+        },
+        components: {
+            componentDiyHeader,
+            componentDiyFooter,
+            componentDiyTabs,
+            componentDiySearch,
+            componentDiyCarousel,
+            componentDiyUserInfo,
+            componentDiyNotice,
+            componentDiyVideo,
+            componentDiyArticleList,
+            componentDiyArticleTabs,
+            componentDiyHotZone,
+            componentDiyCoupon,
+            componentDiyAuxiliaryLine,
+            componentDiyRichText,
+            componentDiyFloatWindow,
+            componentDiyTitle,
+            componentDiyAuxiliaryBlank,
+            componentDiyNavGroup,
+            componentDiyGoodsList,
+            componentDiyGoodsTabs,
+            componentDiyDataMagic,
+            componentDiyCustom,
+            componentDiyImgMagic,
+            componentDiySeckill,
+            componentDiyTabsCarousel,
+            componentDataTabs,
+            componentGoodsList,
+            componentNoData,
+            componentBottomLine,
+            componentGoodsBuy,
+            componentSearch,
+        },
+        data() {
+            return {
+                // 基础配置
+                currency_symbol: app.globalData.currency_symbol(),
+                // 是否有选项卡
+                is_tabs: false,
+                // 是否是模块数据或者是九宫格商品分类样式数据， 默认模块数据
+                is_tabs_type: true,
+                // 是否开启沉浸模式
+                is_immersion_model: false,
+
+                // 5,7,0 是误差，， 10 是下边距，66是高度，bar_height是不同小程序下的导航栏距离顶部的高度
+                // #ifdef MP
+                sticky_top: bar_height + 5 + 10,
+                // #endif
+                // #ifdef H5 || MP-TOUTIAO
+                sticky_top: bar_height + 7 + 10,
+                // #endif
+                // #ifdef APP
+                sticky_top: bar_height + 0 + 10,
+                // #endif
+                header_top: '',
+                temp_sticky_top: 0,
+                temp_header_top: '0px',
+                is_header_top: false,
+                temp_is_header_top: false,
+                scroll_top: 0,
+                // 选项卡高度
+                tabs_height: 0,
+
+                header_data: {},
+                footer_data: {},
+                // 选项卡数据
+                tabs_data: {},
+                diy_data: [],
+                page_style: '',
+                page_img_style: '',
+                is_show_footer: false,
+                tabs_home_id: this.propDataId,
+                // 商品列表
+                goods_list: [],
+                goods_total: 0,
+                goods_page_total: 0,
+                goods_page: 1,
+                // 数据展示样式（0图文、1九方格）
+                goods_show_type_value: 1,
+                // 增加随机数，避免无法监听数据列表内部数据更新
+                random_value: 0,
+                // 标签插件
+                plugins_label_data: null,
+                goods_list_loding_status: 1,
+                goods_list_loding_msg: '',
+                goods_bottom_line_status: false,
+                // 判断数据是否在加载中
+                data_is_loading: 0,
+                // 缓存key
+                cache_key: app.globalData.data.cache_diy_data_key,
+                // 底部导航高度
+                footer_height_value: 0,
+                // 商品ref索引
+                goods_index: 0,
+                // 视频播放逻辑
+                video_src: '',
+                popup_width: '0rpx',
+                popup_height: '0rpx',
+                // 顶部导航是否换行
+                is_search_alone_row: false,
+                data_alone_row_space: 0,
+                content_padding: '',
+                outer_container_padding: 0,
+
+                // 滚动延迟器
+                head_scroll_top: 0,
+                scroll_throttle_timeout: null,
+                // 是否开启安全距离
+                is_the_safe_distance_enabled: false,
+                // 是否开启置顶
+                is_tabs_data_topped: false,
+            };
+        },
+        computed: {
+            get_tabs_data_prop_top() {
+                // 开启了沉浸式时的处理
+                if (this.is_immersion_model) {
+                    // 并且开启了安全距离
+                    return this.is_the_safe_distance_enabled ? this.temp_header_top : 0;
+                } else {
+                    return this.temp_header_top;
+                }
+            },
+            get_tabs_data_prop_sticky_top() {
+                // 开启了沉浸式时的处理
+                if (this.is_immersion_model) {
+                    // 并且开启了安全距离
+                    return this.is_the_safe_distance_enabled ? this.temp_sticky_top : 0;
+                } else {
+                    return this.temp_sticky_top;
+                }
+            },
+            get_prop_index() {
+                return (item) => {
+                    return this.is_the_safe_distance_enabled && this.tabs_data.length == 0 ? item.index : -1;
+                }
+            },
+            get_diy_prop_top() {
+                return (item) => {
+                    // 不开启沉浸模式时的处理
+                    if (!this.is_immersion_model) {
+                        return this.temp_sticky_top + this.tabs_height;
+                    } else {
+                        // 开启沉浸模式且开启选项卡置顶时
+                        if (this.is_tabs_data_topped) {
+                            return this.tabs_height;
+                        } else {
+                            // 开启安全距离
+                            let is_general_safe_distance_num = this.temp_sticky_top;
+                            // #ifdef H5 || MP-TOUTIAO
+                            is_general_safe_distance_num = this.is_header_top ? this.temp_sticky_top : 0
+                            // #endif
+                            if (this.is_the_safe_distance_enabled) {
+                                return is_general_safe_distance_num;
+                            } else {
+                                if (item?.content?.is_general_safe_distance == '1') {
+                                    return is_general_safe_distance_num;
+                                } else {
+                                    return 0;
+                                }
+                            }
+                        }
+                    }
+                }  
+            },
+            get_diy_custom_nav_height() {
+                return (item) => {
+                    let header_height = (this.is_search_alone_row ? 66 + this.data_alone_row_space : 33);
+                    // #ifdef H5 || MP-TOUTIAO
+                    header_height = this.is_header_top ? header_height : 0;
+                    // #endif
+                    // 不开启沉浸模式时的处理
+                    if (!this.is_immersion_model) {
+                        return header_height;
+                    } else {
+                        // 开启沉浸模式且开启选项卡置顶时
+                        if (this.is_tabs_data_topped) {
+                            return 0;
+                        } else {
+                            // 开启沉浸模式时并且开启安全距离
+                            if (this.is_the_safe_distance_enabled) {
+                                return this.is_search_alone_row ? 66 + this.data_alone_row_space : 33;
+                            } else {
+                                if (item?.content?.is_general_safe_distance == '1') {
+                                    return header_height;
+                                } else {
+                                    return 0;
+                                }
+                            }
+                        }   
+                    }
+                }
+            },
+            getPropIsTabsUseSafeDistance() {
+                let is_tabs_use_safe_distance = this.is_immersion_model;
+                // #ifdef H5 || MP-TOUTIAO
+                is_tabs_use_safe_distance = this.is_immersion_model && this.is_header_top;
+                // #endif
+                return is_tabs_use_safe_distance || !this.is_immersion_model;
+            }
+        },
+        watch: {
+            propKey(val) {
+                // 如果当前存在别的diy或者商品分类tabs则不更新数据
+                if ((this.tabs_id || null) == null) {
+                    // 初始化
+                    this.init();
+                }
+            },
+        },
+        created() {
+            // 初始化配置
+            this.init_config();
+
+            // 初始化
+            this.init();
+        },
+        methods: {
+            isEmpty,
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    // 是否显示底部菜单，如果当前地址已经存在系统底部菜单中则不显示当前diy页面自定义的底部菜单
+                    var is_show_footer = parseInt(this.propValue.header.com_data.content.bottom_navigation_show || 0) == 1;
+                    var is_tabbar = app.globalData.is_tabbar_pages();
+                    this.setData({
+                        is_show_footer: is_show_footer && !is_tabbar,
+                    });
+                    // diy页面不显示底部菜单则设置底部菜单高度为0
+                    if(!this.is_show_footer) {
+                        // 存储diy页面底部菜单高度
+                        if(app.globalData.current_page(false) == 'pages/diy/diy') {
+                            app.globalData.app_diy_tabbar_height_save(0);
+                        }
+                    }
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 初始化
+            init() {
+                const { header = {}, diy_data = [], tabs_data = [] } = this.propValue;
+                // 头部的样式
+                let header_style = header.com_data.style;
+                let new_diy_index = 0;
+                let new_tabs_data = [];
+                let new_diy_data = [];
+                if (tabs_data.length > 0) {
+                    tabs_data.forEach((item) => {
+                        // 修改item的内容
+                        item = this.get_index_content(new_diy_index, header, header_style, item);
+                        new_tabs_data.push(item);
+                        new_diy_index++;
+                    });
+                    new_diy_data = diy_data;
+                } else {
+                    new_tabs_data = tabs_data;
+                    // 过滤数据
+                    diy_data.forEach((item) => {
+                        // 判断是否是商品列表
+                        if (item.com_name == 'float-window') {
+                            item.index = -1;
+                        } else {
+                            // 修改item的内容
+                            item = this.get_index_content(new_diy_index, header, header_style, item);
+                            new_diy_data.push(item);
+                            new_diy_index++;
+                        }
+                    });
+                }
+                const { padding_right = 0, padding_left = 0 } = header_style.common_style;
+                const new_is_search_alone_row = header.com_data.content.data_alone_row_value.length > 0 ? true : false;
+                const new_data_alone_row_space = parseInt(header_style.data_alone_row_space || 0);
+                // tabs选项卡数据过滤
+                this.setData({
+                    header_data: header,
+                    footer_data: this.propValue.footer,
+                    diy_data: new_diy_data,
+                    tabs_data: new_tabs_data,
+                    page_style: common_styles_computer(header_style.common_style),
+                    page_img_style: background_computer(header_style.common_style),
+                    // 内间距
+                    content_padding: `padding: 0px ${padding_right}px 0px ${padding_left}px;` + 'box-sizing:border-box;',
+                    outer_container_padding: padding_right + padding_left,
+                    // 判断顶部导航是否置顶
+                    is_header_top: parseInt(header_style.up_slide_display) == 1 ? true : false,
+                    is_tabs_data_topped: new_tabs_data[0]?.com_data?.content?.tabs_top_up == '1' || false,
+                    temp_sticky_top: this.sticky_top,
+                    temp_header_top: (new_is_search_alone_row ? 66 + new_data_alone_row_space : 33),
+                    header_top: (new_is_search_alone_row ? 66 + new_data_alone_row_space : 33),
+                    is_immersion_model: header_style.header_background_type !== 'color_image' && header_style.immersive_style == '1',
+                    // 顶部导航高度是否变化--------------------------------------------------
+                    is_search_alone_row: new_is_search_alone_row,
+                    data_alone_row_space: new_data_alone_row_space,
+                    is_immersive_style_and_general_safe_distance_value: header_style.immersive_style == '1' && header_style.general_safe_distance_value == '1',
+                    is_the_safe_distance_enabled: header_style.immersive_style == '1' && header_style.general_safe_distance_value == '1',// diy_data是否开启安全距离
+                });
+                // 缓存数据
+                uni.setStorageSync(this.cache_key + this.tabs_home_id, diy_data);
+            },
+            // 顶部导航沉浸模式回调
+            // immersion_model_call_back(bool) {
+            //     this.setData({
+            //         is_immersion_model: bool,
+            //     });
+            // },
+            get_index_content(new_diy_index, header, header_style, item) {
+                item.index = new_diy_index;
+                if (new_diy_index == 0) {
+                    // 判断是否开启沉浸模式和是否开启安全距离 如果为true则除了选项卡和选项卡轮播外， 第一个组件则加上安全距离样式的padding_top加上顶部导航的高度和安全距离的高度
+                    if (header_style.immersive_style == '1' && header_style.general_safe_distance_value == '1') {
+                        let new_data = JSON.parse(JSON.stringify(item));
+                        // 顶部导航的高度
+                        let header_top_height = (header.com_data.content.data_alone_row_value.length > 0 ? parseInt(header.com_data.style.data_alone_row_space || 5) : 0) + 33 + (header.com_data.content.data_alone_row_value.length > 0 ? 33 : 0);
+                        new_data.com_data.style.common_style.padding_top = parseInt(new_data.com_data.style.common_style.padding_top) + header_top_height;
+                        return new_data;
+                    }
+                    return item;
+                }
+                return item;
+            },
+            // 选项卡回调更新数据
+            tabs_click_event(tabs_id, bool, params = {}) {
+                let new_data = [];
+                this.setData({
+                    is_tabs_type: bool,
+                    tabs_id: tabs_id,
+                });
+                let new_params = {
+                    ...params,
+                    id: tabs_id,
+                };
+                if (tabs_id) {
+                    new_data = uni.getStorageSync(this.cache_key + tabs_id) || [];
+                    if (new_data.length > 0) {
+                        // 先使用缓存数据展示
+                        this.setData({
+                            diy_data: new_data,
+                        });
+                        // 已有本地缓存则直接取远程有效数据（默认首次取的是远程缓存数据）
+                        new_params['is_cache'] = 0;
+                    }
+                    // diy数据
+                    if (bool) {
+                        uni.showLoading({
+                            title: this.$t('common.loading_in_text'),
+                            mask: true,
+                        });
+                        uni.request({
+                            url: app.globalData.get_request_url('index', 'diy'),
+                            method: 'POST',
+                            data: new_params,
+                            dataType: 'json',
+                            success: (res) => {
+                                uni.hideLoading();
+                                // 数据处理
+                                let data = res.data.data.data;
+                                if (res.data.code == 0) {
+                                    new_data = data?.config.diy_data || [];
+                                    uni.setStorageSync(this.cache_key + tabs_id, new_data);
+                                    this.setData({
+                                        diy_data: new_data,
+                                    });
+                                    // 是否需要重新加载数据
+                                    if (parseInt(data.is_result_data_cache || 0) == 1) {
+                                        this.tabs_click_event(tabs_id, bool, { is_cache: 0 });
+                                    }
+                                } else {
+                                    app.globalData.showToast(res.data.msg);
+                                }
+                            },
+                            fail: () => {
+                                uni.hideLoading();
+                                app.globalData.showToast(this.$t('common.internet_error_tips'));
+                            },
+                        });
+                    } else {
+                        this.setData({
+                            goods_page: 1,
+                            goods_list: [],
+                            goods_list_loding_status: 1,
+                            goods_bottom_line_status: false,
+                        });
+                        this.get_goods_list(1);
+                    }
+                } else {
+                    if (tabs_id == '') {
+                        new_data = uni.getStorageSync(this.cache_key + this.tabs_home_id) || [];
+                    }
+                    // 先使用缓存数据展示
+                    this.setData({
+                        diy_data: new_data,
+                    });
+                }
+            },
+            // 选项卡高度
+            tabs_height_event(height) {
+                let new_tabs_height = 0;
+                // 判断是否有选项卡切选项卡数组数据内的字段is_enable值是否为1
+                if (this.tabs_data.length > 0) {
+                    this.tabs_data.forEach((item, index) => {
+                        if (item.is_enable == '1') {
+                            new_tabs_height = height;
+                        }
+                    });
+                }
+                this.setData({
+                    tabs_height: new_tabs_height,
+                });
+            },
+
+            // 滚动加载
+            on_scroll_lower_event(e) {
+                if (!this.is_tabs_type) {
+                    this.get_goods_list();
+                }
+            },
+            // 滚动到顶部
+            on_scroll_upper_event() {
+                setTimeout(() => {
+                    this.head_scroll_top = 0;
+                });
+            },
+
+            // 查询商品
+            get_goods_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.goods_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                });
+
+                // 获取数据
+                if (this.goods_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+                let new_data = {
+                    category_id: this.tabs_id,
+                    page: this.goods_page,
+                };
+                // 九宫格数据
+                uni.request({
+                    url: app.globalData.get_request_url('datalist', 'search'),
+                    method: 'POST',
+                    data: new_data,
+                    dataType: 'json',
+                    success: (res) => {
+                        if (this.goods_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            if (data.data.length > 0) {
+                                if (this.goods_page <= 1) {
+                                    var temp_goods_list = data.data;
+                                } else {
+                                    var temp_goods_list = this.goods_list || [];
+                                    var temp_data = data.data;
+                                    for (var i in temp_data) {
+                                        temp_goods_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    goods_list: temp_goods_list,
+                                    random_value: Math.random(),
+                                    goods_total: data.total,
+                                    goods_page_total: data.page_total,
+                                    goods_list_loding_status: 3,
+                                    goods_list_loding_msg: '',
+                                    goods_page: this.goods_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    goods_bottom_line_status: this.goods_page > 1 && this.goods_page > this.goods_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    goods_list_loding_status: 0,
+                                    goods_list_loding_msg: res.data.msg,
+                                    goods_total: 0,
+                                    data_is_loading: 0,
+                                });
+                                if (this.goods_page <= 1) {
+                                    this.setData({
+                                        goods_list: [],
+                                        goods_bottom_line_status: false,
+                                    });
+                                }
+                            }
+                        } else {
+                            this.setData({
+                                goods_list_loding_status: 0,
+                                goods_list_loding_msg: res.data.msg,
+                                data_is_loading: 0,
+                            });
+                            app.globalData.is_login_check(res.data, this, 'get_goods_list', is_mandatory);
+                        }
+                    },
+                    fail: () => {
+                        if (this.goods_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            goods_list_loding_status: 2,
+                            goods_list_loding_msg: this.$t('common.internet_error_tips'),
+                            data_is_loading: 0,
+                        });
+                    },
+                });
+            },
+
+            // 页面滚动事件
+            on_scroll_event(e) {
+                const scroll_num = parseInt(e.detail.scrollTop);
+                if (scroll_num <= 20) {
+                    this.head_scroll_top = 0;
+                } else {
+                    if (scroll_num / (this.sticky_top + 33) <= 1) {
+                        // 更新数据的逻辑
+                        this.head_scroll_top = scroll_num;
+                    } else {
+                        this.head_scroll_top = this.sticky_top + 100;
+                    }
+                }
+                // #ifdef H5 || MP-TOUTIAO
+                // 判断顶部导航是否置顶
+                if (!this.is_header_top && !this.is_immersion_model) {
+                    if (scroll_num >= this.sticky_top + 33 + (this.is_search_alone_row ? 0 : 33 + this.data_alone_row_space)) {
+                        this.temp_sticky_top = 0;
+                        this.temp_header_top = 0;
+                        this.temp_sticky_no_h5_top = 0;
+                        this.temp_is_header_top = true;
+                    } else {
+                        this.temp_header_top = this.header_top;
+                        this.temp_sticky_top = this.sticky_top;
+                        this.temp_sticky_no_h5_top = this.sticky_top;
+                        this.temp_is_header_top = false;
+                    }
+                }
+                //#endif
+                this.scroll_timer_compute(scroll_num);
+            },
+
+            scroll_timer_compute(scroll_num) {
+                // 使用节流技术减少事件触发的处理次数
+                if (!this.scroll_throttle_timeout) {
+                    const self = this;
+                    this.scroll_throttle_timeout = setTimeout(() => {
+                        this.scroll_top = scroll_num;
+                        // 清除定时器
+                        this.scroll_throttle_timeout = null;
+                    }, 20); // 可以根据实际情况调整延时时间
+                }
+            },
+
+            // 底部菜单高度
+            footer_height_value_event(value) {
+                this.setData({
+                    footer_height_value: (value*2)+20,
+                });
+
+                // 存储diy页面底部菜单高度
+                if(app.globalData.current_page(false) == 'pages/diy/diy') {
+                    app.globalData.app_diy_tabbar_height_save(value);
+                }
+            },
+            // 商品数量更新回调
+            goods_buy_event(index, goods = {}, params = {}, back_data = null) {
+                if ((this.$refs.goods_buy || null) != null) {
+                    this.goods_index = index;
+                    this.$refs.goods_buy.init(goods, params, back_data);
+                }
+            },
+            // 商品加购回调
+            goods_cart_back_event(e) {
+                if ((this.$refs[`diy_goods_buy${this.goods_index}`][0] || null) != null) {
+                    this.$refs[`diy_goods_buy${this.goods_index}`][0].goods_cart_back_event(e);
+                }
+            },
+            // 视频播放
+            video_play(url, width, height) {
+                this.setData({
+                    video_src: url,
+                    popup_width: width,
+                    popup_height: height,
+                });
+                this.$refs.popup.open();
+                const videoContext = uni.createVideoContext('carousel_video');
+                if (!isEmpty(videoContext)) {
+                    videoContext.play();
+                }
+            },
+            // 视频关闭
+            video_close() {
+                const videoContext = uni.createVideoContext('carousel_video');
+                if (!isEmpty(videoContext)) {
+                    videoContext.pause();
+                }
+                this.$refs.popup.close();
+            },
+            // 位置回调
+            choice_location_back(e) {
+                // 如果存在tabs_id则表示当前有选择tab数据则仅当前模块更新，无需给上级回调位置
+                if ((this.tabs_id || null) == null) {
+                    this.$emit('onLocationBack', e);
+                } else {
+                    this.tabs_click_event(this.tabs_id, this.is_tabs_type);
+                }
+            },
+        },
+    };
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/components/diy/float-window.vue b/components/diy/float-window.vue
new file mode 100644
index 0000000..6099a38
--- /dev/null
+++ b/components/diy/float-window.vue
@@ -0,0 +1,164 @@
+<template>
+    <movable-area class="float-window-movable-container">
+        <movable-view :x="x" :y="y" direction="all" class="float-window-spread flex-row align-c jc-c" @tap="btn_event">
+            <block v-if="style.float_style == 'diffuse'">
+                <view class="ring" :style="content_style"></view>
+                <view class="ring" :style="content_style"></view>
+            </block>
+            <view class="img oh" :style="content_style">
+                <block v-if="(form || null) != null && form.button_jump == 'customer_service'">
+                    <component-online-service :propChatImage="img_url" :propIsSpread="false" :propIsMovable="false"></component-online-service>
+                </block>
+                <block v-else>
+                    <imageEmpty :propImageSrc="img_url" propImgFit="aspectFill" propErrorStyle="width: 60rpx;height: 60rpx;"></imageEmpty>
+                </block>
+            </view>
+        </movable-view>
+        <component-quick-nav ref="quick_nav" :propIsBtn="false"></component-quick-nav>
+    </movable-area>
+</template>
+
+<script>
+    const app = getApp();
+    import { isEmpty } from '@/common/js/common/common.js';
+    import imageEmpty from '@/components/diy/modules/image-empty.vue';
+    import componentOnlineService from '@/components/online-service/online-service';
+    import componentQuickNav from '@/components/quick-nav/quick-nav';
+    export default {
+        components: {
+            imageEmpty,
+            componentOnlineService,
+            componentQuickNav
+        },
+        props: {
+            propValue: {
+                type: Object,
+                default: () => {
+                    return {};
+                },
+            },
+            propKey: {
+                type: [String,Number],
+                default: '',
+            }
+        },
+        data() {
+            return {
+                form: {},
+                style: {},
+                img_url: '',
+                x: 0,
+                y: 0,
+                content_style: '',
+            };
+        },
+        watch: {
+            propKey(val) {
+                // 初始化
+                this.init();
+            }
+        },
+        created() {
+            this.init();
+        },
+        methods: {
+            init() {
+                // 获取内容
+                let form = this.propValue.content || {};
+                // 获取图片
+                let img_url = (form.button_img || null) != null ? (form.button_img[0] || null) : null;
+                if (img_url != null) {
+                    img_url = img_url.url || null;
+                }
+                const { float_style, float_style_color, display_location, offset_number_percentage } = this.propValue.style;
+                // 获取当前手机的宽度和高度
+                const { windowWidth, windowHeight } = uni.getSystemInfoSync();
+                // 计算出距离左边的距离
+                let x = display_location == 'left' ? 10 : windowWidth - 60;
+                // 计算出距离顶部的距离
+                const y = Math.ceil(windowHeight * (1 - Number(offset_number_percentage)) - 20);
+                this.setData({
+                    form: form,
+                    style: this.propValue.style,
+                    img_url: img_url,
+                    content_style: float_style == 'shadow' ? `box-shadow: 0 0 40rpx ${float_style_color};border-radius: 50%;` : `background-color: ${float_style_color};border-radius: 50%;`,
+                    x: x,
+                    y: y
+                });
+            },
+            // 按钮事件
+            btn_event() {
+                const { button_jump, button_link } = this.form;
+                switch(button_jump) {
+                    // 链接
+                    case 'link' :
+                        if (!isEmpty(button_link)) {
+                            app.globalData.url_open(button_link.page);
+                        }
+                        break;
+                    // 快捷导航
+                    case 'quick_nav' :
+                        if ((this.$refs.quick_nav || null) != null) {
+                            this.$refs.quick_nav.quick_open_event();
+                        }
+                        break;
+                }
+            },
+        },
+    };
+</script>
+
+<style scoped lang="scss">
+    .img {
+        width: 90rpx;
+        height: 90rpx;
+        border-radius: 50%;
+        z-index: 2;
+    }
+    .float-window-movable-container {
+        position: fixed;
+        width: 100%;
+        height: 100%;
+        top: 0;
+        left: 0;
+        background: transparent;
+        pointer-events: none;
+        z-index: 103;
+    }
+    /**
+    * 呼吸灯
+    */
+    .float-window-spread {
+        position: relative;
+        pointer-events: auto;
+        z-index: 1;
+        width: 100rpx;
+        height: 100rpx;
+        border-radius: 50%;
+    }
+    .float-window-spread .ring {
+        /* 速度为1.5 * 层数 = 实际运行速度，速度修改则 animation-delay 属性也修改相同速度 */
+        animation: pulsing 1.5s ease-out infinite;
+        border-radius: 100%;
+        width: 100rpx;
+        height: 100rpx;
+        position: absolute;
+    }
+    /* 速度为1*层数 */
+    .float-window-spread .ring:nth-of-type(1) {
+        -webkit-animation-delay: -1.5s;
+        animation-delay: -1.5s;
+    }
+
+    /* 速度为1*层数 */
+    .float-window-spread .ring:nth-of-type(2) {
+        -webkit-animation-delay: -2s;
+        animation-delay: -2s;
+    }
+    @keyframes pulsing {
+        100% {
+            transform: scale(1.35);
+            opacity: 0;
+        }
+    }
+</style>
diff --git a/components/diy/footer.vue b/components/diy/footer.vue
new file mode 100644
index 0000000..d62d8aa
--- /dev/null
+++ b/components/diy/footer.vue
@@ -0,0 +1,201 @@
+<template>
+    <!-- 底部导航 -->
+    <view v-if="(propValue || null) !== null" class="footer-nav flex-row jc-c align-c" :class="nav_type == 1 ? 'bottom-line-exclude' : ''">
+        <view class="flex-1 wh-auto" :style="style_container">
+            <view class="footer-nav-content flex-row jc-c align-c wh-auto" :style="style_img_container">
+                <view class="flex-row jc-c align-c wh-auto" :class="nav_type == 0 ? 'bottom-line-exclude' : ''">
+                    <view class="flex-row jc-sa align-c wh padding-0">
+                        <block v-for="(item, index) in nav_content" :key="index">
+                            <view class="flex-1 flex-col jc-c align-c gap-5 pr" :data-value="item.link.page || ''" @tap="url_event">
+                                <view v-if="nav_style != 2" class="img-content pr">
+                                    <view class="img-item pa border-radius-xs animate-linear" :class="active_index != index ? 'active' : ''">
+                                        <template v-if="item.img.length > 0">
+                                            <image :src="item.img[0].url" class="img dis-block" model="widthFix"></image>
+                                        </template>
+                                    </view>
+                                    <view class="img-item pa border-radius-xs animate-linear" :class="active_index == index ? 'active' : ''">
+                                        <template v-if="item.img_checked.length > 0">
+                                            <image :src="item.img_checked[0].url" class="img dis-block" model="widthFix"></image>
+                                        </template>
+                                    </view>
+                                </view>
+                                <text v-if="nav_style != 1" class="animate-linear text-size-xs pr z-i" :style="active_index == index ? text_color_checked : default_text_color">{{ item.name }}</text>
+                                <view v-if="(item.badge || null) != null" class="pa badge-icon">
+                                    <component-badge :propNumber="item.badge"></component-badge>
+                                </view>
+                            </view>
+                        </block>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    let app = getApp();
+    import { common_styles_computer, common_img_computer } from '@/common/js/common/common.js';
+    import componentBadge from '@/components/badge/badge';
+    export default {
+        props: {
+            propKey: {
+                type: [String,Number],
+                default: '',
+            },
+            propValue: {
+                type: Object,
+                default: null,
+            },
+            // 底部选中索引
+            propFooterActiveIndex: {
+                type: Number,
+                default: 0,
+            }
+        },
+        data() {
+            return {
+                style_container: '',
+                style_img_container: '',
+                style: '',
+                nav_content: [],
+                nav_type: 0,
+                nav_style: 0,
+                default_text_color: '',
+                text_color_checked: '',
+                active_index: 0,
+            };
+        },
+        components: {
+            componentBadge,
+        },
+        // 属性值改变监听
+        watch: {
+            // 唯一key
+            propKey(value, old_value) {
+                this.init();
+            },
+            // 选中索引
+            propFooterActiveIndex(value, old_value) {
+                this.init();
+            },
+        },
+        // 页面被展示
+        created: function () {
+            this.init();
+        },
+        methods: {
+            // 初始化
+            init() {
+                if ((this.propValue || null) !== null) {
+                    let new_content = this.propValue.content || {};
+                    let new_style = this.propValue.style || {};
+                    let nav_content = new_content.nav_content || [];
+                    let page = app.globalData.current_page() || null;
+                    let active_index = this.propFooterActiveIndex;
+                    if (page != null) {
+                        // 角标链接定义
+                        let badge_arr = {
+                            '/pages/cart/cart': 'cart',
+                            '/pages/cart-page/cart-page': 'cart',
+                        };
+                        for (var i in nav_content) {
+                            if ((nav_content[i]['link'] || null) != null && (nav_content[i]['link']['page'] || null) != null) {
+                                // 选中索引
+                                if (nav_content[i]['link']['page'] == '/' + page) {
+                                    active_index = i;
+                                }
+
+                                // 获取角标数据
+                                var badge_key = badge_arr[nav_content[i]['link']['page']];
+                                if (badge_key !== undefined) {
+                                    nav_content[i]['badge'] = app.globalData.get_tab_bar_badge(badge_key);
+                                }
+                            }
+                        }
+                    }
+                    this.setData({
+                        nav_content: nav_content,
+                        nav_type: new_content.nav_type || 0,
+                        nav_style: new_content.nav_style || 0,
+                        active_index: active_index,
+                        default_text_color: 'color:' + new_style.default_text_color || 'rgba(0, 0, 0, 1)',
+                        text_color_checked: 'color:' + new_style.text_color_checked || 'rgba(204, 204, 204, 1)',
+                        style_container: common_styles_computer(new_style.common_style),
+                        style_img_container: common_img_computer(new_style.common_style),
+                    });
+
+                    // 高度计算
+                    let nav_min_height = 70;
+                    var nav_height = parseInt(new_style.common_style.padding_top) + parseInt(new_style.common_style.padding_bottom) + 44;
+                    if (nav_height < nav_min_height) {
+                        nav_height = nav_min_height;
+                    }
+                    let footer_height = nav_height + parseInt(new_style.common_style.margin_top) + parseInt(new_style.common_style.margin_bottom);
+
+                    // #ifndef H5
+                    // 底部菜单距离底部的安全距离，减去20、默认的安全距离太高了
+                    var safe_areaInsets = uni.getSystemInfoSync().safeAreaInsets || {};
+                    var bottom = parseInt(safe_areaInsets.bottom || 0);
+                    if (bottom > 0) {
+                        bottom -= 24;
+                    }
+                    footer_height += bottom;
+                    // #endif
+
+                    // 回调高度
+                    this.$emit('onFooterHeight', footer_height);
+                }
+            },
+
+            // 跳转链接
+            url_event(e) {
+                let index = e.currentTarget.dataset.index;
+                let item = this.nav_content[index];
+                app.globalData.url_event(e);
+                this.$emit('onFooterTap', index, item);
+            },
+        },
+    };
+</script>
+<style lang="scss" scoped>
+    .footer-nav {
+        z-index: 102;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        width: 100%;
+        margin: 0 auto;
+        background-color: transparent;
+        .footer-nav-content {
+            min-height: 140rpx;
+            box-sizing: border-box;
+            .img-content {
+                width: 44rpx;
+                height: 44rpx;
+                .img-item {
+                    width: 44rpx;
+                    height: 44rpx;
+                    opacity: 0;
+                    &.active {
+                        opacity: 1;
+                    }
+                    .img {
+                        width: 44rpx;
+                        height: 44rpx;
+                    }
+                }
+            }
+            .badge-icon {
+                margin-top: -70rpx;
+                margin-right: -70rpx;
+            }
+        }
+    }
+    /* #ifdef H5 */
+    @media only screen and (min-width: 1600rpx) {
+        .footer-nav {
+            max-width: 1600rpx;
+        }
+    }
+    /* #endif */
+</style>
diff --git a/components/diy/goods-list.vue b/components/diy/goods-list.vue
new file mode 100644
index 0000000..4da750e
--- /dev/null
+++ b/components/diy/goods-list.vue
@@ -0,0 +1,607 @@
+<template>
+    <view v-if="!isEmpty(list)" class="oh" :style="style_container" @tap.stop="onTap">
+        <view class="oh" :style="style_img_container">
+            <view :class="outer_class" :style="onter_style">
+                <block v-if="!['5'].includes(theme)">
+                    <view v-for="(item, index) in list" :key="index" class="pr oh" :style="layout_style" :data-index="index" :data-value="item.goods_url" @tap.stop="url_event">
+                        <view :class="layout_type" :style="layout_img_style">
+                            <block v-if="theme == '6'">
+                                <view :class="['flex-row align-c jc-sb ptb-15 mlr-10 gap-20', { 'br-b-e': index != list.length - 1 }]">
+                                    <view v-if="is_show('title')" :class="text_line" :style="title_style">{{ item.title }}</view>
+                                    <view v-if="is_show('price') && !isEmpty(item.min_price)" class="num nowrap" :style="'color:' + new_style.shop_price_color">
+                                        <text class="identifying">{{ item.show_price_symbol }}</text>
+                                        <text :style="price_style">{{ item.min_price }}</text>
+                                        <text v-if="is_show('price_unit')" class="identifying">{{ item.show_price_unit }}</text>
+                                    </view>
+                                </view>
+                            </block>
+                            <block v-else>
+                                <block v-if="!isEmpty(item)">
+                                    <view class="oh pr" :class="img_size">
+                                        <view v-if="!isEmpty(item.new_cover)" :style="img_size">
+                                            <imageEmpty :propImageSrc="item.new_cover[0]" :propStyle="content_img_radius" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
+                                        </view>
+                                        <view v-else :style="img_size">
+                                            <imageEmpty :propImageSrc="item.images" :propStyle="content_img_radius" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
+                                        </view>
+                                        <!-- 角标 -->
+                                        <subscriptIndex :propValue="propValue"></subscriptIndex>
+                                    </view>
+                                </block>
+                                <view v-if="is_show('title') || is_show('simple_desc') || is_show('price') || is_show('original_price') || is_show('sales_count') || is_show('plugins_view_icon') || form.is_shop_show == '1'" class="flex-col flex-1 jc-sb content gap-10" :style="content_style">
+                                    <view class="flex-col gap-10 top-title">
+                                        <view v-if="is_show('title') || (['0', '1', '2', '3', '5'].includes(theme) && is_show('simple_desc'))" class="flex-col" :style="{ gap: new_style.title_simple_desc_spacing * 2 + 'rpx' }">
+                                            <view v-if="is_show('title')" :class="text_line" :style="title_style">{{ item.title }}</view>
+                                            <view v-if="['0', '1', '2', '3', '5'].includes(theme) && is_show('simple_desc')" :class="form.simple_desc_row == '2' ? 'text-line-2' : 'text-line-1'" :style="simple_desc">{{ item.simple_desc }}</view>
+                                        </view>
+                                        <view v-if="show_content && is_show('plugins_view_icon') && !isEmpty(item.plugins_view_icon_data)" class="flex-row gap-5 align-c">
+                                            <view v-for="(icon_data, icon_index) in item.plugins_view_icon_data" :key="icon_index" class="radius text-size-xsss padding-horizontal-xs" :style="{ background: icon_data.bg_color, color: icon_data.color, border: '1rpx solid' + (!isEmpty(icon_data.br_color) ? icon_data.br_color : icon_data.bg_color) }">{{ icon_data.name }}</view>
+                                        </view>
+                                    </view>
+                                    <view v-if="!['3', '4', '5'].includes(form.theme)" class="flex-col gap-5">
+                                        <view :class="[form.is_price_solo == '1' ? 'flex-row align-c nowrap' : 'flex-col gap-5']">
+                                            <view v-if="is_show('price') && !isEmpty(item.min_price)" class="num" :style="'color:' + new_style.shop_price_color">
+                                                <text :style="price_symbol">{{ item.show_price_symbol }}</text>
+                                                <text :style="price_style">{{ item.min_price }}</text>
+                                                <text v-if="is_show('price_unit')" :style="price_unit">{{ item.show_price_unit }}</text>
+                                            </view>
+                                            <view v-if="show_content && is_show('original_price') && !isEmpty(item.min_original_price)" class="text-size-xss flex-row">
+                                                <!-- <image v-if="form.static_img.length > 0" class="original-price-left" :src="form.static_img[0].url" model="widthFix"></image> -->
+                                                <text :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]" :style="original_price">
+                                                    {{ item.show_original_price_symbol }}{{ item.min_original_price }}
+                                                    <block v-if="is_show('original_price_unit')">
+                                                        {{ item.show_original_price_unit }}
+                                                    </block>
+                                                </text>
+                                            </view>
+                                        </view>
+                                        <view class="flex-row jc-sb align-e">
+                                            <view>
+                                                <view v-if="show_content" class="flex-row align-c text-size-xss">
+                                                    <view v-if="is_show('sales_count') && !isEmpty(item.sales_count)" class="pr-5" :style="sold_number_style">已售{{ item.sales_count || 0 }}件</view>
+                                                    <!-- <view v-if="is_show('sales_count')" :class="['pr-5', {'br-r-e': is_show('sales_count') && is_show('4')}]" :style="sold_number_style>已售{{ item.sales_count }}件</view> -->
+                                                    <!-- <view v-if="is_show('4')" class="pl-5" :style="score_style">评分0</view> -->
+                                                </view>
+                                            </view>
+                                            <view v-if="(form.is_shop_show == '1' && form.shop_button_effect == '1' && item.is_error == 0) || (form.is_shop_show == '1' && form.shop_button_effect == '0')" class="pr" :data-index="index" @tap.stop="goods_button_event">
+                                                <block v-if="form.shop_type == 'text'">
+                                                    <view class="plr-11 padding-vertical-xs round" :style="button_style + ('color:' + new_style.shop_button_text_color)">{{ form.shop_button_text }}</view>
+                                                </block>
+                                                <view v-else class="round padding-horizontal-sm ptb-5" :style="button_gradient">
+                                                    <iconfont :name="'icon-' + (!isEmpty(form.shop_button_icon_class) ? form.shop_button_icon_class : 'cart')" :color="new_style.shop_icon_color" :size="new_style.shop_icon_size * 2 + 'rpx'" propContainerDisplay="flex"></iconfont>
+                                                </view>
+                                                <view v-if="form.shop_button_effect == '1'" class="cart-badge-icon pa badge-style">
+                                                    <component-badge :propNumber="item.user_cart_count || 0"></component-badge>
+                                                </view>
+                                            </view>
+                                        </view>
+                                    </view>
+                                    <view v-else class="flex-row align-c jc-sb">
+                                        <view class="flex-row align-c nowrap">
+                                            <view v-if="is_show('price') && !isEmpty(item.min_price)" class="num" :style="'color:' + new_style.shop_price_color">
+                                                <text :style="price_symbol">{{ item.show_price_symbol }}</text>
+                                                <text :style="price_style">{{ item.min_price }}</text>
+                                                <text v-if="is_show('price_unit')" :style="price_unit">{{ item.show_price_unit }}</text>
+                                            </view>
+                                            <view v-if="show_content && is_show('original_price') && !isEmpty(item.min_original_price)" class="text-size-xss flex-row">
+                                                <!-- <image v-if="form.static_img.length > 0" class="original-price-left" :src="form.static_img[0].url" model="widthFix"></image> -->
+                                                <text :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]" :style="original_price">
+                                                    {{ item.show_original_price_symbol }}{{ item.min_original_price }}
+                                                    <block v-if="is_show('original_price_unit')">
+                                                        {{ item.show_original_price_unit }}
+                                                    </block>
+                                                </text>
+                                            </view>
+                                        </view>
+                                        <view v-if="(form.is_shop_show == '1' && form.shop_button_effect == '1' && item.is_error == 0) || (form.is_shop_show == '1' && form.shop_button_effect == '0')" class="pr" :data-index="index" @tap.stop="goods_button_event">
+                                            <block v-if="form.shop_type == 'text'">
+                                                <view class="plr-11 padding-vertical-xs round" :style="button_style + ('color:' + new_style.shop_button_text_color)">{{ form.shop_button_text }}</view>
+                                            </block>
+                                            <view v-else class="round padding-horizontal-sm ptb-5" :style="button_gradient">
+                                                <iconfont :name="'icon-' + (!isEmpty(form.shop_button_icon_class) ? form.shop_button_icon_class : 'cart')" :color="new_style.shop_icon_color" :size="new_style.shop_icon_size * 2 + 'rpx'" propContainerDisplay="flex"></iconfont>
+                                            </view>
+                                            <view v-if="form.shop_button_effect == '1'" class="cart-badge-icon pa badge-style">
+                                                <component-badge :propNumber="item.user_cart_count || 0"></component-badge>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </block>
+                        </view>
+                    </view>
+                </block>
+                <block v-else>
+                    <swiper circular="true" :autoplay="new_style.is_roll == '1'" :interval="new_style.interval_time * 1000" :duration="500" :next-margin="new_style.rolling_fashion == 'translation' ? '-' + content_outer_spacing_magin : '0rpx'" :display-multiple-items="slides_per_group" :style="{ width: '100%', height: new_style.content_outer_height * new_scale + 'px' }">
+                        <swiper-item v-for="(item1, index1) in shop_content_list" :key="index1">
+                            <view class="flex-row wh-auto ht-auto" :style="onter_style">
+                                <view v-for="(item, index) in item1.split_list" :key="index" class="pr oh" :style="layout_style" :data-index="index1" :data-split-index="index" :data-value="item.goods_url" @tap.stop="url_event">
+                                    <view :class="layout_type" :style="layout_img_style">
+                                        <block v-if="!isEmpty(item)">
+                                            <view class="oh pr" :class="'flex-img' + theme">
+                                                <view v-if="!isEmpty(item.new_cover)" :class="'flex-img' + theme">
+                                                    <imageEmpty :propImageSrc="item.new_cover[0]" :propStyle="content_img_radius" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
+                                                </view>
+                                                <view v-else :class="'flex-img' + theme">
+                                                    <imageEmpty :propImageSrc="item.images" :propStyle="content_img_radius" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
+                                                </view>
+                                                <!-- 角标 -->
+                                                <subscriptIndex :propValue="propValue"></subscriptIndex>
+                                            </view>
+                                        </block>
+                                        <view v-if="is_show('title') || is_show('simple_desc') || is_show('price') || is_show('plugins_view_icon') || is_show('original_price') || form.is_shop_show == '1'" class="flex-col flex-1 jc-sb content gap-10" :style="content_style">
+                                            <view class="flex-col gap-10 top-title">
+                                                <view v-if="is_show('title') || (['0', '1', '2', '3', '5'].includes(theme) && is_show('simple_desc'))" class="flex-col" :style="{ gap: new_style.title_simple_desc_spacing * 2 + 'rpx' }">
+                                                    <view v-if="is_show('title')" :class="text_line" :style="title_style">{{ item.title }}</view>
+                                                    <view v-if="['0', '1', '2', '3', '5'].includes(theme) && is_show('simple_desc')" :class="form.simple_desc_row == '2' ? 'text-line-2' : 'text-line-1'" :style="simple_desc">{{ item.simple_desc }}</view>
+                                                </view>
+                                                <view v-if="show_content && is_show('plugins_view_icon') && !isEmpty(item.plugins_view_icon_data)" class="flex-row gap-5 align-c">
+                                                    <view v-for="(icon_data, icon_index) in item.plugins_view_icon_data" :key="icon_index" class="radius text-size-xsss padding-horizontal-xs" :style="{ background: icon_data.bg_color, color: icon_data.color, border: '1rpx solid' + (!isEmpty(icon_data.br_color) ? icon_data.br_color : icon_data.bg_color) }">{{ icon_data.name }}</view>
+                                                </view>
+                                            </view>
+                                            <view class="flex-row align-c jc-sb">
+                                                <view class="flex-row align-c nowrap">
+                                                    <view v-if="is_show('price') && !isEmpty(item.min_price)" class="num" :style="'color:' + new_style.shop_price_color">
+                                                        <text :style="price_symbol">{{ item.show_price_symbol }}</text>
+                                                        <text :style="price_style">{{ item.min_price }}</text>
+                                                        <text v-if="is_show('price_unit')" :style="price_unit">{{ item.show_price_unit }}</text>
+                                                    </view>
+                                                    <view v-if="show_content && is_show('original_price') && !isEmpty(item.min_original_price)" class="text-size-xss flex">
+                                                        <!-- <image v-if="form.static_img.length > 0" class="original-price-left" :src="form.static_img[0].url" model="widthFix"></image> -->
+                                                        <text :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]" :style="original_price">
+                                                            {{ item.show_original_price_symbol }}{{ item.min_original_price }}
+                                                            <block v-if="is_show('original_price_unit')">
+                                                                {{ item.show_original_price_unit }}
+                                                            </block>
+                                                        </text>
+                                                    </view>
+                                                </view>
+                                                <view v-if="(form.is_shop_show == '1' && form.shop_button_effect == '1' && item.is_error == 0) || (form.is_shop_show == '1' && form.shop_button_effect == '0')" class="pr" :data-index="index1" :data-split-index="index" @tap.stop="goods_button_event">
+                                                    <block v-if="form.shop_type == 'text'">
+                                                        <view class="plr-11 padding-vertical-xs round" :style="button_style + ('color:' + new_style.shop_button_text_color)">{{ form.shop_button_text }}</view>
+                                                    </block>
+                                                    <view v-else class="round padding-horizontal-sm ptb-5" :style="button_gradient">
+                                                        <iconfont :name="'icon-' + (!isEmpty(form.shop_button_icon_class) ? form.shop_button_icon_class : 'cart')" :color="new_style.shop_icon_color" :size="new_style.shop_icon_size * 2 + 'rpx'" propContainerDisplay="flex"></iconfont>
+                                                    </view>
+                                                    <view v-if="form.shop_button_effect == '1'" class="cart-badge-icon pa badge-style">
+                                                        <component-badge :propNumber="item.user_cart_count || 0"></component-badge>
+                                                    </view>
+                                                </view>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                        </swiper-item>
+                    </swiper>
+                </block>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import { isEmpty, common_styles_computer, common_img_computer, gradient_handle, padding_computer, radius_computer, background_computer, border_computer, box_shadow_computer, old_margin, margin_computer } from '@/common/js/common/common.js';
+    import imageEmpty from '@/components/diy/modules/image-empty.vue';
+    import subscriptIndex from '@/components/diy/modules/subscript/index.vue';
+    import componentBadge from '@/components/badge/badge';
+    var system = app.globalData.get_system_info(null, null, true);
+    var sys_width = app.globalData.window_width_handle(system.windowWidth);
+    export default {
+        components: {
+            imageEmpty,
+            componentBadge,
+            subscriptIndex
+        },
+        props: {
+            propValue: {
+                type: Object,
+                default: () => ({}),
+            },
+            propIsCommonStyle: {
+                type: Boolean,
+                default: true,
+            },
+            propKey: {
+                type: [String, Number],
+                default: '',
+            },
+            propDiyIndex: {
+                type: Number,
+                default: 0,
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 0,
+            },
+        },
+        data() {
+            return {
+                form: {},
+                new_style: {},
+                propIsCartParaCurve: false,
+                list: [],
+                content_radius: '', // 圆角设置
+                content_img_radius: '', // 图片圆角设置
+                content_padding: '', // 内边距设置
+                theme: '', // 选择的风格
+                content_outer_spacing: '', // 商品间距
+                content_outer_spacing_magin: '', // 商品间距
+                // 最外层不同风格下的显示
+                outer_class: '',
+                onter_style: '',
+                // 不同风格下的样式
+                layout_type: '',
+                layout_style: '',
+                layout_img_style: '',
+                content_style: '', // 内容区域的样式
+                show_content: false, // 显示除标题外的其他区域
+                text_line: '', // 超过多少行隐藏
+                style_container: '', // 公共样式
+                style_img_container: '',
+                shop_content_list: [],
+                slides_per_group: 1,
+                // 内容样式
+                title_style: '',
+                price_style: '',
+                sold_number_style: '',
+                score_style: '',
+                button_style: '',
+                simple_desc: '',
+                price_symbol: '',
+                price_unit: '',
+                original_price: '',
+                // 按钮背景色
+                button_gradient: '',
+                // 图片大小
+                img_size: '',
+                new_scale: 1,
+            };
+        },
+        watch: {
+            propKey(val) {
+                this.init();
+            },
+            propValue(new_value, old_value) {
+                this.init();
+            },
+        },
+        created() {
+            this.init();
+        },
+        methods: {
+            isEmpty,
+            init() {
+                const new_form = this.propValue.content || null;
+                const new_style = this.propValue.style || null;
+                if (new_form != null && new_style != null) {
+                    let new_list = [];
+                    // 指定商品并且指定商品数组不为空
+                    if (!isEmpty(new_form.data_list) && new_form.data_type == '0') {
+                        new_list = new_form.data_list.map((item) => ({
+                            ...item.data,
+                            title: !isEmpty(item.new_title) ? item.new_title : item.data.title,
+                            new_cover: item.new_cover,
+                        }));
+                    } else if (!isEmpty(new_form.data_auto_list) && new_form.data_type == '1') {
+                        // 筛选商品并且筛选商品数组不为空
+                        new_list = new_form.data_auto_list;
+                    }
+                    // 最外层不同风格下的显示
+                    const flex = ['0', '2', '6'].includes(new_form.theme) ? 'flex-col ' : 'flex-row ';
+                    const wrap = new_form.theme == '5' ? '' : 'flex-wrap ';
+                    const background = ['6'].includes(new_form.theme) ? 'bg-white ' : '';
+                    const button_gradient = gradient_handle(new_style.shop_button_color, '180deg');
+                    // 默认数据
+                    const product_style_list = [
+                        { name: '单列展示', value: '0', width: 110, height: 120 },
+                        { name: '大图展示', value: '2', width: 166, height: 166 },
+                        { name: '无图模式', value: '6', width: 0, height: 0 },
+                        { name: '两列展示(纵向)', value: '1', width: 180, height: 180 },
+                        { name: '两列展示(横向)', value: '4', width: 70, height: 70 },
+                        { name: '三列展示', value: '3', width: 116, height: 114 },
+                        { name: '左右滑动展示', value: '5', width: 0, height: 0 },
+                    ];
+                    const scale = sys_width / 390;
+                    let img_style = ``;
+                    if (['0', '4'].includes(new_form.theme)) {
+                        // 图片宽度
+                        if (typeof new_style.content_img_width == 'number') {
+                            img_style += `width: ${ new_style.content_img_width * scale }px;`;
+                        } else {
+                            const list = product_style_list.filter(item => item.value == new_form.theme);
+                            if (list.length > 0) {
+                                img_style += `width: ${ list[0].width * scale }px;`;
+                            } else {
+                                img_style += 'width: auto;';
+                            }
+                        }
+                    }
+                    if (!['5', '6'].includes(new_form.theme)) {
+                        // 图片宽度
+                        if (typeof new_style.content_img_height == 'number') {
+                            img_style += `height: ${ new_style.content_img_height * scale }px;`;
+                        } else {
+                            const list = product_style_list.filter(item => item.value == new_form.theme);
+                            if (list.length > 0) {
+                                img_style += `height: ${ list[0].height * scale }px;`;
+                            } else {
+                                img_style += 'height: auto;';
+                            }
+                        }
+                    }
+                    this.setData({
+                        form: new_form,
+                        new_style: new_style,
+                        outer_class: flex + wrap + background + 'oh',
+                        list: new_list,
+                        new_scale: scale,
+                        content_radius: radius_computer(new_style.shop_radius), // 圆角设置
+                        content_img_radius: radius_computer(new_style.shop_img_radius), // 图片圆角设置
+                        content_padding: padding_computer(new_style.shop_padding) + 'box-sizing: border-box;', // 内边距设置
+                        theme: new_form.theme, // 选择的风格
+                        content_outer_spacing: new_style.content_outer_spacing, // 商品间距
+                        content_outer_spacing_magin: new_style.content_outer_spacing * 2 + 'rpx',
+                        onter_style: new_form.theme == '6' ? radius_computer(new_style.shop_radius) : `gap: ${new_style.content_outer_spacing * 2 + 'rpx'};`,
+                        // 不同风格下的样式
+                        layout_type: ['0', '4'].includes(new_form.theme) ? 'flex-row wh-auto ht-auto oh' : 'flex-col wh-auto ht-auto oh',
+                        layout_style: this.get_layout_style(new_style, new_form),
+                        layout_img_style: this.get_layout_img_style(new_style, new_form),
+                        content_style: this.get_content_style(new_style, new_form), // 内容区域的样式
+                        show_content: ['0', '1', '2'].includes(new_form.theme), // 显示除标题外的其他区域
+                        text_line: this.get_text_line(new_form), // 超过多少行隐藏
+                        style_container: this.propIsCommonStyle ? common_styles_computer(new_style.common_style) : '', // 公共样式
+                        style_img_container: this.propIsCommonStyle ? common_img_computer(new_style.common_style, this.propIndex) : '', // 图片样式
+                        // 内容样式设置
+                        button_gradient: button_gradient,
+                        title_style: this.trends_config(new_style, 'title', 'title', new_form),
+                        price_style: this.trends_config(new_style, 'price'),
+                        sold_number_style: this.trends_config(new_style, 'sold_number'),
+                        score_style: this.trends_config(new_style, 'score'),
+                        button_style: this.trends_config(new_style, 'button', 'buy_button') + button_gradient,
+                        simple_desc: this.trends_config(new_style, 'simple_desc', 'desc', new_form),
+                        price_symbol: !isEmpty(new_style.shop_price_symbol_color) ? this.trends_config(new_style, 'price_symbol') : 'font-size: 18rpx;color: #EA3323;' ,
+                        price_unit: !isEmpty(new_style.shop_price_unit_color) ? this.trends_config(new_style, 'price_unit') : 'font-size: 18rpx;color: #EA3323;',
+                        original_price: this.trends_config(new_style, 'original_price'),
+                        shop_content_list: this.get_shop_content_list(new_list, new_form, new_style),
+                        slides_per_group: new_style.rolling_fashion == 'translation' ? new_form.carousel_col : 1,
+                        img_size: img_style,
+                    });
+                }
+            },
+            get_shop_content_list(list, form, new_style) {
+                // 深拷贝一下，确保不会出现问题
+                const cloneList = JSON.parse(JSON.stringify(list));
+                if (new_style.rolling_fashion != 'translation') {
+                    // 如果是分页滑动情况下，根据选择的行数和每行显示的个数来区分具体是显示多少个
+                    if (cloneList.length > 0) {
+                        // 每页显示的数量
+                        const num = form.carousel_col;
+                        // 存储数据显示
+                        let nav_list = [];
+                        // 拆分的数量
+                        const split_num = Math.ceil(cloneList.length / num);
+                        for (let i = 0; i < split_num; i++) {
+                            nav_list.push({
+                                split_list: cloneList.slice(i * num, (i + 1) * num),
+                            });
+                        }
+                        return nav_list;
+                    } else {
+                        // 否则的话，就返回全部的信息
+                        return [
+                            {
+                                split_list: cloneList,
+                            },
+                        ];
+                    }
+                } else {
+                    // 存储数据显示
+                    let nav_list = [];
+                    cloneList.forEach((item) => {
+                        nav_list.push({
+                            split_list: [item],
+                        });
+                    });
+                    return nav_list;
+                }
+            },
+            get_text_line(form) {
+                let line = '';
+                if (['1', '6'].includes(form.theme)) {
+                    line = 'text-line-1';
+                } else if (['0', '2', '3', '4', '5'].includes(form.theme)) {
+                    line = 'text-line-2';
+                }
+                return line;
+            },
+            // 不同风格下的样式
+            get_layout_style(new_style, form) {
+                const { shop_margin = old_margin } = new_style;
+                const radius = form.theme == '6' ? '' : radius_computer(new_style.shop_radius);
+                const style = form.theme != '6' ? gradient_handle(new_style?.shop_color_list || [], new_style?.shop_direction || '') + margin_computer(shop_margin) + border_computer(new_style) + box_shadow_computer(new_style) : '';
+                let size_style = ``;
+                const shop_left_right_width = shop_margin.margin_left + shop_margin.margin_right;
+                if (['1', '4'].includes(form.theme)) {
+                    size_style = `width: calc((100% - ${new_style.content_outer_spacing * 2 + (shop_left_right_width * 4) + 'rpx'}) / 2);`;
+                } else if (form.theme == '3') {
+                    size_style = `width: calc((100% - ${new_style.content_outer_spacing * 4 +  (shop_left_right_width * 6) + 'rpx'}) / 3);`;
+                } else if (form.theme == '5') {
+                    // 如果不是平移的时候执行
+                    if (new_style.rolling_fashion != 'translation') {
+                        size_style = `width: ${this.get_multicolumn_columns_width(new_style, form)};min-width: ${this.get_multicolumn_columns_width(new_style, form)};height: ${new_style.content_outer_height * (sys_width / 390) + 'px'};`;
+                    } else {
+                        size_style = `margin-right: ${ (new_style.content_outer_spacing * 2) + (shop_margin.margin_right * 2) }rpx;width: 100%;height: 100%;`;
+                    }
+                } else if (form.theme == '0') {
+                    size_style = `width: calc(100% - ${ shop_left_right_width }px);`;
+                }
+                return `${radius} ${ style } ${size_style}`;
+            },
+            get_layout_img_style(new_style, form) {
+                const padding = ['0', '4'].includes(form.theme) ? padding_computer(new_style.shop_padding) + 'box-sizing: border-box;' : '';
+                const data = {
+                    background_img_style: new_style?.shop_background_img_style || '',
+                    background_img: new_style?.shop_background_img || '',
+                }
+                const background = form.theme != '6' ? background_computer(data) : '';
+                return `${padding} ${background}`;
+            },
+            get_multicolumn_columns_width(new_style, form) {
+                const { carousel_col } = form;
+                // 计算间隔的空间。(gap * gap数量) / 模块数量
+                let gap = (new_style.content_outer_spacing * (carousel_col - 1)) / carousel_col;
+                return `calc(${100 / carousel_col}% - ${gap * 2}rpx)`;
+            },
+            get_content_style(new_style, form) {
+                const spacing_value = new_style.content_spacing;
+                let spacing = '';
+                if (['0', '4'].includes(form.theme)) {
+                    spacing = `margin-left: ${spacing_value * 2}rpx;`;
+                } else {
+                    spacing = padding_computer(new_style.shop_padding) + 'box-sizing: border-box;';
+                }
+                return `${spacing}`;
+            },
+            // 判断是否显示对应的内容
+            is_show(index) {
+                return this.form.is_show.includes(index);
+            },
+            // 根据传递的参数，从对象中取值
+            trends_config(new_style, key, type, new_form) {
+                return this.style_config(new_style[`shop_${key}_typeface`], new_style[`shop_${key}_size`], new_style[`shop_${key}_color`], type, new_form);
+            },
+            // 根据传递的值，显示不同的内容
+            style_config(typeface, size, color, type, new_form) {
+                let style = `font-weight:${typeface}; font-size: ${size * 2}rpx;`;
+                if (type == 'title') {
+                    if (['1', '6'].includes(new_form.theme)) {
+                        style += `line-height: ${size * 2}rpx;height: ${size * 2}rpx;color: ${color};`;
+                    } else if (['0', '2', '3', '4', '5'].includes(new_form.theme)) {
+                        style += `line-height: ${size > 0 ? (size + 3) * 2 : 0}rpx;height: ${size > 0 ? (size + 3) * 4 : 0}rpx;color: ${color};`;
+                    }
+                } else if (type == 'desc') {
+                    if (new_form.simple_desc_row == '2') {
+                        style += `line-height: ${size > 0 ? (size + 3) * 2 : 0}rpx;height: ${size > 0 ? (size + 3) * 4 : 0}rpx;color: ${color};`;
+                    } else {
+                        style += `line-height: ${size * 2}rpx;height: ${size * 2}rpx;color: ${color};`;
+                    }
+                } else {
+                    if (type != 'buy_button') {
+                        style += `color: ${color};`;
+                    }
+                }
+                return style;
+            },
+            // icon标志显示样式
+            icon_style(item) {
+                let style = `background: ${item.bg_color};color: ${item.color};`;
+                if (!isEmpty(item.br_color)) {
+                    style += `border: 2rpx solid ${item.br_color};`;
+                } else {
+                    style += `border: 2rpx solid ${item.bg_color};`;
+                }
+                return style;
+            },
+            url_event(e) {
+                let index = e.currentTarget.dataset.index || 0;
+                let goods = this.list[index];
+                let split_index = 0;
+                if (this.theme == '5') {
+                    split_index = e.currentTarget.dataset.splitIndex || 0;
+                    goods = this.shop_content_list[index].split_list[split_index];
+                }
+                app.globalData.goods_data_cache_handle(goods.id, goods);
+                app.globalData.url_event(e);
+            },
+            goods_button_event(e) {
+                this.goods_cart_event(e);
+            },
+            // 加入购物车
+            goods_cart_event(e) {
+                let index = e.currentTarget.dataset.index || 0;
+                let split_index = 0;
+                let goods = this.list[index];
+                if (this.theme == '5') {
+                    split_index = e.currentTarget.dataset.splitIndex || 0;
+                    goods = this.shop_content_list[index].split_list[split_index];
+                }
+                if (this.form.shop_button_effect == '0') {
+                    app.globalData.goods_data_cache_handle(goods.id, goods);
+
+                    app.globalData.url_open(goods.goods_url);
+                } else {
+                    // 开启购物车抛物线效果则展示提示操作
+                    let is_success_tips = this.propIsCartParaCurve ? 0 : 1;
+                    this.$emit(
+                        'goods_buy_event',
+                        this.propDiyIndex,
+                        goods,
+                        {
+                            buy_event_type: 'cart',
+                            is_direct_cart: 1,
+                            is_success_tips: is_success_tips,
+                        },
+                        {
+                            index: index,
+                            split_index: split_index,
+                            pos: e,
+                        }
+                    );
+                }
+            },
+            // 加入购物车成功回调
+            goods_cart_back_event(e) {
+                app.globalData.showToast('加入成功', 'success');
+                // 增加数量
+                var { index, split_index } = e.back_data;
+                let new_data = this.list;
+                let goods = new_data[index];
+                if (this.theme == '5') {
+                    new_data = this.shop_content_list;
+                    goods = new_data[index][split_index];
+                }
+                goods['user_cart_count'] = parseInt(goods['user_cart_count'] || 0) + parseInt(e.stock);
+                if (goods['user_cart_count'] > 99) {
+                    goods['user_cart_count'] = '99+';
+                }
+                if (this.theme != '5') {
+                    new_data[index] = goods;
+                    this.setData({
+                        list: new_data,
+                    });
+                } else {
+                    new_data[index][split_index] = goods;
+                    this.setData({
+                        shop_content_list: new_data,
+                    });
+                }
+            },
+        },
+    };
+</script>
+
+<style scoped lang="scss">
+    .identifying {
+        font-size: 18rpx;
+    }
+    .original-price {
+        padding: 0 20rpx;
+    }
+    .flex-img5 {
+        width: 100%;
+        height: 100%;
+    }
+    // .original-price-left {
+    //     width: 20rpx;
+    //     height: 28rpx;
+    // }
+    .br-b-e {
+        border-bottom: 2rpx solid #eee;
+    }
+    .badge-style {
+        top: -20rpx;
+        right: 10rpx;
+    }
+</style>
diff --git a/components/diy/goods-tabs.vue b/components/diy/goods-tabs.vue
new file mode 100644
index 0000000..36998a8
--- /dev/null
+++ b/components/diy/goods-tabs.vue
@@ -0,0 +1,253 @@
+<template>
+    <view class="goods-tabs ou" :class="'goods-tabs-' + propKey" :style="style_container">
+        <view class="ou" :style="style_img_container">
+            <componentDiyModulesTabsView :propKey="propKey" :propValue="goods_tabs" :propIsTop="top_up == '1'" :propTop="sticky_top" :propStyle="tabs_style" :propsTabsContainer="tabs_container" :propsTabsImgContainer="tabs_img_container" :propCustomNavHeight="propIsTabsUseSafeDistance ? (propCustomNavHeight * 2 + 'rpx') : '0rpx'" :propTabsSlidingFixedBg="tabs_sliding_fixed_bg" :propTabsBackground="tabs_background" @onTabsTap="tabs_click_event"></componentDiyModulesTabsView>
+            <view :style="shop_margin_top">
+                <view :style="shop_container">
+                    <view :style="shop_img_container">
+                        <componentGoodsList ref="diy_goods_list" :propKey="diy_key" :propDiyIndex="propDiyIndex" :propValue="goods_tabs" :propIsCommonStyle="false" @goods_buy_event="goods_buy_event"></componentGoodsList>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import { common_styles_computer, common_img_computer, padding_computer, margin_computer, background_computer, gradient_computer, isEmpty, old_border_and_box_shadow, old_margin, old_radius, old_padding, border_computer, box_shadow_computer, radius_computer } from '@/common/js/common/common.js';
+    import componentDiyModulesTabsView from '@/components/diy/modules/tabs-view';
+    import componentGoodsList from '@/components/diy/goods-list';
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        components: {
+            componentDiyModulesTabsView,
+            componentGoodsList,
+        },
+        props: {
+            propValue: {
+                type: Object,
+                default: () => ({}),
+            },
+            propTop: {
+                type: Number,
+                default: 0,
+            },
+            propCustomNavHeight: {
+                type: Number,
+                default: 33,
+            },
+            propScrollTop: {
+                type: Number,
+                default: 0,
+            },
+            // 顶部导航是否开启沉浸模式
+            propIsImmersionModel: {
+                type: Boolean,
+                default: false,
+            },
+            propKey: {
+                type: [String, Number],
+                default: '',
+            },
+            propDiyIndex: {
+                type: Number,
+                default: 0,
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 0,
+            },
+            propIsTabsUseSafeDistance: {
+                type: Boolean,
+                default: true
+            }
+        },
+        data() {
+            return {
+                style_container: '',
+                style_img_container: '',
+                goods_tabs: {},
+                // 是否滑动置顶
+                top_up: '0',
+                tabs_top: 0,
+                tabs_background: 'background:transparent',
+                custom_nav_height: 33,
+                diy_key: '',
+                // 选项卡背景设置
+                tabs_container: '',
+                tabs_img_container: '',
+                tabs_sliding_fixed_bg: '',
+                // 商品区域背景设置
+                shop_margin_top: '',
+                shop_container: '',
+                shop_img_container: '',
+                // #ifdef MP
+                nav_safe_space: bar_height + 5,
+                // #endif
+                // #ifdef H5 || MP-TOUTIAO
+                nav_safe_space: bar_height + 7,
+                // #endif
+                // #ifdef APP
+                nav_safe_space: bar_height + 0,
+                // #endif
+                // 选项卡默认数据
+                tabs_index: 0,
+                sticky_top: 0,
+            };
+        },
+        watch: {
+            propScrollTop(newVal) {
+                if (newVal + this.sticky_top + this.custom_nav_height > this.tabs_top + this.nav_safe_space && this.top_up == '1') {
+                    let new_style = this.propValue.style || {};
+                    let tabs_bg = new_style.common_style.color_list;
+                    let new_tabs_background = '';
+                    if (tabs_bg.length > 0 && (tabs_bg[0].color || null) != null) {
+                        new_tabs_background = gradient_computer(new_style.common_style);
+                    }
+                    let new_tabs_background_img = background_computer(new_style.common_style);
+                    if (new_tabs_background_img.length > 0) {
+                        new_tabs_background_img += 'background-position: top left;';
+                    }
+                    this.tabs_background = (new_tabs_background.length > 0 ? new_tabs_background : 'background:#fff;') + new_tabs_background_img;
+                } else {
+                    this.tabs_background = 'background:transparent';
+                }
+            },
+            propTop(val) {
+                this.init();
+            },
+            propKey(val) {
+                // 初始化
+                this.setData({
+                    diy_key: val,
+                });
+                this.init();
+            },
+        },
+        created() {
+            this.init();
+        },
+        mounted() {
+            this.$nextTick(() => {
+                const self = this;
+                setTimeout(() => {
+                    self.getTop();
+                });
+                // #ifdef H5 || MP-TOUTIAO
+                // 获取自定义导航栏高度
+                this.setData({
+                    custom_nav_height: this.propCustomNavHeight,
+                });
+                // #endif
+            });
+        },
+        methods: {
+            init() {
+                let new_data = typeof this.propValue == 'string' ? JSON.parse(JSON.stringify(this.propValue)) : this.propValue;
+                const new_content = new_data.content || {};
+                const new_style = new_data.style || {};
+                const new_tabs_data = new_data.content.tabs_list[this.tabs_index] || {};
+                // 产品的值
+                new_data.content.data_type = new_tabs_data.data_type;
+                new_data.content.category = new_tabs_data.category;
+                new_data.content.brand = new_tabs_data.brand;
+                new_data.content.number = new_tabs_data.number;
+                new_data.content.sort = new_tabs_data.sort;
+                new_data.content.sort_rules = new_tabs_data.sort_rules;
+                new_data.content.data_list = new_tabs_data.data_list;
+                new_data.content.data_auto_list = new_tabs_data.data_auto_list;
+                // 公共样式
+                const common_style = new_style.common_style;
+                let tabs_style_obj = {
+                    padding_top: common_style.padding_top - this.propCustomNavHeight < 0 ? 0 : common_style.padding_top - this.propCustomNavHeight,
+                    padding_left: common_style.padding_left,
+                    padding_right: common_style.padding_right,
+                };
+                let new_tabs_style = padding_computer(tabs_style_obj) + `position:relative;left: -${tabs_style_obj.padding_left * 2}rpx;right: -${tabs_style_obj.padding_right * 2}rpx;width:100%;`;
+                // 如果是历史数据的话，就执行默认添加下边距
+                if (isEmpty(new_style.tabs_padding)) {
+                    new_tabs_style += 'padding-bottom: 20rpx;';
+                }
+                const { tabs_bg_color_list = [], tabs_bg_direction = '', tabs_bg_background_img_style = '', tabs_bg_background_img = [], tabs_radius = old_radius, tabs_padding = old_padding, shop_content_color_list = [], shop_content_direction = '', shop_content_background_img_style = '', shop_content_background_img = [], shop_content_margin = old_margin, shop_content_padding = old_padding, shop_content_radius = old_radius } = new_style;
+                // 选项卡背景设置
+                const tabs_data = {
+                    color_list: tabs_bg_color_list,
+                    direction: tabs_bg_direction,
+                    background_img_style: tabs_bg_background_img_style,
+                    background_img: tabs_bg_background_img,
+                };
+                // 商品区域背景设置
+                const shop_content_data = {
+                    color_list: shop_content_color_list,
+                    direction: shop_content_direction,
+                    background_img_style: shop_content_background_img_style,
+                    background_img: shop_content_background_img,
+                };
+                const shop_content = new_style?.shop_content || old_border_and_box_shadow;
+                const tabs_content = new_style?.tabs_content || old_border_and_box_shadow;
+                this.setData({
+                    top_up: new_content.tabs_top_up,
+                    sticky_top: this.propTop + (new_style?.tabs_margin?.margin_top || 0),
+                    goods_tabs: new_data,
+                    style_container: common_styles_computer(common_style),
+                    style_img_container: common_img_computer(common_style, this.propIndex),
+                    tabs_style: new_tabs_style,
+                    tabs_sliding_fixed_bg: gradient_computer(tabs_data),
+                    tabs_container: gradient_computer(tabs_data) + radius_computer(tabs_radius) + margin_computer(new_style?.tabs_margin || old_margin) + border_computer(tabs_content) + box_shadow_computer(tabs_content) + 'overflow: hidden;',
+                    tabs_img_container: background_computer(tabs_data) + padding_computer(tabs_padding) + 'box-sizing: border-box;overflow: hidden;',
+                    shop_margin_top: 'margin-top:' + (new_style?.shop_content_spacing || 0) * 2 + 'rpx;',
+                    shop_container: gradient_computer(shop_content_data) + margin_computer(shop_content_margin) + radius_computer(shop_content_radius) + box_shadow_computer(shop_content) + border_computer(shop_content) + 'overflow: hidden;',
+                    shop_img_container: background_computer(shop_content_data) + padding_computer(shop_content_padding) + 'box-sizing: border-box;overflow: hidden;',
+                });
+            },
+            tabs_click_event(index) {
+                let new_data = JSON.parse(JSON.stringify(this.propValue));
+                new_data.content.data_type = new_data.content.tabs_list[index].data_type;
+                new_data.content.category = new_data.content.tabs_list[index].category;
+                new_data.content.brand = new_data.content.tabs_list[index].brand;
+                new_data.content.number = new_data.content.tabs_list[index].number;
+                new_data.content.sort = new_data.content.tabs_list[index].sort;
+                new_data.content.sort_rules = new_data.content.tabs_list[index].sort_rules;
+                new_data.content.data_list = new_data.content.tabs_list[index].data_list;
+                new_data.content.data_auto_list = new_data.content.tabs_list[index].data_auto_list;
+                this.setData({
+                    tabs_index: index,
+                    goods_tabs: new_data,
+                    diy_key: Math.random(),
+                });
+            },
+            // 获取商品距离顶部的距离
+            getTop() {
+                const query = uni.createSelectorQuery().in(this);
+                query
+                    .select('.goods-tabs-' + this.propKey)
+                    .boundingClientRect((res) => {
+                        if ((res || null) != null) {
+                            let new_data = typeof this.propValue == 'string' ? JSON.parse(JSON.stringify(this.propValue)) : this.propValue;
+                            const new_style = new_data.style || {};
+                            this.setData({
+                                tabs_top: res.top - (new_style.common_style?.margin_top || 0),
+                            });
+                        }
+                    })
+                    .exec();
+            },
+            goods_buy_event(index, goods = {}, params = {}, back_data = null) {
+                this.$emit('goods_buy_event', index, goods, params, back_data);
+            },
+            goods_cart_back_event(e) {
+                if ((this.$refs.diy_goods_list || null) != null) {
+                    this.$refs.diy_goods_list.goods_cart_back_event(e);
+                }
+            },
+        },
+    };
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/components/diy/header.vue b/components/diy/header.vue
new file mode 100644
index 0000000..50b4fb7
--- /dev/null
+++ b/components/diy/header.vue
@@ -0,0 +1,420 @@
+<template>
+    <view v-if="(propValue || null) !== null" class="header-container">
+        <view class="header-around wh-auto" :style="roll_style + position">
+            <view class="wh-auto" :style="roll_img_style">
+                <view class="wh-auto ht-auto pa up_slide_bg" :style="up_slide_style">
+                    <view class="wh-auto ht-auto" :style="up_slide_img_style"></view>
+                </view>
+                <view :style="top_content_style">
+                    <view class="header-content flex-row align-s">
+                        <view class="model-top flex-1 mt-1">
+                            <view class="roll pr z-i">
+                                <view class="model-head pr padding-left-main padding-right-main" style="box-sizing: border-box">
+                                    <view class="flex-col" :style="'gap:' + data_alone_row_space">
+                                        <view class="model-head-content flex-row align-c jc-sb gap-16 wh-auto pr" :style="header_style">
+                                            <!-- 支付宝小程序自带返回按钮，这里就不给返回按钮了，这里给留出一点空间就行 -->
+                                            <!-- #ifndef MP-ALIPAY -->
+                                            <view v-if="!is_tabbar_pages" class="z-i dis-inline-block margin-top-xs" @tap="top_nav_left_back_event">
+                                                <iconfont name="icon-arrow-left" size="40rpx" propContainerDisplay="flex" :color="form.style.left_back_btn_color || '#333'"></iconfont>
+                                            </view>
+                                            <!-- #endif -->
+                                            <!-- #ifdef MP-ALIPAY -->
+                                            <view class="dis-inline-block padding-left-sm"></view>
+                                            <!-- #endif -->
+                                            <view v-if="['1', '2', '3'].includes(form.content.theme)" class="flex-1">
+                                                <view class="flex-row align-c jc-c ht-auto gap-16" :class="position_class" :style="text_style + 'justify-content:' + form.content.indicator_location || 'center'">
+                                                    <template v-if="['2', '3'].includes(form.content.theme)">
+                                                        <view v-if="form.content.logo.length > 0" class="logo-outer-style re flex-row align-c">
+                                                            <template v-if="form.style.up_slide_logo && form.style.up_slide_logo.length > 0">
+                                                                <!-- 有上滑logo的处理逻辑 -->
+                                                                <view v-if="(propScrollTop - 5) / (header_top + 33) < 1" class="logo-style" :style="up_slide_old_logo_style">
+                                                                    <image class="logo-style" :src="form.content.logo[0].url" mode="heightFix" />
+                                                                </view>
+                                                                <view :class="['logo-style left-0', { pa: (propScrollTop - 5) / (header_top + 33) < 1 }]" :style="'opacity:0;' + up_slide_opacity">
+                                                                    <image class="logo-style" :src="form.style.up_slide_logo[0].url" mode="heightFix" />
+                                                                </view>
+                                                            </template>
+                                                            <template v-else>
+                                                                <!-- 没有上滑logo的处理逻辑 -->
+                                                                <image class="logo-style" :src="form.content.logo[0].url" mode="heightFix" />
+                                                            </template>
+                                                        </view>
+                                                    </template>
+                                                    <view v-if="['1', '2', '3'].includes(form.content.theme) && !isEmpty(form.content.title)">{{ form.content.title }}</view>
+                                                    <template v-if="['3'].includes(form.content.theme) && !is_search_alone_row">
+                                                        <view class="flex-1 fw-n">
+                                                            <componentDiySearch :propValue="form" :propIsPageSettings="true"></componentDiySearch>
+                                                        </view>
+                                                    </template>
+                                                </view>
+                                            </view>
+                                            <view v-else-if="['4', '5'].includes(form.content.theme)" class="flex-1 flex-row align-c">
+                                                <view v-if="form.content.positioning_name_float !== '1'" class="flex-row align-c gap-2">
+                                                    <view :style="location_margin">
+                                                        <component-choice-location :propLocationContainerStyle="style_location_container" :propLocationImgContainerStyle="style_location_img_container" :propBaseColor="location_color" :propTextDefaultName="form.content.positioning_name" :propIsLeftIconArrow="form.content.is_location_left_icon_show == '1'" :propLeftImgValue="form.content.location_left_img" :propLeftIconValue="'icon-' + form.content.location_left_icon" :propIconLocationSize="location_left_size" :propIconArrowSize="location_right_size" :propIsRightIconArrow="form.content.is_location_right_icon_show == '1'" :propRightImgValue="form.content.location_right_img" :propRightIconValue="'icon-' + form.content.location_right_icon" :propTextMaxWidth="location_name_style" propContainerDisplay="flex" @onBack="choice_location_back"></component-choice-location>
+                                                    </view>
+                                                </view>
+                                                <template v-if="['5'].includes(form.content.theme) && !is_search_alone_row">
+                                                    <view class="flex-1">
+                                                        <componentDiySearch :propValue="form" :propIsPageSettings="true" :propLocationMargin="location_margin" propSearchType="header" :propLocationContainerStyle="style_location_container" :propLocationImgContainerStyle="style_location_img_container" :propBaseColor="location_color" :propIconLocationSize="location_left_size" :propIconArrowSize="location_right_size" @onBack="choice_location_back"></componentDiySearch>
+                                                    </view>
+                                                </template>
+                                            </view>
+                                            <view v-if="!isEmpty(form.content.icon_setting) && !is_icon_alone_row" class="flex-row align-c z-i" :class="['1'].includes(form.content.theme) ? 'right-0' : ''" :style="{ gap: form.style.img_space * 2 + 'rpx' }">
+                                                <view v-for="(item, index) in form.content.icon_setting" :key="index" class="pr" :style="{ width: form.style.img_size * 2 + 'rpx', height: form.style.img_size * 2 + 'rpx' }" :data-value="item.link.page" @tap="url_event">
+                                                    <imageEmpty v-if="item.img.length > 0" :propImageSrc="item.img[0].url" :propErrorStyle="'width: ' + Number(form.style.img_size) * 2 + 'rpx;height:' + Number(form.style.img_size) * 2 + 'rpx;'"></imageEmpty>
+                                                    <iconfont v-else :name="'icon-' + item.icon" :size="form.style.img_size * 2 + 'rpx'" :color="form.style.img_color" propContainerDisplay="flex"></iconfont>
+                                                    <view v-if="!isEmpty(item.badge) && item.badge !== 0" class="pa badge-style">
+                                                        <component-badge :propNumber="item.badge || 0"></component-badge>
+                                                    </view>
+                                                </view>
+                                            </view>
+                                        </view>
+                                        <view v-if="is_search_alone_row || is_icon_alone_row" class="model-head-content flex-row align-c gap-16">
+                                            <template v-if="['3', '5'].includes(form.content.theme) && is_search_alone_row">
+                                                <view class="flex-1">
+                                                    <componentDiySearch :propValue="form" :propIsPageSettings="true" :propLocationMargin="location_margin" propSearchType="header" :propLocationContainerStyle="style_location_container" :propLocationImgContainerStyle="style_location_img_container" :propBaseColor="location_color" :propIconLocationSize="location_left_size" :propIconArrowSize="location_right_size" @onBack="choice_location_back"></componentDiySearch>
+                                                </view>
+                                            </template>
+                                            <view v-if="!isEmpty(form.content.icon_setting) && is_icon_alone_row" class="flex-row align-c z-i" :class="['1'].includes(form.content.theme) ? 'right-0' : ''" :style="{ gap: form.style.img_space * 2 + 'rpx' }">
+                                                <view v-for="(item, index) in form.content.icon_setting" :key="index" class="pr" :style="{ width: form.style.img_size * 2 + 'rpx', height: form.style.img_size * 2 + 'rpx' }" :data-value="item.link.page" @tap="url_event">
+                                                    <imageEmpty v-if="item.img.length > 0" :propImageSrc="item.img[0].url" :propErrorStyle="'width: ' + Number(form.style.img_size) * 2 + 'rpx;height:' + Number(form.style.img_size) * 2 + 'rpx;'"></imageEmpty>
+                                                    <iconfont v-else :name="'icon-' + item.icon" :size="form.style.img_size * 2 + 'rpx'" :color="form.style.img_color" propContainerDisplay="flex"></iconfont>
+                                                    <view v-if="!isEmpty(item.badge) && item.badge !== 0" class="pa badge-style">
+                                                        <component-badge :propNumber="item.badge || 0"></component-badge>
+                                                    </view>
+                                                </view>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <block v-if="!is_immersion_model">
+            <view v-if="!is_positon_realative" class="nav-seat" :style="top_content_style">
+                <view :style="'height:' + (is_search_alone_row || is_icon_alone_row ? 'calc(132rpx + ' + data_alone_row_space + ');' : '66rpx;')"></view>
+            </view>
+        </block>
+        <!-- #ifndef H5 || MP-TOUTIAO -->
+        <!-- <view v-if="is_positon_realative" class="wh-auto pf top-0 left-0 right-0" :style="roll_style">
+            <view :style="top_content_style">
+                <view :style="'height:' + (is_search_alone_row || is_icon_alone_row ? 'calc(132rpx + ' + data_alone_row_space + ');' : '66rpx;')"></view>
+            </view>
+        </view> -->
+        <!-- #endif -->
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import componentDiySearch from '@/components/diy/search';
+    import imageEmpty from '@/components/diy/modules/image-empty';
+    import componentChoiceLocation from '@/components/choice-location/choice-location';
+    import componentBadge from '@/components/badge/badge';
+    import { isEmpty, background_computer, gradient_computer, margin_computer, padding_computer, radius_computer } from '@/common/js/common/common.js';
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        props: {
+            propValue: {
+                type: [String, Number, Object],
+                default: '',
+            },
+            // 滚动距离
+            propScrollTop: {
+                type: Number,
+                default: 0,
+            },
+            propKey: {
+                type: [String, Number],
+                default: '',
+            },
+        },
+        components: {
+            componentDiySearch,
+            imageEmpty,
+            componentChoiceLocation,
+            componentBadge,
+        },
+        data() {
+            return {
+                form: {},
+                new_style: {},
+                position: '',
+                roll_style: '',
+                text_style: '',
+                header_style: 'max-width:100%',
+                common_app_is_header_nav_fixed: 0,
+                // 5,7,0 是误差，， 10 是下边距，66是高度，bar_height是不同小程序下的导航栏距离顶部的高度
+                // #ifdef MP
+                top_content_style: 'padding-top:' + (bar_height + 5) + 'px;padding-bottom:10px;',
+                // #endif
+                // #ifdef H5 || MP-TOUTIAO
+                top_content_style: 'padding-top:' + (bar_height + 7) + 'px;padding-bottom:10px;',
+                // #endif
+                // #ifdef APP
+                top_content_style: 'padding-top:' + bar_height + 'px;padding-bottom:10px;',
+                // #endif
+                is_positon_realative: false,
+                // 顶部背景样式类别
+                header_background_type: 'color_image',
+                // #ifdef MP
+                header_top: bar_height + 5 + 10 + 33,
+                // #endif
+                // #ifdef H5 || MP-TOUTIAO
+                header_top: bar_height + 7 + 10 + 33,
+                // #endif
+                // #ifdef APP
+                header_top: bar_height + 0 + 10 + 33,
+                // #endif
+                // 判断是否是沉浸模式
+                is_immersion_model: false,
+                up_slide_opacity: '',
+                up_slide_old_logo_style: '',
+                up_slide_style: '',
+                up_slide_img_style: '',
+                // 当前页面是否在底部菜单中
+                is_tabbar_pages: app.globalData.is_tabbar_pages(),
+                // 判断header的查询是否独行
+                is_search_alone_row: false,
+                is_icon_alone_row: false,
+                data_alone_row_space: '0rpx',
+                // 定位设置
+                style_location_container: '',
+                style_location_img_container: '',
+                location_left_size: '24rpx',
+                location_right_size: '24rpx',
+                location_margin: '', // 悬浮之后有间距，所以要将margin设置成外padding
+                location_color: '', // 定位颜色
+                location_name_style: '', // 定位样式
+                // 默认数据
+                old_radius: { radius: 0, radius_top_left: 0, radius_top_right: 0, radius_bottom_left: 0, radius_bottom_right: 0 },
+                old_padding: { padding: 0, padding_top: 0, padding_bottom: 0, padding_left: 0, padding_right: 0 },
+                old_margin: { margin: 0, margin_top: 0, margin_bottom: 0, margin_left: 0, margin_right: 0 },
+            };
+        },
+        watch: {
+            // 监听滚动距离
+            propScrollTop(newVal) {
+                const { up_slide_background_color_list, up_slide_background_direction, up_slide_background_img, up_slide_background_img_style, up_slide_display } = this.propValue.style || {};
+                if (up_slide_display == '1') {
+                    // 渐变
+                    const gradient = { color_list: up_slide_background_color_list, direction: up_slide_background_direction };
+                    // 背景图
+                    const back = { background_img: up_slide_background_img, background_img_style: up_slide_background_img_style };
+                    const up_slide_opacity = 'opacity:' + ((newVal - 20) / this.header_top > 1 ? 1 : ((newVal - 20) / this.header_top).toFixed(2)) + ';';
+                    this.up_slide_opacity = up_slide_opacity;
+                    // 来的logo要比新的隐藏的快，所以要比原来的logo快一点
+                    this.up_slide_old_logo_style = 'opacity:' + ((newVal - 5) / this.header_top > 1 ? 0 : (1 - (newVal - 5) / this.header_top).toFixed(2)) + ';';
+                    // =0是大小误差
+                    this.up_slide_style = gradient_computer(gradient) + up_slide_opacity;
+                    this.up_slide_img_style = background_computer(back);
+                }
+            },
+            propKey(val) {
+                if ((this.propValue || null) !== null) {
+                    this.init();
+                }
+            },
+        },
+        created() {
+            // 判断是否有值初始化
+            if ((this.propValue || null) !== null) {
+                this.init();
+            }
+        },
+        methods: {
+            // 判断是否为空
+            isEmpty,
+            // 初始化
+            init() {
+                const new_content = this.propValue.content || {};
+                const new_style = this.propValue.style || {};
+                let new_roll_style = '';
+                let new_roll_img_style = '';
+                const { header_background_img, header_background_img_style, header_background_color_list, header_background_direction, header_background_type, immersive_style } = new_style;
+                if (header_background_type === 'color_image') {
+                    // 渐变
+                    const gradient = { color_list: header_background_color_list, direction: header_background_direction };
+                    // 背景图
+                    const back = { background_img: header_background_img, background_img_style: header_background_img_style };
+                    new_roll_style += gradient_computer(gradient);
+                    new_roll_img_style += background_computer(back);
+                } else {
+                    new_roll_style += `background: transparent;`;
+                }
+                // 小程序下，获取小程序胶囊的宽度
+                let menu_button_info = 'max-width:100%';
+                let new_text_style = `font-weight:${new_style.header_background_title_typeface}; font-size: ${new_style.header_background_title_size * 2}rpx; color: ${new_style.header_background_title_color};`;
+                // #ifndef MP-TOUTIAO
+                // #ifdef MP
+                // 判断是否有胶囊
+                const is_current_single_page = app.globalData.is_current_single_page();
+                // 如果有胶囊的时候，做处理
+                if (is_current_single_page == 0) {
+                    const custom = uni.getMenuButtonBoundingClientRect();
+                    menu_button_info = `max-width:calc(100% - ${custom.width + 10}px);`;
+                    new_text_style += `right:-${custom.width + 10}px;`;
+                }
+                // #endif
+                // #endif
+                const { location_margin = this.old_margin } = new_style;
+                this.setData({
+                    form: this.propValue,
+                    position: new_style.up_slide_display == '1' ? 'position:fixed;' : new_style.immersive_style === '1' ? 'position:absolute;' : 'position:relative;',
+                    is_positon_realative: new_style.up_slide_display == '1' ? false : true,
+                    roll_style: new_roll_style,
+                    roll_img_style: new_roll_img_style,
+                    text_style: new_text_style,
+                    position_class: new_content.indicator_location == 'center' ? `indicator-center` : '',
+                    header_style: menu_button_info,
+                    header_background_type: header_background_type,
+                    is_immersion_model: header_background_type !== 'color_image' && immersive_style == '1',
+                    data_alone_row_space: new_style.data_alone_row_space * 2 + 'rpx',
+                    is_search_alone_row: new_content.data_alone_row_value && new_content.data_alone_row_value.includes('search'),
+                    is_icon_alone_row: new_content.data_alone_row_value && new_content.data_alone_row_value.includes('icon'),
+                    style_location_container: this.get_style_location_container(new_style),
+                    style_location_img_container: this.get_style_location_img_container(new_style),
+                    location_left_size: !isEmpty(new_style.location_left_icon_size) ? new_style.location_left_icon_size * 2 + 'rpx' : '24rpx',
+                    location_right_size: !isEmpty(new_style.location_right_icon_size) ? new_style.location_right_icon_size * 2 + 'rpx' : '24rpx',
+                    location_color: !isEmpty(new_style.location_color) ? new_style.location_color : new_style?.position_color || '',
+                    location_name_style: this.get_location_name_style(new_content),
+                    location_margin: `padding: ${location_margin.margin_top * 2}rpx ${location_margin.margin_right * 2}rpx ${location_margin.margin_bottom * 2}rpx ${location_margin.margin_left * 2}rpx;`, // 悬浮之后有间距，所以要将margin设置成外padding
+                });
+                // this.$emit('onImmersionModelCallBack', this.is_immersion_model);
+            },
+            get_location_name_style(new_content) {
+                const is_search_alone_row = new_content.data_alone_row_value && new_content.data_alone_row_value.includes('search');
+                const is_icon_alone_row = new_content.data_alone_row_value && new_content.data_alone_row_value.includes('icon');
+                let width = 0;
+                if (is_search_alone_row && is_icon_alone_row) {
+                    width = 200;
+                } else if (is_search_alone_row || is_icon_alone_row) {
+                    width = 100;
+                }
+                if (new_content.theme == '4') {
+                    return `${(150 + width) * 2}rpx;`;
+                } else {
+                    return `${(100 + width) * 2}rpx;`;
+                }
+            },
+            // 定位设置
+            get_style_location_container(new_style) {
+                const { location_margin = this.old_margin, location_radius = this.old_radius } = new_style;
+                const style = {
+                    color_list: new_style?.location_color_list || [],
+                    direction: new_style?.location_direction || '',
+                };
+                const height = 32 - location_margin.margin_top - location_margin.margin_bottom;
+                return gradient_computer(style) + radius_computer(location_radius) + `height: ${height * 2}rpx;line-height: ${height * 2}rpx;`;
+            },
+            // 背景图片
+            get_style_location_img_container(new_style) {
+                const { location_background_img = [], location_background_img_style = '2', location_border_show = '0', location_padding = this.old_padding, location_margin = this.old_margin, location_border_size = this.old_padding, location_border_color = '', location_border_style = 'solid' } = new_style;
+                const style = {
+                    background_img: location_background_img,
+                    background_img_style: location_background_img_style,
+                };
+                let border = ``;
+                if (location_border_show == '1') {
+                    border += `border-width: ${location_border_size.padding_top}px ${location_border_size.padding_right}px ${location_border_size.padding_bottom}px ${location_border_size.padding_left}px;border-style: ${location_border_style};border-color: ${location_border_color};`;
+                }
+                const height = 32 - (location_margin.margin_top || 0) - (location_margin.margin_bottom || 0);
+                return background_computer(style) + padding_computer(location_padding) + border + `height: ${(height > 0 ? height : 0) * 2}rpx;line-height: ${(height > 0 ? height : 0) * 2}rpx;box-sizing: border-box;`;
+            },
+            // 获取顶部导航高度
+            get_nav_height() {
+                const query = uni.createSelectorQuery().in(this);
+                query
+                    .select('.article-tabs')
+                    .boundingClientRect((res) => {
+                        if ((res || null) != null) {
+                            this.setData({
+                                tabs_top: res.top,
+                            });
+                        }
+                    })
+                    .exec();
+            },
+            // 位置回调
+            choice_location_back(e) {
+                this.$emit('onLocationBack', e);
+            },
+            // 打开地址
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+            // 返回事件
+            top_nav_left_back_event() {
+                app.globalData.page_back_prev_event();
+            },
+        },
+    };
+</script>
+
+<style lang="scss" scoped>
+    .header-container {
+        width: 100%;
+        .header-around {
+            z-index: 12;
+        }
+        .model-top {
+            .roll {
+                width: 100%;
+                height: 100%;
+                margin: 0 auto;
+            }
+            .img {
+                width: 680rpx;
+            }
+        }
+        .model-head {
+            .model-head-content {
+                height: 66rpx;
+                // overflow: hidden;
+                top: -1rpx;
+                /* #ifdef H5 || MP-TOUTIAO */
+                top: 4rpx;
+                /* #endif */
+            }
+        }
+        .model-head-icon {
+            position: absolute;
+            right: 0;
+            bottom: 0;
+            height: 66rpx;
+            .function-icon {
+                height: 66rpx;
+            }
+        }
+        .logo-outer-style {
+            height: 56rpx;
+            .logo-style {
+                height: 56rpx;
+                width: 100%;
+            }
+        }
+    }
+    .indicator-center {
+        position: absolute;
+        left: 0;
+        right: 0;
+        text-align: center;
+        top: 0;
+        padding-left: 0;
+    }
+    .up_slide_bg {
+        z-index: -1;
+    }
+    .badge-style {
+        top: -20rpx;
+        right: 5rpx;
+    }
+</style>
diff --git a/components/diy/hot-zone.vue b/components/diy/hot-zone.vue
new file mode 100644
index 0000000..16bdac9
--- /dev/null
+++ b/components/diy/hot-zone.vue
@@ -0,0 +1,122 @@
+<template>
+    <!-- 热区 -->
+    <view ref="containerRef" class="oh container" :style="style_container">
+        <view :style="style_img_container">
+            <view ref="hotRef" class="hot pr" :style="style">
+                <image :src="img" class="wh-auto dis-block" mode="widthFix" @load="on_load_img" />
+                <view v-for="(item, index) in hot_data" :key="index" class="hot_box" :style="'left: ' + item.drag_start.x * w_scale1 * w_scale2 + 'px;top:' + item.drag_start.y * h_scale1 * h_scale2 + 'px;width: ' + Math.max(item.drag_end.width * w_scale1 * w_scale2, 1) + 'px;height: ' + Math.max(item.drag_end.height * h_scale1 * h_scale2, 1) + 'px;display: flex;'" :data-value="item.link.page" @tap="url_event"> </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import { common_styles_computer, common_img_computer } from '@/common/js/common/common.js';
+    export default {
+        props: {
+            propValue: {
+                type: Object,
+                default: () => ({}),
+            },
+            propKey: {
+                type: [String,Number],
+                default: '',
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 1000000,
+            },
+        },
+        data() {
+            return {
+                style_container: '',
+                style_img_container: '',
+                style: '',
+                img: '',
+                hot_data: [],
+                img_width: 1,
+                img_height: 1,
+                container_ref_h: 0,
+                hot_ref_h: 0,
+                hot_ref_w: 0,
+                w_scale1: 1,
+                h_scale1: 1,
+                w_scale2: 1,
+                h_scale2: 1,
+            };
+        },
+        watch: {
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        created() {
+            this.init();
+        },
+        methods: {
+            // 初始化数据
+            init() {
+                const new_content = this.propValue.content || {};
+                const new_style = this.propValue.style || {};
+                this.setData({
+                    img: new_content.img[0].url,
+                    img_width: new_content.hot.img_width || 1,
+                    img_height: new_content.hot.img_height || 1,
+                    hot_data: new_content.hot.data || [],
+                    style_container: common_styles_computer(new_style.common_style),
+                    style_img_container: common_img_computer(new_style.common_style, this.propIndex),
+                });
+            },
+            // 图片加载完成 获取宽高
+            on_load_img(e) {
+                const query = uni.createSelectorQuery();
+                // 选择我们想要的元素
+                query
+                    .in(this)
+                    .select('.container')
+                    .boundingClientRect((res) => {
+                        if ((res || null) != null) {
+                            // data包含元素的宽度、高度等信息
+                            this.setData({
+                                container_ref_h: res.height,
+                                w_scale1: res.height / this.img_width,
+                                h_scale1: res.height / this.img_height,
+                            });
+                        }
+                    })
+                    .exec(); // 执行查询
+                query
+                    .in(this)
+                    .select('.hot')
+                    .boundingClientRect((res) => {
+                        if ((res || null) != null) {
+                            // data包含元素的宽度、高度等信息
+                            this.setData({
+                                w_scale2: res.width / this.container_ref_h,
+                                h_scale2: res.height / this.container_ref_h,
+                            });
+                        }
+                    })
+                    .exec(); // 执行查询
+            },
+            // 跳转链接
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+        },
+    };
+</script>
+<style lang="scss" scoped>
+    .hot {
+        min-height: 20rpx;
+        .hot_box {
+            // background: rgba(42, 148, 255, 0.15);
+            // border: 2rpx dashed rgba(142, 198, 255, 0.5);
+            position: absolute;
+            opacity: 0.4;
+        }
+    }
+</style>
diff --git a/components/diy/img-magic.vue b/components/diy/img-magic.vue
new file mode 100644
index 0000000..e3068b9
--- /dev/null
+++ b/components/diy/img-magic.vue
@@ -0,0 +1,228 @@
+<template>
+    <!-- 图片魔方 -->
+    <view class="img-magic" :style="style_container + 'height:' + (form.style_actived == 10 ? '100%' : container_size)">
+        <view class="magic-container wh-auto ht-auto" :style="style_img_container">
+            <view class="pr" :style="outer_style">
+                <!-- 风格3 -->
+                <template v-if="form.style_actived == 2">
+                    <view class="flex-row align-c jc-c style-size">
+                        <view v-for="(item, index) in form.img_magic_list" :key="index" class="three flex-row" :style="img_spacing" :data-value="item.img_link ? item.img_link.page : ''" @tap="url_event">
+                            <view class="wh-auto flex-row" :style="content_img_container">
+                                <view class="flex-1" :style="content_img_style_container">
+                                    <image v-if="item.img.length > 0" :src="item.img[0].url" class="dis-block wh-auto ht-auto" :mode="img_fit" :style="content_img_radius"></image>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </template>
+                <!-- 风格9 -->
+                <template v-else-if="form.style_actived == 8">
+                    <view class="flex-row align-c jc-c style-size flex-wrap">
+                        <view v-for="(item, index) in form.img_magic_list" :key="index" :class="['flex-row', { 'style9-top': [0, 1].includes(index), 'style9-bottom': ![0, 1].includes(index) }]" :style="img_spacing" :data-value="item.img_link ? item.img_link.page : ''" @tap="url_event">
+                            <view class="wh-auto flex-row" :style="content_img_container">
+                                <view class="flex-1" :style="content_img_style_container">
+                                    <image v-if="item.img.length > 0" :src="item.img[0].url" class="dis-block wh-auto ht-auto" :mode="img_fit" :style="content_img_radius"></image>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </template>
+                <template v-else-if="form.style_actived == 10">
+                    <template v-if="form.limit_size == '0'">
+                        <view v-for="(item, index) in form.img_magic_list" :key="index" class="cr-main flex-row" :style="img_spacing + selected_style(item)" :data-value="item.img_link ? item.img_link.page : ''" @tap="url_event">
+                            <view class="wh-auto flex-row" :style="content_img_container">
+                                <view class="flex-1" :style="content_img_style_container">
+                                    <image v-if="item.img.length > 0" :src="item.img[0].url" class="dis-block wh-auto" mode="widthFix" :style="content_img_radius"></image>
+                                </view>
+                            </view>
+                        </view>
+                    </template>
+                    <template v-else>
+                        <view v-for="(item, index) in form.img_magic_list" :key="index" class="cr-main flex-row" :style="img_spacing + selected_style(item) + ';height:' + image_height" :data-value="item.img_link ? item.img_link.page : ''" @tap="url_event">
+                            <view class="wh-auto flex-row" :style="content_img_container">
+                                <view class="flex-1" :style="content_img_style_container">
+                                    <image v-if="item.img.length > 0" :src="item.img[0].url" class="dis-block wh-auto ht-auto" :mode="img_fit" :style="content_img_radius"></image>
+                                </view>
+                            </view>
+                        </view>
+                    </template>
+                </template>
+                <template v-else>
+                    <view v-for="(item, index) in form.img_magic_list" :key="index" class="cube-selected cr-main flex-row" :style="img_spacing + selected_style(item)" :data-value="item.img_link ? item.img_link.page : ''" @tap="url_event">
+                        <view class="wh-auto flex-row" :style="content_img_container">
+                            <view class="flex-1" :style="content_img_style_container">
+                                <image v-if="item.img.length > 0" :src="item.img[0].url" class="dis-block wh-auto ht-auto" :mode="img_fit" :style="content_img_radius"></image>
+                            </view>
+                        </view>
+                    </view>
+                </template>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import { common_styles_computer, common_img_computer, radius_computer, percentage_count, isEmpty, margin_computer, padding_computer, old_padding, old_margin, border_width } from '@/common/js/common/common.js';
+    var system = app.globalData.get_system_info(null, null, true);
+    var sys_width = app.globalData.window_width_handle(system.windowWidth);
+    export default {
+        props: {
+            propValue: {
+                type: Object,
+                default: () => ({}),
+            },
+            propKey: {
+                type: [String, Number],
+                default: '',
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 1000000,
+            },
+            propOuterContainerPadding: {
+                type: Number,
+                default: 0,
+            }
+        },
+        data() {
+            return {
+                form: {},
+                style_container: '',
+                style_img_container: '',
+                // 外部样式
+                outer_style: '',
+                // 图片间距设置
+                img_spacing: '',
+                // 图片圆角
+                content_img_radius: '',
+                cube_cell: '',
+                container_size: '',
+                div_width: 0,
+                image_height: '',
+                img_fit: '',
+                content_img_container: '',
+                content_img_style_container: '',
+            };
+        },
+        watch: {
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        computed: {
+            // 根据当前页面大小计算成百分比
+            selected_style() {
+                return (item) => {
+                    return `overflow: hidden;width: ${this.percentage(this.getSelectedWidth(item))}; height: ${this.percentage(this.getSelectedHeight(item))}; top: ${this.percentage(this.getSelectedTop(item))}; left: ${this.percentage(this.getSelectedLeft(item))};`;
+                };
+            },
+        },
+        mounted() {
+            this.init();
+        },
+        methods: {
+            init() {
+                const new_content = this.propValue.content || {};
+                const new_style = this.propValue.style || {};
+                const new_style_spacing = new_content.style_actived === 10 ? 0 : new_style.image_spacing;
+                // 外部样式
+                const outer_spacing = `calc(100% + ${new_style_spacing * 2}rpx)`;
+                const outer_sx = `-${new_style_spacing}rpx`;
+                // 图片间距设置
+                const spacing = `${new_style_spacing}rpx`;
+                // scaleToFill 对应 cover aspectFit 对应 contain  center 对应 none
+                let fit = '';
+                if (new_content.img_fit == 'contain') {
+                    fit = 'aspectFit';
+                } else if (new_content.img_fit == 'fill') {
+                    fit = 'scaleToFill';
+                } else if (new_content.img_fit == 'cover') {
+                    fit = 'aspectFill';
+                }
+                const container_height = !isEmpty(new_content.container_height) ? new_content.container_height : sys_width;
+                const density = !isEmpty(new_content.magic_cube_density) ? new_content.magic_cube_density : 4;
+
+                const { margin_left, margin_right } = new_style.common_style;
+                const width = sys_width - margin_left - margin_right - border_width(new_style.common_style) - this.propOuterContainerPadding;
+                const scale = width / 390;
+                this.setData({
+                    form: this.propValue.content,
+                    new_style: this.propValue.style,
+                    outer_style: `width:${outer_spacing};height:${outer_spacing};margin:${outer_sx};`,
+                    img_spacing: `padding:${spacing};`,
+                    content_img_radius: radius_computer(new_style),
+                    style_container: common_styles_computer(new_style.common_style) + 'box-sizing: border-box;',
+                    style_img_container: common_img_computer(new_style.common_style, this.propIndex) + 'box-sizing: border-box;',
+                    img_fit: fit,
+                    div_width: sys_width,
+                    container_size: container_height * scale + 'px',
+                    cube_cell: sys_width / density,
+                    image_height: this.propValue.content.image_height * scale + 'px',
+                    content_img_container: common_styles_computer(new_style) + margin_computer(new_style?.margin || old_margin) + 'box-sizing: border-box;',
+                    content_img_style_container: common_img_computer(new_style) + padding_computer(new_style?.padding || old_padding) + 'box-sizing: border-box;',
+                });
+            },
+            getSelectedWidth(item) {
+                return (item.end.x - item.start.x + 1) * this.cube_cell;
+            },
+            //计算选中层的高度。
+            getSelectedHeight(item) {
+                return (item.end.y - item.start.y + 1) * this.cube_cell;
+            },
+            //计算选中层的右边距离。
+            getSelectedTop(item) {
+                return (item.start.y - 1) * this.cube_cell;
+            },
+            //计算选中层的左边距离。
+            getSelectedLeft(item) {
+                return (item.start.x - 1) * this.cube_cell;
+            },
+            // 计算成百分比
+            percentage(num) {
+                return percentage_count(num, this.div_width);
+            },
+            // 跳转链接
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+        },
+    };
+</script>
+
+<style lang="scss" scoped>
+    // 图片魔方是一个正方形，根据宽度计算高度
+    .img-magic {
+        overflow: hidden;
+        box-sizing: border-box;
+    }
+    .cube-selected {
+        position: absolute;
+        text-align: center;
+        box-sizing: border-box;
+    }
+    .style-size {
+        height: 100%;
+        width: 100%;
+        box-sizing: border-box;
+        .three {
+            width: 33%;
+            height: 100%;
+            position: relative;
+            box-sizing: border-box;
+        }
+        .style9-top {
+            width: 50%;
+            height: 50%;
+            position: relative;
+            box-sizing: border-box;
+        }
+        .style9-bottom {
+            width: calc(100% / 3);
+            height: 50%;
+            position: relative;
+            box-sizing: border-box;
+        }
+    }
+</style>
diff --git a/components/diy/modules/custom/data-group-rendering.vue b/components/diy/modules/custom/data-group-rendering.vue
new file mode 100644
index 0000000..1cfd712
--- /dev/null
+++ b/components/diy/modules/custom/data-group-rendering.vue
@@ -0,0 +1,279 @@
+<template>
+    <view :class="'wh-auto pr allSignList-' + propIndex + propKey" :style="'height:' + propDataHeight * propScale + 'px;'">
+       <view v-for="(item, index) in new_list" :key="index" :data-id="item.id" :data-location-x="item.location.x" :data-location-y="item.location.y" :class="'sign-' + propIndex + propKey + ' main-content ' + get_animation_class(item.com_data)" :style="'left:' + get_percentage_count(item.location.x, item.com_data.data_follow, 'left') + ';top:' + get_percentage_count(item.location.y, item.com_data.data_follow, 'top') + ';width:' + get_percentage_count(item.com_data.com_width, item.com_data.data_follow, 'width', item.com_data.is_width_auto, item.com_data.max_width, item.key) + ';height:' + get_percentage_count(item.com_data.com_height, item.com_data.data_follow, 'height', item.com_data.is_height_auto, item.com_data.max_height, item.key) + ';z-index:' + (new_list.length - 1 > 0 ? (new_list.length - 1) - index : 0)">
+            <template v-if="item.key == 'text'">
+                <model-text :propKey="propKey" :propValue="item.com_data" :propScale="propScale" :propFieldList="propFieldList" :propSourceList="propSourceList" :propConfigLoop="propConfigLoop" :propIsCustom="propIsCustom" :propIsCustomGroup="propIsCustomGroup" :propCustomGroupFieldId="propCustomGroupFieldId" :propTitleParams="propShowData.data_name" @url_event="url_event"></model-text>
+            </template>
+            <template v-else-if="item.key == 'img'">
+                <model-image :propKey="propKey" :propValue="item.com_data" :propScale="propScale" :propFieldList="propFieldList" :propSourceList="propSourceList" :propConfigLoop="propConfigLoop" :propIsCustom="propIsCustom" :propIsCustomGroup="propIsCustomGroup" :propCustomGroupFieldId="propCustomGroupFieldId" :propImgParams="propShowData.data_logo" @url_event="url_event"></model-image>
+            </template>
+            <template v-else-if="item.key == 'auxiliary-line'">
+                <model-lines :propKey="propKey" :propValue="item.com_data" :propScale="propScale" :propFieldList="propFieldList" :propSourceList="propSourceList" :propConfigLoop="propConfigLoop" :propIsCustom="propIsCustom" :propIsCustomGroup="propIsCustomGroup" :propCustomGroupFieldId="propCustomGroupFieldId"></model-lines>
+            </template>
+            <template v-else-if="item.key == 'icon'">
+                <model-icon :propKey="propKey" :propValue="item.com_data" :propScale="propScale" :propFieldList="propFieldList" :propSourceList="propSourceList" :propConfigLoop="propConfigLoop" :propIsCustom="propIsCustom" :propIsCustomGroup="propIsCustomGroup" :propCustomGroupFieldId="propCustomGroupFieldId" @url_event="url_event"></model-icon>
+            </template>
+            <template v-else-if="item.key == 'panel'">
+                <model-panel :propKey="propKey" :propValue="item.com_data" :propScale="propScale" :propFieldList="propFieldList" :propSourceList="propSourceList" :propConfigLoop="propConfigLoop" :propIsCustom="propIsCustom" :propIsCustomGroup="propIsCustomGroup" :propCustomGroupFieldId="propCustomGroupFieldId" @url_event="url_event"></model-panel>
+            </template>
+        </view>
+    </view>
+</template>
+
+<script>
+import modelText from '@/components/diy/modules/custom/model-text.vue';
+import modelLines from '@/components/diy/modules/custom/model-lines.vue';
+import modelImage from '@/components/diy/modules/custom/model-image.vue';
+import modelIcon from '@/components/diy/modules/custom/model-icon.vue';
+import modelPanel from '@/components/diy/modules/custom/model-panel.vue';
+import { location_compute, isEmpty } from '@/common/js/common/common.js';
+export default {
+    components: {
+        modelText,
+        modelLines,
+        modelImage,
+        modelIcon,
+        modelPanel,
+    },
+    props: {
+        propCustomList: {
+            type: Array,
+            default: () => {
+                return [];
+            },
+            required: true,
+        },
+        propIndex: {
+            type: Number,
+            default: 0,
+        },
+        propSourceList: {
+            type: Object,
+            default: () => {
+                return {};
+            }
+        },
+        propDataHeight: {
+            type: Number,
+            default: 0,
+        },
+        propScale: {
+            type: Number,
+            default: 1,
+        },
+        propDataIndex: {
+            type: Number,
+            default: 1,
+        },
+        propDataSplitIndex: {
+            type: Number,
+            default: 1,
+        },
+        propIsCustom: {
+            type: Boolean,
+            default: false,
+        },
+        propIsCustomGroup: {
+            type: Boolean,
+            default: false
+        },
+        propShowData: {
+            type: Object,
+            default: () => ({
+                data_key: 'id',
+                data_name: 'name'
+            }),
+        },
+        propKey: {
+            type: [String, Number],
+            default: '',
+        },
+        propCustomGroupFieldId: {
+            type: String,
+            default: ''
+        },
+        propFieldList: {
+            type: Array,
+            default: () => {
+                return [];
+            }
+        },
+        propConfigLoop: {
+            type: String,
+            default: "1"
+        }
+    },
+    data() {
+        return {
+            new_list: [],
+            custom_width: 0,
+        };
+    },
+    watch: {
+        propKey(val) {
+            // 初始化
+            this.init(this.propCustomList);
+        },
+        propCustomList(val) {
+            this.init(val);
+        }
+    },
+    computed: {
+        get_percentage_count() {
+            return (num, data_follow, type, is_auto = '0', max_size = 0, key = '') => {
+                // 检查类型是否为'left'或'top'，如果是，则根据跟随数据计算样式
+                if (['left', 'top'].includes(type)) {
+                    const { id = '', type: follow_type = 'left' } = data_follow || { id: '', type: 'left' };
+                    // 如果id不为空且follow_type与type匹配，则返回原始值的字符串表示
+                    if (id !== '' && follow_type === type) {
+                        return `${num}px`;
+                    }
+                    // 如果条件不满足，则根据比例缩放num并返回
+                    return `${num * this.propScale}px`;
+                } else {
+                    // 如果is_auto设置为'1'，则根据type和max_size计算自动样式
+                    if (is_auto === '1') {
+                        if (type === 'width' || type === 'height') {
+                            if (typeof max_size === 'number' && max_size >= 0) {
+                                const scaledMaxSize = max_size * this.propScale;
+                                const autoStyle = 'auto;';
+                                const maxSizeStyle = scaledMaxSize > 0 ? ` max-${type}: ${scaledMaxSize}px;` : '';
+                                const whiteSpaceStyle = type === 'width' && scaledMaxSize <= 0 ? ' white-space:nowrap;' : '';
+                                return `${ autoStyle }${ maxSizeStyle }${ whiteSpaceStyle }`;
+                            } else {
+                                return 'auto;';
+                            }
+                        }
+                    } else {
+                        // 微信小程序图片等比缩放对小数点后的内容支持的不是特别的好，需要取向上取整数
+                        if (key == 'img' && ['width', 'height'].includes(type)) {
+                            // 如果is_auto未设置或条件不满足，则根据比例缩放num并返回
+                            return `${ Math.round(num * this.propScale) }px`;
+                        } else {
+                            // 如果is_auto未设置或条件不满足，则根据比例缩放num并返回
+                            return `${num * this.propScale}px`;
+                        }
+                    }
+                }
+            };
+        },
+        get_animation_class() {
+            return (data) => {
+                const { type = 'none', number = 'infinite' } = data?.animation_style || {};
+                if (type != 'none') {
+                    return type + (number == 'infinite' ? `-${number}` : '');
+                } else {
+                    return '';
+                }
+            };
+        }
+    },
+    mounted() {
+        this.init(this.propCustomList);
+    },
+    methods: {
+        async init(val) {
+            // 如果为空就不进行渲染
+            if (isEmpty(val)) {
+                return;
+            }
+            await this.get_custom_width();
+            this.set_new_list(val);
+        },
+        get_custom_width() {
+            // 获取当前容器的宽度
+            const query = uni.createSelectorQuery().in(this);
+            query.select('.allSignList-' + this.propIndex + this.propKey)
+                .boundingClientRect((res) => {
+                    if (res) {
+                       this.setData({
+                            custom_width: res.width,
+                       });
+                    }
+                })
+                .exec();
+        },
+        async set_new_list(val) {
+            // 第一次渲染先渲染全部数据
+            this.setData({
+                new_list: val
+            });
+            // 判断是否有跟随的数据
+            const follow_list = val.filter(item => item.com_data.data_follow && item.com_data?.data_follow?.id !== '');
+            if (follow_list.length > 0) {
+                // 等待页面渲染完成之后再获取内容
+                await this.$nextTick();
+                // 第二次如果有跟随数据，更新对应数据的内容， 如果有超出容器范围的数据，限制其超出容器范围
+                const query = uni.createSelectorQuery().in(this);
+                query.selectAll('.sign-' + this.propIndex + this.propKey)
+                    .boundingClientRect((rect) => {
+                        if (rect) {
+                            // 将返回的内容转成map对象，方便快速查找，节省性能
+                            const idMap = new Map(rect.map(item => [item.dataset.id, item]));
+                            // 历史数据拷贝，方便后续操作避免每次都更新数据，统一重新渲染
+                            const val = JSON.parse(JSON.stringify(this.new_list));
+                            val.forEach((item1) => {
+                                const { data_follow } = item1.com_data;
+                                const targetItem = idMap.get(data_follow?.id);
+                                if (targetItem) {
+                                    const text_item = item1.key == 'text' ? idMap.get((item1?.id || '')+ '') : undefined;
+                                    if (data_follow?.type === 'left') {
+                                        // 更新位置信息 
+                                        const location_x = this.updateLocation(targetItem, data_follow, this.propScale, true);
+                                        // 获取组件的宽度，如果是宽度自适应，则需要重新计算位置
+                                        let item_width = item1.com_data.com_width;
+                                        // 如果是宽度自适应,需要重新判断一下处理逻辑
+                                        if (item1.com_data?.is_width_auto === '1' && text_item) {
+                                            item_width = text_item.width;
+                                        }
+                                        // 根据容器信息更新位置信息
+                                        item1.location.x = location_compute(item_width, location_x, this.custom_width);
+                                    } else if (data_follow?.type === 'top') {
+                                        // 更新位置信息 
+                                        const location_y = this.updateLocation(targetItem, data_follow, this.propScale, false);
+                                        // 获取组件的宽度，如果是宽度自适应，则需要重新计算位置
+                                        let item_height = item1.com_data.com_height;
+                                        // 如果是高度自适应,需要重新判断一下处理逻辑
+                                        if (item1.com_data?.is_height_auto === '1' && text_item) {
+                                            item_height = text_item.height;
+                                        }
+                                        // 根据容器信息更新位置信息
+                                        item1.location.y = location_compute(item_height, location_y, this.propDataHeight * this.propScale);
+                                    }
+                                }
+                            });
+                            this.setData({
+                                new_list: val
+                            });
+                        }
+                    })
+                    .exec();
+            }
+        },
+        updateLocation(targetItem, data_follow, scale, isX) {
+            try {
+                const locationValueStr = targetItem.dataset[`location${isX ? 'X' : 'Y'}`];
+                if (locationValueStr == null) {
+                    return;
+                }
+                const locationValue = parseFloat(locationValueStr);
+                if (isNaN(locationValue) || scale <= 0 || (isX ? targetItem.width < 0 : targetItem.height < 0)) return;
+
+                return ((locationValue + (data_follow?.spacing || 0)) * scale) + (isX ? targetItem.width : targetItem.height);
+            } catch (error) {
+                console.error(`Error updating location ${isX ? 'X' : 'Y'}:`, error);
+            }
+        },
+        url_event(e) {
+            this.$emit('url_event', e, this.propDataIndex, this.propDataSplitIndex);
+        }
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.main-content {
+    position: absolute;
+    overflow: hidden;
+}
+</style>
\ No newline at end of file
diff --git a/components/diy/modules/custom/data-rendering.vue b/components/diy/modules/custom/data-rendering.vue
new file mode 100644
index 0000000..41a1bce
--- /dev/null
+++ b/components/diy/modules/custom/data-rendering.vue
@@ -0,0 +1,290 @@
+<template>
+    <view :class="'wh-auto pr allSignList-' + propIndex + propKey" :style="'height:' + propDataHeight * propScale + 'px;'">
+       <view v-for="(item, index) in new_list" :key="index" :data-id="item.id" :data-location-x="item.location.x" :data-location-y="item.location.y" :class="'sign-' + propIndex + propKey + ' main-content ' + get_animation_class(item.com_data)" :style="'left:' + get_percentage_count(item.location.x, item.com_data.data_follow, 'left') + ';top:' + get_percentage_count(item.location.y, item.com_data.data_follow, 'top') + ';width:' + get_percentage_count(item.com_data.com_width, item.com_data.data_follow, 'width', item.com_data.is_width_auto, item.com_data.max_width, item.key) + ';height:' + get_percentage_count(item.com_data.com_height, item.com_data.data_follow, 'height', item.com_data.is_height_auto, item.com_data.max_height, item.key) + ';z-index:' + (new_list.length - 1 > 0 ? (new_list.length - 1) - index : 0)">
+            <template v-if="item.key == 'text'">
+                <model-text :propKey="propKey + item.id" :propValue="item.com_data" :propScale="propScale" :propFieldList="propFieldList" :propSourceList="propSourceList" :propConfigLoop="propConfigLoop" :propIsCustom="propIsCustom" :propIsCustomGroup="propIsCustomGroup" :propCustomGroupFieldId="propCustomGroupFieldId" :propTitleParams="propShowData.data_name" @url_event="url_event"></model-text>
+            </template>
+            <template v-else-if="item.key == 'img'">
+                <model-image :propKey="propKey + item.id" :propValue="item.com_data" :propScale="propScale" :propFieldList="propFieldList" :propSourceList="propSourceList" :propConfigLoop="propConfigLoop" :propIsCustom="propIsCustom" :propIsCustomGroup="propIsCustomGroup" :propCustomGroupFieldId="propCustomGroupFieldId" :propImgParams="propShowData.data_logo" @url_event="url_event"></model-image>
+            </template>
+            <template v-else-if="item.key == 'auxiliary-line'">
+                <model-lines :propKey="propKey + item.id" :propValue="item.com_data" :propScale="propScale" :propFieldList="propFieldList" :propSourceList="propSourceList" :propConfigLoop="propConfigLoop" :propIsCustom="propIsCustom" :propIsCustomGroup="propIsCustomGroup" :propCustomGroupFieldId="propCustomGroupFieldId"></model-lines>
+            </template>
+            <template v-else-if="item.key == 'icon'">
+                <model-icon :propKey="propKey + item.id" :propValue="item.com_data" :propScale="propScale" :propFieldList="propFieldList" :propSourceList="propSourceList" :propConfigLoop="propConfigLoop" :propIsCustom="propIsCustom" :propIsCustomGroup="propIsCustomGroup" :propCustomGroupFieldId="propCustomGroupFieldId" @url_event="url_event"></model-icon>
+            </template>
+            <template v-else-if="item.key == 'panel'">
+                <model-panel :propKey="propKey + item.id" :propValue="item.com_data" :propScale="propScale" :propFieldList="propFieldList"  :propSourceList="propSourceList" :propConfigLoop="propConfigLoop" :propIsCustom="propIsCustom" :propIsCustomGroup="propIsCustomGroup" :propCustomGroupFieldId="propCustomGroupFieldId" @url_event="url_event"></model-panel>
+            </template>
+            <template v-else-if="item.key == 'custom-group'">
+                <model-custom-group :propKey="propKey + item.id" :propValue="item.com_data" :propScale="propScale" :propFieldList="propFieldList" :propConfigLoop="propConfigLoop" :propDataWidth="item.com_data.com_width" :propDataHeight="item.com_data.custom_height" :propSourceList="propSourceList" :propGroupSourceList="propGroupSourceList" :propIsCustom="propIsCustom" :propShowData="propShowData"></model-custom-group>
+            </template>
+        </view>
+    </view>
+</template>
+
+<script>
+import modelText from '@/components/diy/modules/custom/model-text.vue';
+import modelLines from '@/components/diy/modules/custom/model-lines.vue';
+import modelImage from '@/components/diy/modules/custom/model-image.vue';
+import modelIcon from '@/components/diy/modules/custom/model-icon.vue';
+import modelPanel from '@/components/diy/modules/custom/model-panel.vue';
+import modelCustomGroup from '@/components/diy/modules/custom/model-custom-group.vue';
+import { location_compute, isEmpty } from '@/common/js/common/common.js';
+export default {
+    components: {
+        modelText,
+        modelLines,
+        modelImage,
+        modelIcon,
+        modelPanel,
+        modelCustomGroup
+    },
+    props: {
+        propCustomList: {
+            type: Array,
+            default: () => {
+                return [];
+            },
+            required: true,
+        },
+        propIndex: {
+            type: Number,
+            default: 0,
+        },
+        propSourceList: {
+            type: Object,
+            default: () => {
+                return {};
+            }
+        },
+        propGroupSourceList: {
+            type: Array,
+            default: () => {
+                return [];
+            }
+        },
+        propDataHeight: {
+            type: Number,
+            default: 0,
+        },
+        propScale: {
+            type: Number,
+            default: 1,
+        },
+        propDataIndex: {
+            type: Number,
+            default: 1,
+        },
+        propDataSplitIndex: {
+            type: Number,
+            default: 1,
+        },
+        propIsCustom: {
+            type: Boolean,
+            default: false,
+        },
+        propIsCustomGroup: {
+            type: Boolean,
+            default: false
+        },
+        propShowData: {
+            type: Object,
+            default: () => ({
+                data_key: 'id',
+                data_name: 'name'
+            }),
+        },
+        propKey: {
+            type: [String, Number],
+            default: '',
+        },
+        propCustomGroupFieldId: {
+            type: String,
+            default: ''
+        },
+        propFieldList: {
+            type: Array,
+            default: () => {
+                return [];
+            }
+        },
+        propConfigLoop: {
+            type: String,
+            default: "1"
+        }
+    },
+    data() {
+        return {
+            new_list: [],
+            custom_width: 0,
+        };
+    },
+    watch: {
+        propKey(val) {
+            // 初始化
+            this.init(this.propCustomList);
+        },
+        propCustomList(val) {
+            this.init(val);
+        }
+    },
+    computed: {
+        get_percentage_count() {
+            return (num, data_follow, type, is_auto = '0', max_size = 0, key = '') => {
+                // 检查类型是否为'left'或'top'，如果是，则根据跟随数据计算样式
+                if (['left', 'top'].includes(type)) {
+                    const { id = '', type: follow_type = 'left' } = data_follow || { id: '', type: 'left' };
+                    // 如果id不为空且follow_type与type匹配，则返回原始值的字符串表示
+                    if (id !== '' && follow_type === type) {
+                        return `${num}px`;
+                    }
+                    // 如果条件不满足，则根据比例缩放num并返回
+                    return `${num * this.propScale}px`;
+                } else {
+                    // 如果is_auto设置为'1'，则根据type和max_size计算自动样式
+                    if (is_auto === '1') {
+                        if (type === 'width' || type === 'height') {
+                            if (typeof max_size === 'number' && max_size >= 0) {
+                                const scaledMaxSize = max_size * this.propScale;
+                                const autoStyle = 'auto;';
+                                const maxSizeStyle = scaledMaxSize > 0 ? ` max-${type}: ${scaledMaxSize}px;` : '';
+                                const whiteSpaceStyle = type === 'width' && scaledMaxSize <= 0 ? ' white-space:nowrap;' : '';
+                                return `${ autoStyle }${ maxSizeStyle }${ whiteSpaceStyle }`;
+                            } else {
+                                return 'auto;';
+                            }
+                        }
+                    } else {
+                        // 微信小程序图片等比缩放对小数点后的内容支持的不是特别的好，需要取向上取整数
+                        if (key == 'img' && ['width', 'height'].includes(type)) {
+                            // 如果is_auto未设置或条件不满足，则根据比例缩放num并返回
+                            return `${ Math.round(num * this.propScale) }px`;
+                        } else {
+                            // 如果is_auto未设置或条件不满足，则根据比例缩放num并返回
+                            return `${num * this.propScale}px`;
+                        }
+                    }
+                }
+            };
+        },
+        get_animation_class() {
+            return (data) => {
+                const { type = 'none', number = 'infinite' } = data?.animation_style || {};
+                if (type != 'none') {
+                    return type + (number == 'infinite' ? `-${number}` : '');
+                } else {
+                    return '';
+                }
+            };
+        }
+    },
+    mounted() {
+        this.init(this.propCustomList);    
+    },
+    methods: {
+        async init(val) {
+            // 如果为空就不进行渲染
+            if (isEmpty(val)) {
+                return;
+            }
+            await this.get_custom_width();
+            this.set_new_list(val);
+        },
+        get_custom_width() {
+            // 获取当前容器的宽度
+            const query = uni.createSelectorQuery().in(this);
+            query.select('.allSignList-' + this.propIndex + this.propKey)
+                .boundingClientRect((res) => {
+                    if (res) {
+                       this.setData({
+                            custom_width: res.width,
+                       });
+                    }
+                })
+                .exec();
+        },
+        async set_new_list(val) {
+            // 第一次渲染先渲染全部数据
+            this.setData({
+                new_list: val
+            });
+            // 判断是否有跟随的数据
+            const follow_list = val.filter(item => item.com_data.data_follow && item.com_data?.data_follow?.id !== '');
+            if (follow_list.length > 0) {
+                await this.$nextTick();
+                // 第二次如果有跟随数据，更新对应数据的内容， 如果有超出容器范围的数据，限制其超出容器范围
+                const query = uni.createSelectorQuery().in(this);
+                query.selectAll('.sign-' + this.propIndex + this.propKey)
+                    .boundingClientRect((rect) => {
+                        if (rect) {
+                            // 将返回的内容转成map对象，方便快速查找，节省性能
+                            const idMap = new Map(rect.map(item => [item.dataset.id, item]));
+                            // 历史数据拷贝，方便后续操作避免每次都更新数据，统一重新渲染
+                            const val = JSON.parse(JSON.stringify(this.new_list));
+                            val.forEach((item1) => {
+                                const { data_follow } = item1.com_data;
+                                const targetItem = idMap.get(data_follow?.id);
+                                if (targetItem) {
+                                    const text_item = item1.key == 'text' ? idMap.get((item1?.id || '')+ '') : undefined;
+                                    if (data_follow?.type === 'left') {
+                                        // 更新位置信息 
+                                        const location_x = this.updateLocation(targetItem, data_follow, this.propScale, true);
+                                        // 获取组件的宽度，如果是宽度自适应，则需要重新计算位置
+                                        let item_width = item1.com_data.com_width;
+                                        // 如果是宽度自适应,需要重新判断一下处理逻辑
+                                        if (item1.com_data.is_width_auto === '1' && text_item) {
+                                            item_width = text_item.width;
+                                        }
+                                        // 根据容器信息更新位置信息
+                                        item1.location.x = location_compute(item_width, location_x, this.custom_width);
+                                    } else if (data_follow?.type === 'top') {
+                                        // 更新位置信息 
+                                        const location_y = this.updateLocation(targetItem, data_follow, this.propScale, false);
+                                        // 获取组件的宽度，如果是宽度自适应，则需要重新计算位置
+                                        let item_height = item1.com_data.com_height;
+                                        // 如果是高度自适应,需要重新判断一下处理逻辑
+                                        if (item1.com_data?.is_height_auto === '1' && text_item) {
+                                            item_height = text_item.height;
+                                        }
+                                        // 根据容器信息更新位置信息
+                                        item1.location.y = location_compute(item_height, location_y, this.propDataHeight * this.propScale);
+                                    }
+                                }
+                            });
+                            this.setData({
+                                new_list: val
+                            });
+                        }
+                    })
+                    .exec();
+            }
+        },
+        updateLocation(targetItem, data_follow, scale, isX) {
+            try {
+                const locationValueStr = targetItem.dataset[`location${isX ? 'X' : 'Y'}`];
+                if (locationValueStr == null) {
+                    return;
+                }
+                const locationValue = parseFloat(locationValueStr);
+                if (isNaN(locationValue) || scale <= 0 || (isX ? targetItem.width < 0 : targetItem.height < 0)) return;
+
+                const computedValue = ((locationValue + (data_follow?.spacing || 0)) * scale) + (isX ? targetItem.width : targetItem.height);
+                return computedValue;
+            } catch (error) {
+                console.error(`Error updating location ${isX ? 'X' : 'Y'}:`, error);
+            }
+        },
+        url_event(e) {
+            this.$emit('url_event', e, this.propDataIndex, this.propDataSplitIndex);
+        }
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.main-content {
+    position: absolute;
+    overflow: hidden;
+}
+</style>
\ No newline at end of file
diff --git a/components/diy/modules/custom/model-custom-group.vue b/components/diy/modules/custom/model-custom-group.vue
new file mode 100644
index 0000000..15e837d
--- /dev/null
+++ b/components/diy/modules/custom/model-custom-group.vue
@@ -0,0 +1,378 @@
+<template>
+    <view v-if="is_show" class="ht-auto" :style="style_container">
+        <view :style="style_img_container">
+            <view :style="style_content_container">
+                <view class="w h pr" :style="style_content_img_container">
+                    <template v-if="data_source_content_list.length > 0 && form.data_source_direction == 'vertical'">
+                        <view class="flex-row flex-wrap" :style="'row-gap:' + new_style.row_gap + 'px;column-gap:' + new_style.column_gap + 'px;'">
+                            <view v-for="(item, index) in data_source_content_list" :key="index" class="ht-auto" :style="gap_width">
+                                <view v-for="(item1, index1) in item.split_list" :key="index1">
+                                    <view :style="style_chunk_container">
+                                        <view class="wh-auto ht-auto oh" :style="style_chunk_img_container">
+                                            <dataGroupRendering :propKey="propKey" :propCustomList="form.custom_list" :propIndex="index1" :propSourceList="item1" :propFieldList="propFieldList" :propDataHeight="propDataHeight" :propScale="custom_scale" :propIsCustom="propIsCustom" :propIsCustomGroup="true" :propShowData="propShowData" :propConfigLoop="propConfigLoop !== '1' ? form.is_use_parent_data : '1'" :propDataIndex="index" :propDataSplitIndex="index1" @url_event="url_event"></dataGroupRendering>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                    </template>
+                    <view v-else-if="data_source_content_list.length > 0 && ['vertical-scroll', 'horizontal'].includes(form.data_source_direction)" class="oh ht-auto">
+                        <swiper class="w flex" circular="true" :vertical="form.data_source_direction != 'horizontal'" :autoplay="new_style.is_roll == '1'" :interval="new_style.interval_time * 1000" :duration="500" :display-multiple-items="slides_per_view" :style="{ width: '100%', height: swiper_height + 'px' }" @change="slideChange">
+                            <swiper-item v-for="(item, index) in data_source_content_list" :key="index">
+                                <view :class="form.data_source_direction != 'horizontal' ? 'wh-auto ht-auto' : 'flex-row'" :style="form.data_source_direction == 'horizontal' ? 'column-gap:' + new_style.column_gap + 'px;' : ''">
+                                    <view v-for="(item1, index1) in item.split_list" :key="index1" class="wh-auto ht-auto" :style="style_chunk_container + swiper_width + (form.data_source_direction == 'horizontal' ? gap_width : 'margin-bottom:' + content_outer_spacing_magin)">
+                                        <view class="wh-auto ht-auto oh" :style="style_chunk_img_container">
+                                            <dataGroupRendering :propKey="propKey" :propCustomList="form.custom_list" :propIndex="index1" :propSourceList="item1" :propFieldList="propFieldList" :propDataHeight="propDataHeight" :propScale="custom_scale" :propIsCustom="propIsCustom" :propIsCustomGroup="true" :propShowData="propShowData" :propConfigLoop="propConfigLoop !== '1' ? form.is_use_parent_data : '1'" :propDataIndex="index" :propDataSplitIndex="index1" @url_event="url_event"></dataGroupRendering>
+                                        </view>
+                                    </view>
+                                </view>
+                            </swiper-item>
+                        </swiper>
+                        <view v-if="new_style.is_show == '1' && data_source_content_list.length > 1" :class="['left', 'right'].includes(new_style.indicator_new_location) ? 'indicator_up_down_location' : 'indicator_about_location'" :style="indicator_location_style">
+                            <block v-if="new_style.indicator_style == 'num'">
+                                <view :style="indicator_style" class="dot-item">
+                                    <text :style="{ color: new_style.actived_color }">{{ actived_index + 1 }}</text>
+                                    <text>/{{ data_source_content_list.length }}</text>
+                                </view>
+                            </block>
+                            <block v-else>
+                                <view v-for="(item, index) in data_source_content_list" :key="index" :style="indicator_style + (actived_index == index ? 'background:' + new_style.actived_color : '')" class="dot-item" />
+                            </block>
+                        </view>
+                    </view>
+                    <template v-else>
+                        <view :style="style_chunk_container">
+                            <view class="wh-auto ht-auto oh" :style="style_chunk_img_container">
+                                <dataGroupRendering :propKey="propKey" :propCustomList="form.custom_list" :propIndex="0" :propFieldList="propFieldList" :propDataHeight="propDataHeight" :propScale="custom_scale" :propConfigLoop="propConfigLoop !== '1' ? form.is_use_parent_data : '1'" @url_event="url_event"></dataGroupRendering>
+                            </view>
+                        </view>
+                    </template>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { common_styles_computer, common_img_computer, percentage_count, isEmpty, get_indicator_style, get_indicator_location_style, border_width, get_is_eligible } from '@/common/js/common/common.js';
+    // a组件调用b组件 b组件调用a组件，为了避免循环引用在uniapp中出问题，复制一个相同的data-group-rendering组件
+    import dataGroupRendering from '@/components/diy/modules/custom/data-group-rendering.vue';
+    const app = getApp();
+
+    export default {
+        components: {
+            dataGroupRendering
+        },
+        props: {
+            propValue: {
+                type: Object,
+                default: () => {
+                    return {};
+                },
+                required: true,
+            },
+            propSourceList: {
+                type: [ Object, Array ],
+                default: () => {
+                    return {};
+                },
+            },
+            propKey: {
+                type: [String,Number],
+                default: '',
+            },
+            propScale: {
+                type: Number,
+                default: 1
+            },
+            propDataWidth: {
+                type: Number,
+                default: 0,
+            },
+            propDataHeight: {
+                type: Number,
+                default: 0,
+            },
+            propIsCustom: {
+                type: Boolean,
+                default: false
+            },
+            propFieldList: {
+                type: Array,
+                default: []
+            },
+            propGroupSourceList: {
+                type: Array,
+                default: () => {
+                    return [];
+                }
+            },
+            propShowData: {
+                type: Object,
+                default: () => ({
+                    data_key: 'id',
+                    data_name: 'name',
+                })
+            },
+            propConfigLoop: {
+                type: String,
+                default: "1"
+            }
+        },
+        data() {
+            return {
+                form: {},
+                new_style: {},
+                custom_scale: 1,
+                style_container: '',
+                style_img_container: '',
+                custom_list_length: 0,
+                custom_group_field_id: '',
+                source_list: {
+                    // 存放手动输入的id
+                    data_ids: [],
+                    // 手动输入
+                    data_list: [],
+                    // 自动
+                    data_auto_list: [],
+                },
+                data_source_content_list: [],
+                data_source: '',
+                // 内容样式
+                style_content_container: '',
+                style_content_img_container: '',
+                // 数据样式
+                style_chunk_container: '',
+                style_chunk_img_container: '',
+                // 指示器选中的下标
+                actived_index: 0,
+                // 轮播高度
+                swiper_height: 0,
+                swiper_width: 'width: 100%;',
+                // 指示器样式
+                indicator_location_style: '',
+                indicator_style: '',
+                slides_per_view: 1,
+                show_data: { data_key: 'id', data_name: 'name' },
+                old_data_style: {
+                    color_list: [{ color: 'rgb(244, 252, 255)', color_percentage: undefined }],
+                    direction: '180deg',
+                    background_img_style: '2',
+                    background_img: [],
+                    radius: 0,
+                    radius_top_left: 0,
+                    radius_top_right: 0,
+                    radius_bottom_left: 0,
+                    radius_bottom_right: 0,
+                    padding: 0,
+                    padding_top: 0,
+                    padding_bottom: 0,
+                    padding_left: 0,
+                    padding_right: 0,
+                    margin: 0,
+                    margin_top: 0,
+                    margin_bottom: 0,
+                    margin_left: 0,
+                    margin_right: 0,
+                },
+                content_outer_spacing_magin: '0rpx',
+                gap_width: '',
+                is_show: true
+            };
+        },
+        watch: {
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        mounted() {
+            this.init();
+        },
+        methods: {
+            percentage_count,
+            init() {
+                const new_form = this.propValue;
+                const new_style = this.propValue.data_style;
+                const data_source_id = new_form?.data_source_field?.id || '';
+                // 自定义组的数据源内容切换, 判断是取自定义组数据源内容还是取自定义数据源内容
+                const is_data_source_id = this.propFieldList.filter((item) => item.field == data_source_id);
+                let new_list = [];
+                // 判断是否是循环内容
+                if (this.propConfigLoop == '1') {
+                    // 如果自定义组选择了数据源，就按照自定义组的数据源的方式走，否则的话就按照自定义的数据走
+                    if (is_data_source_id.length > 0) {
+                        const list = this.get_data_source_content_list(this.propSourceList, new_form);
+                        // 数据来源的内容
+                        new_list = list.length > 0 ? this.get_list(list, new_form, new_style) : [];
+                    } else {
+                        if (!isEmpty(this.propSourceList)) {
+                            const new_source_list = [ this.propSourceList ];
+                            new_list = [{ split_list: new_source_list }];
+                        } else {
+                            new_list = [];
+                        }
+                    }
+                } else {
+                    // 如果使用父级数据，就直接使用父级的全部数据，否则的话就没有任何数据
+                    if (new_form.is_use_parent_data == '1') {
+                        new_list = this.propGroupSourceList;
+                    } else {
+                        new_list = [];
+                    }
+                }
+                // 初始化数据
+                const { common_style, data_content_style, data_style } = new_style;
+                const old_width = this.propDataWidth * this.propScale;
+                // 外层左右间距
+                const outer_spacing = (common_style?.margin_left || 0) + (common_style?.margin_right || 0) + (common_style?.padding_left || 0) + (common_style?.padding_right || 0) + border_width(common_style);
+                // 内容左右间距
+                const content_spacing = (data_content_style?.margin_left || 0) + (data_content_style?.margin_right || 0) + (data_content_style?.padding_left || 0) + (data_content_style?.padding_right || 0) + border_width(data_content_style);
+                // 数据左右间距
+                const internal_spacing = (data_style?.margin_left || 0) + (data_style?.margin_right || 0) + (data_style?.padding_left || 0) + (data_style?.padding_right || 0) + border_width(data_style);
+                // 一行显示的数量
+                const carousel_col = Number(new_form.data_source_carousel_col);
+                // 数据间距
+                const data_spacing = ['vertical', 'horizontal'].includes(new_form.data_source_direction) ? new_style.column_gap * (carousel_col - 1) : 0;
+                // 自定义组件宽度
+                const width = old_width - outer_spacing - content_spacing - internal_spacing - data_spacing;
+                // 自定义组的比例
+                const scale_number = width / this.propDataWidth;
+                const custom_scale = scale_number > 0 ? scale_number : 0;
+                const new_data_style = !isEmpty(new_style.data_style) ? new_style.data_style : this.old_data_style;
+                const new_data_content_style = !isEmpty(new_style.data_content_style)? new_style.data_content_style : this.old_data_style;
+                // 判断是平移还是整屏滚动
+                const { padding_top = 0, padding_bottom = 0, margin_bottom = 0, margin_top = 0 } = new_data_style;
+                let swiper_height = 0;
+                let col = Number(new_form.data_source_carousel_col);
+                // 间距
+                const space_between = new_form.data_source_direction == 'horizontal' ? new_style.column_gap : new_style.row_gap;
+                // 轮播图高度控制
+                if (new_form.data_source_direction == 'horizontal') {
+                    swiper_height = this.propDataHeight * custom_scale + padding_top + padding_bottom + margin_bottom + margin_top;
+                } else {
+                    // 商品数量大于列数的时候，高度是列数，否则是当前的数量
+                    col = new_list.length > carousel_col ? carousel_col : new_list.length;
+                    swiper_height = (this.propDataHeight * custom_scale + padding_top + padding_bottom + margin_bottom + margin_top) * col + ((Number(new_form.data_source_carousel_col) - 1) * space_between);
+                }
+                // 计算间隔的空间。(gap * gap数量) / 模块数量
+                let gap = (new_style.column_gap * (carousel_col - 1)) / carousel_col;
+                // 横向的时候，根据选择的行数和每行显示的个数来区分具体是显示多少个
+                const swiper_width = (new_form.data_source_direction == 'horizontal' && new_style.rolling_fashion != 'translation') ? `width: ${ 100 / carousel_col }%;`: 'width: 100%;';
+                this.setData({
+                    form: new_form,
+                    new_style: new_style,
+                    custom_scale: custom_scale,
+                    custom_list_length: new_form.custom_list.length - 1,
+                    style_container: common_styles_computer(new_style.common_style) + (new_form.is_scroll_bar == '1' ? 'overflow: auto;' : '') + 'box-sizing: border-box;', // 用于样式显示
+                    style_img_container: common_img_computer(new_style.common_style, this.propIndex),
+                    style_content_container: common_styles_computer(new_data_content_style) + 'box-sizing: border-box;', // 用于样式显示
+                    style_content_img_container: common_img_computer(new_data_content_style),
+                    style_chunk_container: common_styles_computer(new_data_style) + 'box-sizing: border-box;', // 用于样式显示
+                    style_chunk_img_container: common_img_computer(new_data_style),
+                    style_chunk_width: width,
+                    data_source_content_list: new_list,
+                    data_source: !isEmpty(new_form.data_source)? new_form.data_source : '',
+                    indicator_style: get_indicator_style(new_style), // 指示器的样式
+                    indicator_location_style: get_indicator_location_style(new_style),
+                    swiper_height: swiper_height,
+                    swiper_width: swiper_width,
+                    content_outer_spacing_magin: space_between + 'px',
+                    gap_width: `width: calc(${100 / carousel_col}% - ${gap}px);`,
+                    slides_per_view: new_style.rolling_fashion == 'translation' ? (new_form.data_source_direction != 'horizontal' ? col : new_form.data_source_carousel_col ) : 1,
+                    is_show: this.get_is_show(new_form),
+                    custom_group_field_id: new_form.data_source_field.id,
+                });
+            },
+            get_is_show(form) {
+                if (this.propConfigLoop == '1') {
+                    // 取出条件判断的内容
+                    const condition = form?.condition || { field: '', type: '', value: '' };
+                    return get_is_eligible(this.propFieldList, condition, this.propSourceList, this.propIsCustom, false, this.propCustomGroupFieldId);
+                } else {
+                    return true;
+                }
+            },
+            get_data_source_content_list(sourceList, form) {
+                if (!isEmpty(sourceList)) {
+                    const data_source_id = form?.data_source_field.id || '';
+                    let list = this.get_nested_property(sourceList, data_source_id);
+                    // 如果是自定义标题，进一步处理嵌套对象中的数据
+                    if (sourceList.data) {
+                        list = this.get_nested_property(sourceList.data, data_source_id);
+                    }
+                    return list == '' ? [] : list;
+                } else {
+                    return [];
+                }
+            },
+            get_nested_property(obj, path) {
+                // 检查路径参数是否为字符串且非空，若不满足条件则返回空字符串
+                if (typeof path !== 'string' || !path) return [];
+                // 将属性路径字符串拆分为属性键数组
+                const keys = path.split('.');
+                // 使用reduce方法遍历属性键数组，逐层访问对象属性
+                // 如果当前对象存在且拥有下一个属性键，则继续访问；否则返回空字符串
+                return keys.reduce((o, key) => (o != null && o[key] != null ? o[key] : []), obj) ?? [];
+            },
+            get_list(list, form, new_style) {
+                // 深拷贝一下，确保不会出现问题
+                const cloneList = JSON.parse(JSON.stringify(list));
+                if (new_style.rolling_fashion != 'translation' && form.data_source_direction != 'vertical') {
+                    // 如果是分页滑动情况下，根据选择的行数和每行显示的个数来区分具体是显示多少个
+                    if (cloneList.length > 0) {
+                        // 每页显示的数量
+                        const num = form.data_source_carousel_col;
+                        // 存储数据显示
+                        let nav_list = [];
+                        // 拆分的数量
+                        const split_num = Math.ceil(cloneList.length / num);
+                        for (let i = 0; i < split_num; i++) {
+                            nav_list.push({
+                                split_list: cloneList.slice(i * num, (i + 1) * num),
+                            });
+                        }
+                        return nav_list;
+                    } else {
+                        // 否则的话，就返回全部的信息
+                        return [
+                            {
+                                split_list: cloneList,
+                            },
+                        ];
+                    }
+                } else {
+                    // 存储数据显示
+                    let nav_list = [];
+                    cloneList.forEach((item) => {
+                        nav_list.push({
+                            split_list: [item],
+                        });
+                    });
+                    return nav_list;
+                }
+            },
+            slideChange(e) {
+                this.setData({
+                    actived_index: e.detail.current,
+                });
+            },
+            url_event(e, index, split_index) {
+                if (this.data_source == 'goods' && this.data_source_content_list.length > 0) {
+                    const list = this.data_source_content_list[index];
+                    if (!isEmpty(list) && !isEmpty(list.split_list[split_index])) {
+                        const new_list = list.split_list[split_index];
+                        if (!isEmpty(new_list)) {
+                            // 缓存商品数据
+                            app.globalData.goods_data_cache_handle(new_list.data.id, new_list.data);
+                        }
+                    }
+                }
+                app.globalData.url_open(e);
+            },
+        },
+    };
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/components/diy/modules/custom/model-icon.vue b/components/diy/modules/custom/model-icon.vue
new file mode 100644
index 0000000..cebaa72
--- /dev/null
+++ b/components/diy/modules/custom/model-icon.vue
@@ -0,0 +1,161 @@
+<template>
+    <view v-if="is_show" class="img-outer pr oh flex-row align-c wh-auto ht-auto" :style="com_style" @tap="url_event">
+        <iconfont :name="'icon-' + icon_class" :color="form.icon_color" :size="form.icon_size * scale + 'px'" propContainerDisplay="flex"></iconfont>
+    </view>
+</template>
+<script>
+    import { radius_computer, padding_computer, gradient_handle, isEmpty, get_nested_property, get_custom_link, get_is_eligible } from '@/common/js/common/common.js';
+    
+    export default {
+        props: {
+            propValue: {
+                type: Object,
+                default: () => {
+                    return {};
+                },
+                required: true,
+            },
+            propSourceList: {
+                type: [ Object, Array ],
+                default: () => {
+                    return {};
+                },
+            },
+            propKey: {
+                type: [String,Number],
+                default: '',
+            },
+            propScale: {
+                type: Number,
+                default: 1,
+            },
+            propIsCustom: {
+                type: Boolean,
+                default: false
+            },
+            propIsCustomGroup: {
+                type: Boolean,
+                default: false
+            },
+            propCustomGroupFieldId: {
+                type: String,
+                default: ''
+            },
+            propFieldList: {
+                type: Array,
+                default: []
+            },
+            propConfigLoop: {
+                type: String,
+                default: "1"
+            }
+        },
+        data() {
+            return {
+                form: {},
+                com_style: '',
+                scale: 1,
+                icon_class: '',
+                icon_url: '',
+                is_show: true,
+            };
+        },
+        watch: {
+            propKey(val) {
+                this.init();
+            }
+        },
+        created() {
+            this.init();
+        },
+        methods: {
+            init() {
+                const new_form = this.propValue;
+                let icon_class_value = '';
+                if (!isEmpty(new_form.icon_class)) {
+                    icon_class_value = new_form.icon_class;
+                } else {
+                    if (!isEmpty(this.propSourceList)) {
+                        let icon = '';
+                        // 获取数据源ID
+                        const data_source_id = !isEmpty(new_form?.data_source_field?.id || '') && this.propConfigLoop == '1' ? new_form.data_source_field.id : '';
+                        // 数据源内容
+                        const option = new_form?.data_source_field?.option || {};
+                        if (data_source_id.includes(';')) {
+                            const ids = data_source_id.split(';');
+                            let url = '';
+                            ids.forEach((item, index) => {
+                                url += this.data_handling(item) + (index != ids.length - 1 ? (option?.join || '') : '');
+                            });
+                            icon = url;
+                        } else {
+                            // 不输入商品， 文章和品牌时，从外层处理数据
+                            icon = this.data_handling(data_source_id);
+                        }
+                        icon_class_value = (option?.first || '') + icon + (option?.last || '');
+                    } else {
+                        icon_class_value = '';
+                    }
+                }
+                this.setData({
+                    form: new_form,
+                    scale: this.propScale,
+                    com_style: this.get_com_style(new_form, this.propScale),
+                    icon_class: icon_class_value,
+                    icon_url: this.get_icon_link(new_form),
+                    is_show: this.get_is_show(new_form),
+                });
+            },
+            get_is_show(form) {
+                if (this.propConfigLoop == '1') {
+                    // 取出条件判断的内容
+                    const condition = form?.condition || { field: '', type: '', value: '' };
+                    return get_is_eligible(this.propFieldList, condition, this.propSourceList, this.propIsCustom, this.propIsCustomGroup, this.propCustomGroupFieldId);
+                } else {
+                    return true;
+                }
+            },
+            get_icon_link(new_form) {
+                let url = '';
+                if (!isEmpty(new_form.icon_link)) {
+                    url = new_form.icon_link?.page || '';
+                } else {
+                    // 获取数据源ID
+                    const data_source_link_id = !isEmpty(new_form?.data_source_link_field?.id || '') && this.propConfigLoop == '1' ? new_form?.data_source_link_field?.id : '';
+                    // 数据源内容
+                    const source_link_option = new_form?.data_source_link_field?.option || {};
+                    url = get_custom_link(data_source_link_id, this.propSourceList, source_link_option)
+                }
+                return url;
+            },
+            data_handling(data_source_id) {
+                // 不输入商品， 文章和品牌时，从外层处理数据
+                let icon = get_nested_property(this.propSourceList, data_source_id);
+                // 如果是商品,品牌，文章的图片， 其他的切换为从data中取数据
+                if (this.propIsCustom && !isEmpty(this.propSourceList.data)) {
+                    icon = get_nested_property(this.propSourceList.data, data_source_id);
+                }
+                return icon;
+            },
+            get_com_style(form, scale) {
+                let style = `${ gradient_handle(form.color_list, form.direction) } ${ radius_computer(form.bg_radius, scale, true) };transform: rotate(${form.icon_rotate}deg);${ padding_computer(form.icon_padding, scale, true) };`;
+                if (form.border_show == '1') {
+                    style += `border: ${form.border_size * scale }px ${form.border_style} ${form.border_color};box-sizing: border-box;`;
+                }
+                if (form.icon_location == 'center') {
+                    style += `justify-content: center;`;
+                } else if (form.icon_location == 'left') {
+                    style += `justify-content: flex-start;`;
+                } else if (form.icon_location == 'right') {
+                    style += `justify-content: flex-end;`;
+                }
+                return style;
+            },
+            url_event(e) {
+                this.$emit('url_event', this.icon_url);
+            },
+        },
+    };  
+</script>
+<style lang="scss" scoped>
+</style>
diff --git a/components/diy/modules/custom/model-image.vue b/components/diy/modules/custom/model-image.vue
new file mode 100644
index 0000000..04c98f9
--- /dev/null
+++ b/components/diy/modules/custom/model-image.vue
@@ -0,0 +1,178 @@
+<template>
+    <view v-if="is_show" class="img-outer pr wh-auto ht-auto" :style="border_style" @tap="url_event">
+        <imageEmpty :propImageSrc="img" :propStyle="image_style" propErrorStyle="width: 60rpx;height: 60rpx;"></imageEmpty>
+    </view>
+</template>
+<script>
+    import { percentage_count, radius_computer, isEmpty, get_nested_property, get_custom_link, get_is_eligible } from '@/common/js/common/common.js';
+    import imageEmpty from '@/components/diy/modules/image-empty.vue';
+    export default {
+        components: {
+            imageEmpty,
+        },
+        props: {
+            propValue: {
+                type: Object,
+                default: () => {
+                    return {};
+                },
+                required: true,
+            },
+            propSourceList: {
+                type: [ Object, Array ],
+                default: () => {
+                    return {};
+                },
+            },
+            propKey: {
+                type: [String,Number],
+                default: '',
+            },
+            propScale: {
+                type: Number,
+                default: 1
+            },
+            propIsCustom: {
+                type: Boolean,
+                default: false
+            },
+            propIsCustomGroup: {
+                type: Boolean,
+                default: false
+            },
+            propImgParams: {
+                type: String,
+                default: ''
+            },
+            propCustomGroupFieldId: {
+                type: String,
+                default: ''
+            },
+            propFieldList: {
+                type: Array,
+                default: []
+            },
+            propConfigLoop: {
+                type: String,
+                default: "1"
+            }
+        },
+        data() {
+            return {
+                form: {},
+                img: '',
+                img_url: '',
+                image_style: '',
+                border_style: '',
+                keyMap: {
+                    goods: 'images',
+                    article: 'cover',
+                    brand: 'logo'
+                },
+                is_show: true,
+            };
+        },
+        watch: {
+            propKey(val) {
+                this.init();
+            }
+        },
+        created() {
+            this.init();
+        },
+        methods: {
+            init() {
+                const new_form = this.propValue;
+                this.setData({
+                    form: new_form,
+                    img: this.get_img_url(new_form),
+                    image_style: this.get_image_style(new_form, this.propScale),
+                    border_style: this.get_border_style(new_form, this.propScale),
+                    img_url: this.get_img_link(new_form),
+                    is_show: this.get_is_show(new_form),
+                });
+            },
+            get_is_show(form) {
+                if (this.propConfigLoop == '1') {
+                    // 取出条件判断的内容
+                    const condition = form?.condition || { field: '', type: '', value: '' };
+                    return get_is_eligible(this.propFieldList, condition, this.propSourceList, this.propIsCustom, this.propIsCustomGroup, this.propCustomGroupFieldId);
+                } else {
+                    return true;
+                }
+            },
+            get_img_link(form) {
+                let url = '';
+                if (!isEmpty(form.link)) {
+                    url = form.link?.page || '';
+                } else {
+                    // 获取数据源ID
+                    const data_source_link_id = !isEmpty(form?.data_source_link_field?.id || '') && this.propConfigLoop == '1' ? form.data_source_link_field.id : '';
+                    // 数据源内容
+                    const source_link_option = form?.data_source_link_field?.option || {};
+                    url = get_custom_link(data_source_link_id, this.propSourceList, source_link_option)
+                }
+                return url;
+            },
+            get_img_url(form) {
+                if (!isEmpty(form.img[0])) {
+                    return form.img[0];
+                } else {
+                    if (!isEmpty(this.propSourceList)) {
+                        let image_url = '';
+                        // 获取数据源ID
+                        const data_source_id = !isEmpty(form?.data_source_field?.id || '') && this.propConfigLoop == '1' ? form.data_source_field.id : '';
+                        // 数据源内容
+                        const option = form?.data_source_field?.option || {};
+                        if (data_source_id.includes(';')) {
+                            const ids = data_source_id.split(';');
+                            let url = '';
+                            ids.forEach((item, index) => {
+                                url += this.data_handling(item) + (index != ids.length - 1 ? (option?.join || '') : '');
+                            });
+                            image_url = url;
+                        } else {
+                            image_url = this.data_handling(data_source_id);
+                        }
+                        return (option?.first || '') + image_url + (option?.last || '');
+                    } else {
+                        return '';
+                    }
+                }
+            },
+            data_handling(data_source_id) {
+                // 不输入商品， 文章和品牌时，从外层处理数据
+                let image_url = get_nested_property(this.propSourceList, data_source_id);
+                // 如果是商品,品牌，文章的图片， 其他的切换为从data中取数据
+                if (this.propIsCustom && !isEmpty(this.propSourceList.data)) {
+                    // 判断是否是同一标志
+                    if (data_source_id == this.propImgParams) {
+                        // 如果是符合条件的标志，先判断新的图片是否存在，存在就取新的图片，否则的话取原来的图片
+                        image_url = !isEmpty(this.propSourceList.new_cover)? this.propSourceList.new_cover[0]?.url || '' : get_nested_property(this.propSourceList.data, data_source_id);
+                    } else {
+                        image_url = get_nested_property(this.propSourceList.data, data_source_id);
+                    }
+                }
+                return image_url;
+            },
+            get_image_style(form, scale) {
+                return `width: ${percentage_count(form.img_width, form.com_width)}; height: ${percentage_count(form.img_height, form.com_height)};transform: rotate(${form.img_rotate}deg); ${radius_computer(form.img_radius, scale, true)};`;
+            },
+            get_border_style(form, scale) {
+                let style = ``;
+                if (form.border_show == '1') {
+                    style += `border: ${form.border_size * scale }px ${form.border_style} ${form.border_color}; ${radius_computer(form.border_radius, scale, true)};box-sizing: border-box;`;
+                }
+                return style;
+            },
+            url_event(e) {
+                this.$emit('url_event', this.img_url);
+            },
+        },
+    };
+</script>
+<style lang="scss" scoped>
+    .img-outer {
+        overflow: hidden;
+    }
+</style>
diff --git a/components/diy/modules/custom/model-lines.vue b/components/diy/modules/custom/model-lines.vue
new file mode 100644
index 0000000..18beb8e
--- /dev/null
+++ b/components/diy/modules/custom/model-lines.vue
@@ -0,0 +1,94 @@
+<template>
+    <view v-if="is_show" :style="border_style"></view>
+</template>
+<script>
+    import { get_is_eligible } from '@/common/js/common/common.js';
+    export default {
+        props: {
+            propValue: {
+                type: Object,
+                default: () => {
+                    return {};
+                },
+                required: true,
+            },
+            propSourceList: {
+                type: [ Object, Array ],
+                default: () => {
+                    return {};
+                },
+            },
+            propKey: {
+                type: [String,Number],
+                default: '',
+            },
+            propScale: {
+                type: Number,
+                default: 1,
+            },
+            propIsCustom: {
+                type: Boolean,
+                default: false
+            },
+            propIsCustomGroup: {
+                type: Boolean,
+                default: false
+            },
+            propCustomGroupFieldId: {
+                type: String,
+                default: ''
+            },
+            propFieldList: {
+                type: Array,
+                default: []
+            },
+            propConfigLoop: {
+                type: String,
+                default: "1"
+            }
+        },
+        data() {
+            return {
+                form: {},
+                border_style: '',
+                is_show: true,
+            };
+        },
+        watch: {
+            propKey(val) {
+                this.init();
+            }
+        },
+        created() {
+            this.init();
+        },
+        methods: {
+            init() {
+                const new_form = this.propValue;
+                this.setData({
+                    form: new_form,
+                    border_style: this.get_border_style(new_form, this.propScale),
+                    is_show: this.get_is_show(new_form),
+                });
+            },
+            get_is_show(form) {
+                if (this.propConfigLoop == '1') {
+                    // 取出条件判断的内容
+                    const condition = form?.condition || { field: '', type: '', value: '' };
+                    return get_is_eligible(this.propFieldList, condition, this.propSourceList, this.propIsCustom, this.propIsCustomGroup, this.propCustomGroupFieldId);
+                } else {
+                    return true;
+                }
+            },
+            get_border_style(form, scale) {
+                if (form.line_settings === 'horizontal') {
+                    return `margin: 10rpx 0;border-bottom: ${form.line_size * scale }px ${form.line_style} ${form.line_color};`;
+                } else {
+                    return `margin: 0 10rpx;height:100%;border-right: ${form.line_size * scale }px ${form.line_style} ${form.line_color};`;
+                }
+            }
+        },
+    };
+</script>
+<style lang="scss" scoped>
+</style>
diff --git a/components/diy/modules/custom/model-panel.vue b/components/diy/modules/custom/model-panel.vue
new file mode 100644
index 0000000..8ae1ac9
--- /dev/null
+++ b/components/diy/modules/custom/model-panel.vue
@@ -0,0 +1,133 @@
+<template>
+    <view v-if="is_show" class="wh-auto ht-auto re oh" :style="com_style" @tap="url_event">
+        <view class="wh-auto ht-auto" :style="com_img_style"></view>
+    </view>
+</template>
+<script>
+    import { radius_computer, background_computer, gradient_handle, isEmpty, get_custom_link, get_is_eligible } from '@/common/js/common/common.js';
+    
+    export default {
+        props: {
+            propValue: {
+                type: Object,
+                default: () => {
+                    return {};
+                },
+                required: true,
+            },
+            propSourceList: {
+                type: [ Object, Array ],
+                default: () => {
+                    return {};
+                },
+            },
+            propKey: {
+                type: [String,Number],
+                default: '',
+            },
+            propScale: {
+                type: Number,
+                default: 1
+            },
+            propIsCustom: {
+                type: Boolean,
+                default: false
+            },
+            propIsCustomGroup: {
+                type: Boolean,
+                default: false
+            },
+            propCustomGroupFieldId: {
+                type: String,
+                default: ''
+            },
+            propFieldList: {
+                type: Array,
+                default: []
+            },
+            propConfigLoop: {
+                type: String,
+                default: "1"
+            }
+        },
+        data() {
+            return {
+                form: {},
+                text_title: '',
+                text_style: '',
+                com_style: '',
+                panel_url: '',
+                is_show: true,
+            };
+        },
+        watch: {
+            propKey(val) {
+                this.init();
+            }
+        },
+        created() {
+            this.init();
+        },
+        methods: {
+            init() {
+                const new_form = this.propValue;
+                let url = '';
+                if (!isEmpty(new_form.link)) {
+                    url = new_form.link?.page || '';
+                } else {
+                    // 获取数据源ID
+                    const data_source_link_id = !isEmpty(new_form?.data_source_link_field?.id || '') && this.propConfigLoop == '1' ? new_form.data_source_link_field.id : '';
+                    // 数据源内容
+                    const source_link_option = new_form?.data_source_link_field?.option || {};
+                    url = get_custom_link(data_source_link_id, this.propSourceList, source_link_option);
+                }
+                this.setData({
+                    form: new_form,
+                    com_style: this.get_com_style(new_form, this.propScale),
+                    com_img_style: this.get_com_img_style(new_form),
+                    panel_url: url,
+                    is_show: this.get_is_show(new_form),
+                });
+            },
+            get_is_show(form) {
+                if (this.propConfigLoop == '1') {
+                    // 取出条件判断的内容
+                    const condition = form?.condition || { field: '', type: '', value: '' };
+                    return get_is_eligible(this.propFieldList, condition, this.propSourceList, this.propIsCustom, this.propIsCustomGroup, this.propCustomGroupFieldId);
+                } else {
+                    return true;
+                }
+            },
+            get_com_style(form, scale) {
+                let style = `${ gradient_handle(form.color_list, form.direction) } ${radius_computer(form.bg_radius, scale, true)}; transform: rotate(${form.panel_rotate}deg);`;
+                if (form.border_show == '1') {
+                    style += `border: ${form.border_size * scale }px ${form.border_style} ${form.border_color};box-sizing: border-box;`;
+                }
+                return style;
+            },
+            get_com_img_style(form) {
+                const data = {
+                    background_img: form?.background_img || [],
+                    background_img_style: form?.background_img_style || '2'
+                }
+                return background_computer(data);
+            },
+            url_event(e) {
+                this.$emit('url_event', this.panel_url);
+            },
+        },
+    };  
+</script>
+<style lang="scss" scoped>
+    .break {
+        word-wrap: break-word;
+        word-break: break-all;
+    }
+    .rich-text-content {
+        white-space: normal;
+        word-break: break-all;
+        * {
+            max-width: 100%;
+        }
+    }
+</style>
diff --git a/components/diy/modules/custom/model-text.vue b/components/diy/modules/custom/model-text.vue
new file mode 100644
index 0000000..bb93ff7
--- /dev/null
+++ b/components/diy/modules/custom/model-text.vue
@@ -0,0 +1,236 @@
+<template>
+    <view v-if="is_show" class="img-outer wh-auto ht-auto re oh" :style="com_style" @tap="url_event">
+        <view :style="text_style" :class="'break ' + text_line_class">
+            <template v-if="form.is_rich_text == '1'">
+                <mp-html :content="text_title" />
+            </template>
+            <template v-else>
+                {{ text_title }}
+            </template>
+        </view>
+    </view>
+</template>
+<script>
+    import { radius_computer, padding_computer, isEmpty, gradient_handle, get_nested_property, get_custom_link, get_is_eligible, custom_condition_data } from '@/common/js/common/common.js';
+    
+    export default {
+        props: {
+            propValue: {
+                type: Object,
+                default: () => {
+                    return {};
+                },
+                required: true,
+            },
+            propSourceList: {
+                type: [ Object, Array ],
+                default: () => {
+                    return {};
+                },
+            },
+            propKey: {
+                type: [String,Number],
+                default: '',
+            },
+            propScale: {
+                type: Number,
+                default: 1
+            },
+            propIsCustom: {
+                type: Boolean,
+                default: false
+            },
+            propIsCustomGroup: {
+                type: Boolean,
+                default: false
+            },
+            propCustomGroupFieldId: {
+                type: String,
+                default: ''
+            },
+            propTitleParams: {
+                type: String,
+                default: 'name'
+            },
+            propFieldList: {
+                type: Array,
+                default: []
+            },
+            propConfigLoop: {
+                type: String,
+                default: "1"
+            }
+        },
+        data() {
+            return {
+                form: {},
+                text_title: '',
+                text_style: '',
+                com_style: '',
+                text_url: '',
+                keyMap: {
+                    goods: 'title',
+                    article: 'title',
+                    brand: 'name'
+                },
+                is_show: true,
+                text_line_class: ''
+            };
+        },
+        watch: {
+            propKey(val) {
+                this.init();
+            }
+        },
+        created() {
+            this.init();
+        },
+        methods: {
+            init() {
+                const new_form = this.propValue;
+                let url = '';
+                if (!isEmpty(new_form.text_link)) {
+                    url = new_form.text_link?.page || '';
+                } else {
+                    // 获取数据源ID
+                    const data_source_link_id = !isEmpty(new_form?.data_source_link_field?.id || '') && this.propConfigLoop == '1' ? new_form.data_source_link_field.id : '';
+                    // 数据源内容
+                    const source_link_option = new_form?.data_source_link_field?.option || {};
+                    // 调用方法处理数据显示
+                    url = get_custom_link(data_source_link_id, this.propSourceList, source_link_option);
+                }
+                this.setData({
+                    form: new_form,
+                    text_title: (new_form?.text_captions || '') + this.get_text_title(new_form),
+                    text_style: this.get_text_style(new_form, this.propScale),
+                    com_style: this.get_com_style(new_form, this.propScale),
+                    text_url: url,
+                    is_show: this.get_is_show(new_form),
+                    text_line_class: new_form.width_omit_num == '0' || new_form.is_rich_text == '1' ? '' : `text-line-${ new_form?.width_omit_num || '' }`
+                });
+            },
+            get_is_show(form) {
+                if (this.propConfigLoop == '1') {
+                    // 取出条件判断的内容
+                    const condition = form?.condition || { field: '', type: '', value: '' };
+                    return get_is_eligible(this.propFieldList, condition, this.propSourceList, this.propIsCustom, this.propIsCustomGroup, this.propCustomGroupFieldId);
+                } else {
+                    return true;
+                }
+            },
+            get_text_title(form) {
+                let text = '';
+                if (!isEmpty(form.text_title)) {
+                    // 存储待处理的文本标题
+                    let new_title = JSON.parse(JSON.stringify((form.text_title)));
+                    let new_field_list = this.propFieldList;
+                    // 判断是否是自定义组
+                    if (this.propIsCustomGroup && !isEmpty(this.propCustomGroupFieldId)) {
+                        // 取出对应自定义组的内容
+                        const group_option_list = new_field_list.find((item) => item.field === this.propCustomGroupFieldId);
+                        // 取出自定义组内部数据源参数的详细数据
+                        new_field_list = group_option_list?.data || [];
+                    }
+                    // 遍历字段列表，替换文本标题中的占位符
+                    if (!isEmpty(new_field_list)) {
+                        new_field_list.forEach((item) => {
+                            const new_field = '${' +  item.field + '}';
+                            if (form.text_title.includes(new_field)) {
+                                // 获取到字段的真实数据
+                                const field_value = custom_condition_data(item.field, item, this.propSourceList, this.propIsCustom);
+                                // 使用正则表达式替换文本标题
+                                const regular = new RegExp(`\\$\\{\\s*${item.field}\\s*\\}`, 'g');
+                                // 替换后的内容赋值给原内容, 确保后续可以继续替换
+                                new_title = new_title.replace(regular, field_value);
+                            }
+                        });
+                    }
+                    // 将内容替换为处理后的标题
+                    text = new_title;
+                } else {
+                    let text_title = '';
+                    // 获取数据源ID
+                    const data_source_id = !isEmpty(form?.data_source_field?.id || []) && this.propConfigLoop == '1' ? form?.data_source_field?.id : [];
+                    // 数据源内容
+                    const option = form?.data_source_field?.option || [];
+                    // 多选判断
+                    if (data_source_id.length > 0) {
+                        text_title += form?.data_split?.left || '';
+                        // 遍历取出所有的值
+                        data_source_id.forEach((source_id, index) => {
+                            const sourceList = option.find((item) => item.field == source_id);
+                            // 根据数据源ID是否包含点号来区分处理方式
+                            if (source_id.includes(';')) {
+                                const ids = source_id.split(';');
+                                let source_text = '';
+                                ids.forEach((item, index) => {
+                                    source_text += this.data_handling(item) + (index != ids.length - 1 ? (sourceList?.join || '') : '');
+                                });
+                                text_title += (sourceList?.first || '') + source_text + (sourceList?.last || '');
+                            } else {
+                                text_title += (sourceList?.first || '') + this.data_handling(source_id) + (sourceList?.last || '');
+                            }
+                            if (index < data_source_id.length - 1) {
+                                text_title += form?.data_split?.middle || '';
+                            }
+                        });
+                        text_title += form?.data_split?.right || '';
+                    }
+                    // 如果是商品的标题或者是品牌的名称，需要判断是否有新的标题，没有的话就取原来的标题
+                    text = text_title;
+                }
+                return text;
+            },
+            data_handling(data_source_id) {
+                let text = get_nested_property(this.propSourceList, data_source_id);
+                // 如果是商品的标题或者是品牌的名称，需要判断是否有新的标题，没有的话就取原来的标题
+                if (this.propIsCustom && !isEmpty(this.propSourceList.data)) {
+                    // 其他的切换为从data中取数据
+                    if (data_source_id == this.propTitleParams) {
+                        // 如果是符合条件的标志，先判断新的标题是否存在，存在就取新的标题，否则的话取原来的标题
+                        text = !isEmpty(this.propSourceList.new_title) ? this.propSourceList.new_title : get_nested_property(this.propSourceList.data, data_source_id);
+                    } else {
+                        text = get_nested_property(this.propSourceList.data, data_source_id);
+                    }
+                }
+                return text;
+            },
+            get_text_style(form, scale) {
+                let style = `font-size: ${form.text_size * scale }px;line-height: ${ (typeof form.line_text_size === "number" ? form.line_text_size : form.text_size) * scale }px;color: ${form.text_color}; text-align: ${form.text_location}; transform: rotate(${form.text_rotate}deg);text-decoration: ${form.text_option};${padding_computer(form.text_padding, scale, true)};box-sizing: border-box;`;
+                if (form.text_weight == 'italic') {
+                    style += `font-style: italic`;
+                } else if (['bold', '500'].includes(form.text_weight)) {
+                    style += `font-weight: bold;`;
+                }
+                return style;
+            },
+            get_com_style(form, scale) {
+                let style = `${ gradient_handle(form.color_list, form.direction) } ${radius_computer(form.bg_radius, scale, true)}`;
+                if (form.border_show == '1') {
+                    style += `border: ${form.border_size * scale }px ${form.border_style} ${form.border_color};box-sizing: border-box;`;
+                }
+                // 是富文本并且开启了上下滚动的开关
+                if (form.is_rich_text == '1' && form.is_up_down == '1') {
+                    style += `overflow-y: auto;`;
+                }
+                return style;
+            },
+            url_event(e) {
+                this.$emit('url_event', this.text_url)
+            },
+        },
+    };  
+</script>
+<style lang="scss" scoped>
+    .break {
+        word-wrap: break-word;
+        word-break: break-all;
+    }
+    .rich-text-content {
+        white-space: normal;
+        word-break: break-all;
+        * {
+            max-width: 100%;
+        }
+    }
+</style>
diff --git a/components/diy/modules/data-magic/custom/index.vue b/components/diy/modules/data-magic/custom/index.vue
new file mode 100644
index 0000000..5c7ac5b
--- /dev/null
+++ b/components/diy/modules/data-magic/custom/index.vue
@@ -0,0 +1,304 @@
+<template>
+    <view :style="style_content_container">
+        <view :style="style_content_img_container">
+            <template v-if="!isEmpty(form.data_source) && form.data_source_is_loop !== '0'">
+                <view v-if="data_source_content_list.length > 0 && form.data_source_direction == 'vertical'">
+                    <view class="flex-row flex-wrap" :style="'row-gap:' + new_style.row_gap + 'px;column-gap:' + new_style.column_gap + 'px;'">
+                        <view v-for="(item, index) in data_source_content_list" :key="index" class="ht-auto" :style="gap_width">
+                            <view v-for="(item1, index1) in item.split_list" :key="index1">
+                                <view :style="style_container">
+                                    <view class="wh-auto ht-auto oh" :style="style_img_container">
+                                        <dataRendering :propKey="propKey" :propCustomList="form.custom_list" :propIndex="index1" :propSourceList="item1" :propConfigLoop="form.data_source_is_loop || '1'" :propGroupSourceList="data_source_content_list" :propSourceType="form.data_source" :propDataHeight="form.height" :propScale="scale" :propDataIndex="index" :propDataSplitIndex="index1" :propIsCustom="form.is_custom_data == '1'" :propShowData="show_data" @url_event="url_event"></dataRendering>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <view v-else-if="data_source_content_list.length > 0 && ['vertical-scroll', 'horizontal'].includes(form.data_source_direction)" class="oh pr">
+                    <swiper class="w flex" circular="true" :vertical="form.data_source_direction != 'horizontal'" :autoplay="new_style.is_roll == '1'" :interval="new_style.interval_time * 1000" :duration="500" :display-multiple-items="slides_per_view" :style="{ width: '100%', height: swiper_height + 'px' }" @change="slideChange">
+                        <swiper-item v-for="(item, index) in data_source_content_list" :key="index">
+                            <view :class="form.data_source_direction != 'horizontal' ? '' : 'flex-row'" :style="form.data_source_direction == 'horizontal' ? 'column-gap:' + new_style.column_gap + 'px;' : ''">
+                                <view v-for="(item1, index1) in item.split_list" :key="index1" :style="style_container + swiper_width + (form.data_source_direction == 'horizontal' ? gap_width : 'margin-bottom:' + content_outer_spacing_magin)">
+                                    <view class="wh-auto ht-auto oh" :style="style_img_container">
+                                        <dataRendering :propKey="propKey" :propCustomList="form.custom_list" :propIndex="index1" :propSourceList="item1" :propConfigLoop="form.data_source_is_loop || '1'" :propGroupSourceList="data_source_content_list" :propSourceType="form.data_source" :propDataHeight="form.height" :propScale="scale" :propDataIndex="index" :propDataSplitIndex="index1" :propIsCustom="form.is_custom_data == '1'" :propShowData="show_data" @url_event="url_event"></dataRendering>
+                                    </view>
+                                </view>
+                            </view>
+                        </swiper-item>
+                    </swiper>
+                </view>
+                <view v-else>
+                    <view :style="style_container">
+                        <view class="wh-auto ht-auto oh" :style="style_img_container">
+                            <dataRendering :propKey="propKey" :propCustomList="form.custom_list" :propIndex="0" :propConfigLoop="form.data_source_is_loop || '1'" :propDataHeight="form.height" :propScale="scale" @url_event="url_event"></dataRendering>
+                        </view>
+                    </view>
+                </view>
+            </template>
+            <view v-else-if="!isEmpty(form.data_source) && form.data_source_is_loop == '0'">
+                <view :style="style_container">
+                    <view class="w h oh" :style="style_img_container">
+                        <dataRendering :propKey="propKey" :propCustomList="form.custom_list" :propIndex="0" :propSourceList="{}" :propConfigLoop="form.data_source_is_loop || '1'" :propGroupSourceList="data_source_content_list" :propSourceType="form.data_source" :propDataHeight="form.height" :propScale="scale" :propIsCustom="form.is_custom_data == '1'" :propShowData="show_data" @url_event="url_event"></dataRendering>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <view :style="style_container">
+                    <view class="wh-auto ht-auto oh" :style="style_img_container">
+                        <dataRendering :propKey="propKey" :propCustomList="form.custom_list" :propIndex="0" :propConfigLoop="form.data_source_is_loop || '1'" :propDataHeight="form.height" :propScale="scale" @url_event="url_event"></dataRendering>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import { padding_computer, isEmpty, margin_computer, gradient_computer, radius_computer, background_computer, common_styles_computer, common_img_computer, border_width, box_shadow_computer, border_computer, old_border_and_box_shadow, old_margin, old_padding, old_radius } from '@/common/js/common/common.js';
+import dataRendering from '@/components/diy/modules/custom/data-rendering.vue';
+const app = getApp();
+
+export default {
+    components: {
+        dataRendering
+    },
+    props: {
+        propKey: {
+            type: String,
+            default: '',
+        },
+        propValue: {
+            type: Object,
+            default: () => {
+                return {};
+            },
+        },
+        propMagicScale: {
+            type: Number,
+            default: 1,
+        },
+        propDataSpacing: {
+            type: Number,
+            default: 0,
+        },
+        propDataIndex: {
+            type: Number,
+            default: 0,
+        },
+    },
+    data() {
+        return {
+            form: {},
+            new_style: {},
+            scale: 1,
+            style_container: '',
+            style_img_container: '',
+            div_width: 0,
+            div_height: 0,
+            custom_list_length: 0,
+            data_source_content_list: [],
+            data_source: '',
+            // 一屏显示的数量
+            slides_per_view: 1,
+            // 轮播高度
+            swiper_height: 0,
+            swiper_width: 'width: 100%;',
+            show_data: { data_key: 'id', data_name: 'name' },
+            gap_width: '',
+            content_outer_spacing_magin: '0rpx',
+            defalt_style: {
+                color_list: [{ color: '', color_percentage: undefined }],
+                direction: '180deg',
+                background_img_style: '2',
+                background_img: [],
+                radius: 0,
+                radius_top_left: 0,
+                radius_top_right: 0,
+                radius_bottom_left: 0,
+                radius_bottom_right: 0,
+                padding: 0,
+                padding_top: 0,
+                padding_bottom: 0,
+                padding_left: 0,
+                padding_right: 0,
+                margin: 0,
+                margin_top: 0,
+                margin_bottom: 0,
+                margin_left: 0,
+                margin_right: 0,
+            },
+            style_content_container: '',
+            style_content_img_container: '',
+        };
+    },
+    watch: {
+        propKey(val) {
+            // 初始化
+            this.init();
+        },
+    },
+    computed: {
+        get_percentage_count() {
+            return (num) => {
+                return num * this.scale + 'px';
+            };
+        },
+    },
+    mounted() {
+        this.init();
+    },
+    methods: {
+        isEmpty,
+        init() {
+            if (!isEmpty(this.propValue)) {
+                const new_form = this.propValue.data_content;
+                const new_style = this.propValue.data_style;
+                const { data_common_style = {}, data_color_list = [], data_direction = '180deg', data_radius = old_radius, data_background_img = [], data_background_img_style = '2', data_chunk_padding = old_padding, data_chunk_margin = old_margin, data_content_style = {}, data_pattern = old_border_and_box_shadow } = new_style;
+                const style_data = {
+                    color_list: data_color_list,
+                    direction: data_direction,
+                }
+                const style_img_data = {
+                    background_img: data_background_img,
+                    background_img_style: data_background_img_style,
+                }
+                // 数据来源的内容
+                let list = [];
+                if (new_form.is_custom_data == '1') {
+                    if (Number(new_form.data_source_content.data_type) === 0) {
+                        list = new_form.data_source_content.data_list;
+                    } else {
+                        list = new_form.data_source_content.data_auto_list.map(item => ({
+                            id: Math.random(),
+                            new_cover: [],
+                            new_title: '',
+                            data: item,
+                        }));
+                    }
+                } else {
+                    list = new_form.data_source_content.data_list;
+                }
+                const new_list = list.length > 0 ? this.get_list(list, new_form, new_style) : [];
+                // 计算宽度
+                const { padding_left, padding_right, padding_top, padding_bottom } = data_chunk_padding;
+                const { margin_left, margin_right, margin_bottom, margin_top } = data_chunk_margin;
+                const old_width = new_form.width * this.propMagicScale;
+                // 数据宽度
+                const data_style = padding_left + padding_right + margin_left + margin_right + border_width(data_pattern);
+                // 通用样式
+                const chunk_padding = new_style?.chunk_padding || old_padding;
+                const chunk_margin = new_style?.chunk_margin || old_margin;
+                const common_styles = (chunk_margin?.margin_left || 0) + (chunk_margin?.margin_right || 0) + (chunk_padding?.padding_left || 0) + (chunk_padding?.padding_right || 0) + border_width(data_common_style);
+                // 内容左右间距
+                const content_spacing = (data_content_style?.margin_left || 0) + (data_content_style?.margin_right || 0) + (data_content_style?.padding_left || 0) + (data_content_style?.padding_right || 0) + border_width(data_content_style);
+                const carousel_col = Number(new_form.data_source_carousel_col);
+                // 数据间距
+                const data_spacing = ['vertical', 'horizontal'].includes(new_form.data_source_direction) ? new_style.column_gap * (carousel_col - 1) : 0;
+                // 当前容器的宽度 减去 左右两边的padding值 再减去 数据间距的一半 再除以 容器的宽度 得到比例 再乘以数据魔方的比例
+                const width = old_width - data_style - content_spacing - common_styles - data_spacing - (this.propDataSpacing / 2);
+                // 计算缩放比例
+                // 比例增加最小值判断
+                const scale_number = width / new_form.width;
+                const new_scale = scale_number > 0 ? scale_number : 0;
+                // 间距
+                const space_between = new_form.data_source_direction == 'horizontal' ? new_style.column_gap : new_style.row_gap;
+                // 判断是平移还是整屏滚动
+                let swiper_height = 0;
+                // 商品数量大于列数的时候，高度是列数，否则是当前的数量
+                const col = new_list.length > carousel_col ? carousel_col : new_list.length;
+                // 轮播图高度控制
+                if (new_form.data_source_direction == 'horizontal') {
+                    swiper_height = new_form.height * new_scale + padding_top + padding_bottom + margin_bottom + margin_top;
+                } else {
+                    swiper_height = (new_form.height * new_scale + padding_top + padding_bottom + margin_bottom + margin_top) * col + ((carousel_col - 1) * space_between);
+                }
+                // 计算间隔的空间。(gap * gap数量) / 模块数量
+                let gap = (new_style.column_gap * (carousel_col - 1)) / carousel_col;
+                // 横向的时候，根据选择的行数和每行显示的个数来区分具体是显示多少个
+                const swiper_width = (new_form.data_source_direction == 'horizontal' && new_style.rolling_fashion != 'translation') ? `width: ${ 100 / carousel_col }%;`: 'width: 100%;';
+                const content_style = !isEmpty(new_style.data_content_style)? new_style.data_content_style : this.defalt_style;
+                this.setData({
+                    form: new_form,
+                    new_style: new_style,
+                    div_width: width,
+                    scale: new_scale,
+                    custom_list_length: new_form.custom_list.length - 1,
+                    style_content_container: common_styles_computer(content_style),
+                    style_content_img_container: common_img_computer(content_style),
+                    style_container: gradient_computer(style_data) + radius_computer(data_radius) + margin_computer(data_chunk_margin) + box_shadow_computer(data_pattern) + border_computer(data_pattern), // 用于样式显示
+                    style_img_container: padding_computer(data_chunk_padding) + background_computer(style_img_data) + 'box-sizing: border-box;',
+                    data_source_content_list: new_list,
+                    data_source: !isEmpty(new_form.data_source)? new_form.data_source : '',
+                    slides_per_view: new_style.rolling_fashion == 'translation' ? (new_form.data_source_direction != 'horizontal' ? col : carousel_col) : 1,
+                    swiper_height: swiper_height,
+                    swiper_width: swiper_width,
+                    show_data: new_form?.show_data || { data_key: 'id', data_name: 'name' },
+                    content_outer_spacing_magin: space_between + 'px',
+                    gap_width: `width: calc(${100 / carousel_col}% - ${gap}px);`,
+                });
+            }
+        },
+        get_list(list, form, new_style) {
+            // 深拷贝一下，确保不会出现问题
+            const cloneList = JSON.parse(JSON.stringify(list));
+            if (new_style.rolling_fashion != 'translation' && form.data_source_direction != 'vertical') {
+                // 如果是分页滑动情况下，根据选择的行数和每行显示的个数来区分具体是显示多少个
+                if (cloneList.length > 0) {
+                    // 每页显示的数量
+                    const num = form.data_source_carousel_col;
+                    // 存储数据显示
+                    let nav_list = [];
+                    // 拆分的数量
+                    const split_num = Math.ceil(cloneList.length / num);
+                    for (let i = 0; i < split_num; i++) {
+                        nav_list.push({
+                            split_list: cloneList.slice(i * num, (i + 1) * num),
+                        });
+                    }
+                    return nav_list;
+                } else {
+                    // 否则的话，就返回全部的信息
+                    return [
+                        {
+                            split_list: cloneList,
+                        },
+                    ];
+                }
+            } else {
+                // 存储数据显示
+                let nav_list = [];
+                cloneList.forEach((item) => {
+                    nav_list.push({
+                        split_list: [item],
+                    });
+                });
+                return nav_list;
+            }
+        },
+        slideChange(e) {
+            this.$emit('onCarouselChange', e.detail.current, this.propDataIndex);
+        },
+        url_event(e, index, split_index) {
+            if (this.form.data_source == 'goods' && this.data_source_content_list.length > 0) {
+                const list = this.data_source_content_list[index];
+                if (!isEmpty(list) && !isEmpty(list.split_list[split_index])) {
+                    const new_list = list.split_list[split_index];
+                    if (!isEmpty(new_list)) {
+                        // 缓存商品数据
+                        app.globalData.goods_data_cache_handle(new_list.data.id, new_list.data);
+                    }
+                }
+            }
+            app.globalData.url_open(e);
+        },
+    },
+};
+</script>
+
+<style scoped lang="scss">
+.main-content {
+    position: absolute;
+    overflow: hidden;
+}
+</style>
diff --git a/components/diy/modules/data-magic/magic-carousel.vue b/components/diy/modules/data-magic/magic-carousel.vue
new file mode 100644
index 0000000..059976d
--- /dev/null
+++ b/components/diy/modules/data-magic/magic-carousel.vue
@@ -0,0 +1,142 @@
+<template>
+    <view class="wh-auto ht-auto oh" :style="style_container">
+        <view class="pr oh wh-auto ht-auto" :style="style_img_container">
+            <swiper circular="true" :autoplay="propValue.data_style.is_roll == '1'" :interval="propValue.data_style.interval_time * 1000" :duration="500" :vertical="propValue.data_style.rotation_direction == 'vertical'" :next-margin="next_margin" :display-multiple-items="slides_per_view" class="swiper" style="height: 100%" @change="carousel_change">
+                <swiper-item v-for="(item1, index1) in propValue.data_content.list" :key="index1">
+                    <template v-if="propType === 'img'">
+                        <view class="wh-auto ht-auto" :data-value="item1.carousel_link.page" @tap="url_event">
+                            <imageEmpty :propImageSrc="item1.carousel_img[0]" :propStyle="propValue.data_style.get_img_radius" :propImgFit="propValue.data_content.fit" propErrorStyle="width: 80rpx;height: 80rpx;"></imageEmpty>
+                        </view>
+                    </template>
+                    <template v-else>
+                        <view class="wh-auto ht-auto" :style="shop_spacing">
+                            <product-list-show :propKey="propKey" :propOuterflex="propValue.data_content.goods_outerflex" :propFlex="propValue.data_content.goods_flex" :propNum="show_num" :propActived="propActived" :propIsShow="propValue.data_content.is_show" :propChunkPadding="propValue.data_style.chunk_padding" :propValue="item1.split_list" :propGoodStyle="propGoodStyle" :propContentImgRadius="propValue.data_style.get_img_radius" @url_event="url_event"></product-list-show>
+                        </view>
+                    </template>
+                </swiper-item>
+            </swiper>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { gradient_computer, radius_computer, padding_computer, background_computer, isEmpty, border_computer, box_shadow_computer, old_border_and_box_shadow, old_margin, old_radius, old_padding, margin_computer } from "@/common/js/common/common.js";
+    const app = getApp();
+    import imageEmpty from '@/components/diy/modules/image-empty.vue';
+    import productListShow from '@/components/diy/modules/data-magic/product-list-show.vue';
+    export default {
+        components: {
+            imageEmpty,
+            productListShow,
+        },
+        props: {
+            propValue: {
+                type: Object,
+                default: () => ({}),
+            },
+            propContentImgRadius: {
+                type: String,
+                default: () => '',
+            },
+            propType: {
+                type: String,
+                default: () => '',
+            },
+            propActived: {
+                type: Number,
+                default: () => 0,
+            },
+            propGoodStyle: {
+                type: Object,
+                default: () => {},
+            },
+            propDataIndex: {
+                type: Number,
+                default: () => 0,
+            },
+            propKey: {
+                type: [String, Number],
+                default: '',
+            },
+        },
+        data() {
+            return {
+                style_container: '',
+                style_img_container: '',
+                slides_per_view: 1,
+                show_num: 1,
+                shop_spacing: '',
+                next_margin: '0rpx',
+            };
+        },
+        watch: {
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        mounted() {
+            this.init();
+        },
+        methods: {
+            init() {
+                if (!isEmpty(this.propValue)) {
+                    const { data_color_list = [], data_direction = '180deg', data_chunk_margin = old_margin, data_radius = old_radius, data_pattern = old_border_and_box_shadow, data_background_img = [], data_background_img_style = '2', data_chunk_padding = old_padding } = this.propValue.data_style;
+                    const style_data = {
+                        color_list: data_color_list,
+                        direction: data_direction,
+                    }
+                    const style_img_data = {
+                        background_img: data_background_img,
+                        background_img_style: data_background_img_style,
+                    }
+                    let slides_per_view = 1;
+                    let show_num = 1;
+                    // 商品时的处理逻辑
+                    const { goods_outerflex, goods_num } = this.propValue.data_content;
+                    const { rotation_direction, rolling_fashion, data_goods_gap } = this.propValue.data_style;
+                    // 图片时的处理
+                    if (this.propType === 'img') {
+                        slides_per_view = 1; // 能够同时显示的slides数量
+                    } else {
+                        // 判断是平移还是整屏滚动, 平移的时候是一个为1组，如果是整屏滚动，就为一屏为一组
+                        if (rolling_fashion == 'translation') {
+                            // 如果是商品是横排的，轮播也是横排的，就不对商品进行拆分/如果商品是竖排的，轮播也是竖排的，不对商品进行拆分
+                            if ((goods_outerflex == 'row' && rotation_direction == 'horizontal') || (goods_outerflex == 'col' && rotation_direction == 'vertical')) {
+                                slides_per_view = goods_num; // 能够同时显示的slides数量
+                                show_num = 1; // 一屏显示的数量 用于商品内部处理显示
+                            } else {
+                                slides_per_view = 1; // 能够同时显示的slides数量
+                                show_num = goods_num; // 一屏显示的数量 用于商品内部处理显示
+                            }
+                        } else {
+                            // 切屏的时候为多个为一组 
+                            show_num = goods_num; // 一屏显示的数量 用于商品内部处理显示
+                            slides_per_view = 1; // 能够同时显示的slides数量
+                        }
+                    }
+                    
+                    this.setData({
+                        style_container: gradient_computer(style_data) + radius_computer(data_radius) + margin_computer(data_chunk_margin) + box_shadow_computer(data_pattern) + border_computer(data_pattern), // 用于样式显示
+                        style_img_container: padding_computer(data_chunk_padding) + background_computer(style_img_data) + 'box-sizing: border-box;',
+                        next_margin: rolling_fashion == 'translation' && rotation_direction == 'horizontal' ? `-${ data_goods_gap * 2 }rpx` : '0rpx',
+                        shop_spacing: this.propType === 'img' ? 'margin-right: 0px;' : `margin-right: ${ data_goods_gap * 2 }rpx;`,
+                        slides_per_view: slides_per_view,
+                        show_num: show_num,
+                    });
+                } else {
+                    return '';
+                }
+            },
+            carousel_change(e) {
+                this.$emit('onCarouselChange', e.detail.current, this.propDataIndex);
+            },      
+            // 跳转链接
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+        },
+    };
+</script>
+
+<style></style>
diff --git a/components/diy/modules/data-magic/product-list-show.vue b/components/diy/modules/data-magic/product-list-show.vue
new file mode 100644
index 0000000..279cbff
--- /dev/null
+++ b/components/diy/modules/data-magic/product-list-show.vue
@@ -0,0 +1,233 @@
+<template>
+    <view :class="['align-c flex-1 w h', (propOuterflex == 'row' ? 'flex-row' : 'flex-col')]" :style="'gap:' + propGoodStyle.data_goods_gap + 'px;'">
+        <template v-if="propFlex === 'row'">
+            <view v-for="(item, index) in propValue" :key="index" :style="block_size" class="w h">
+                <view class="w h oh" :style="style_container">
+                    <view class="w h flex-row gap-10" :style="style_img_container" :data-index="index" :data-value="item.goods_url" @tap="url_event">
+                        <template v-if="!isEmpty(item.new_cover)">
+                            <view class="w h">
+                                <imageEmpty :propImageSrc="item.new_cover[0]" :propStyle="propContentImgRadius" propErrorStyle="width: 80rpx;height: 80rpx;"></imageEmpty>
+                            </view>
+                        </template>
+                        <template v-else>
+                            <view class="w h">
+                                <imageEmpty :propImageSrc="item.images" :propStyle="propContentImgRadius" propErrorStyle="width: 80rpx;height: 80rpx;"></imageEmpty>
+                            </view>
+                        </template>
+                        <view v-if="!isEmpty(propIsShow)" class="flex-col w h tl jc-sb">
+                            <view v-if="propIsShow.includes('title')" class="text-line-2" :style="propGoodStyle.goods_title_style + 'height:'+ ((propGoodStyle.goods_title_size + 3) * 4) + 'rpx;'">{{ item.title || '' }}</view>
+                            <view v-if="propIsShow.includes('price')" :style="propGoodStyle.goods_price_style">
+                                <text :style="propGoodStyle.goods_price_symbol_style">{{ item.show_price_symbol || '' }}</text>
+                                {{ item.min_price || '' }}
+                                <template v-if="propIsShow.includes('price_unit')">
+                                    <text :style="propGoodStyle.goods_price_unit_style">{{ item.show_price_unit || '' }}</text>
+                                </template>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </template>
+        <template v-else-if="propFlex === 'col_price_float'">
+            <view v-for="(item, index) in propValue" :key="index" :style="block_size" class="w h">
+                <view class="w h oh" :style="style_container">
+                    <view class="w h flex-col gap-10" :style="style_img_container" :data-index="index" :data-value="item.goods_url" @tap="url_event">
+                        <view class="w h flex-1 pr oh">
+                            <template v-if="!isEmpty(item.new_cover)">
+                                <view class="w h">
+                                    <imageEmpty :propImageSrc="item.new_cover[0]" :propStyle="propContentImgRadius" propErrorStyle="width: 80rpx;height: 80rpx;"></imageEmpty>
+                                </view>
+                            </template>
+                            <template v-else>
+                                <view class="w h">
+                                    <imageEmpty :propImageSrc="item.images" :propStyle="propContentImgRadius" propErrorStyle="width: 80rpx;height: 80rpx;"></imageEmpty>
+                                </view>
+                            </template>
+                            <view v-if="propIsShow.includes('price')" class="pa" :style="propGoodStyle.goods_price_style + float_pirce_style">
+                                <text :style="propGoodStyle.goods_price_symbol_style">{{ item.show_price_symbol || ''}}</text>{{ item.min_price  || ''}}
+                                <template v-if="propIsShow.includes('price_unit')">
+                                    <text :style="propGoodStyle.goods_price_unit_style">{{ item.show_price_unit || ''}}</text>
+                                </template>
+                            </view>
+                        </view>
+                        <view v-if="propIsShow.includes('title')" class="text-line-1 tl w" :style="propGoodStyle.goods_title_style + 'height:'+ ((propGoodStyle.goods_title_size + 3) * 2) + 'rpx;'">{{ item.title || '' }}</view>
+                    </view>
+                </view>
+            </view>
+        </template>
+        <template v-else>
+            <view v-for="(item, index) in propValue" :key="index" :style="block_size" class="w h">
+                <view class="w h oh" :style="style_container">
+                    <view class="w h flex-col" :style="style_img_container" :data-index="index" :data-value="item.goods_url" @tap="url_event">
+                        <template v-if="!isEmpty(item.new_cover)">
+                            <view class="w h">
+                                <imageEmpty :propImageSrc="item.new_cover[0]" :propStyle="propContentImgRadius" propErrorStyle="width: 80rpx;height: 80rpx;"></imageEmpty>
+                            </view>
+                        </template>
+                        <template v-else>
+                            <view class="w h">
+                                <imageEmpty :propImageSrc="item.images" :propStyle="propContentImgRadius" propErrorStyle="width: 80rpx;height: 80rpx;"></imageEmpty>
+                            </view>
+                        </template>
+                        <view v-if="!isEmpty(propIsShow)" class="flex-col w h tl jc-sb">
+                            <view v-if="propIsShow.includes('title')" class="text-line-2" :style="propGoodStyle.goods_title_style + 'height:'+ ((propGoodStyle.goods_title_size + 3) * 4) + 'rpx;'">{{ item.title || '' }}</view>
+                            <view v-if="propIsShow.includes('price')" :style="propGoodStyle.goods_price_style">
+                                <text :style="propGoodStyle.goods_price_symbol_style">{{ item.show_price_symbol || ''}}</text>{{ item.min_price || '' }}
+                                <template v-if="propIsShow.includes('price_unit')">
+                                    <text :style="propGoodStyle.goods_price_unit_style">{{ item.show_price_unit || ''}}</text>
+                                </template>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </template>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import { gradient_computer, radius_computer, padding_computer, background_computer, isEmpty, margin_computer, box_shadow_computer, border_computer, old_margin, old_border_and_box_shadow, old_padding } from "@/common/js/common/common.js";
+    import imageEmpty from '@/components/diy/modules/image-empty.vue';
+    export default {
+        components: {
+            imageEmpty,
+        },
+        props: {
+            propValue: {
+                type: Array,
+                default: () => [],
+            },
+            propOuterflex: {
+                type: String,
+                default: () => '',
+            },
+            propFlex: {
+                type: String,
+                default: () => '',
+            },
+            propContentImgRadius: {
+                type: String,
+                default: () => '',
+            },
+            propNum: {
+                type: Number,
+                default: () => 0,
+            },
+            propActived: {
+                type: Number,
+                default: () => 0,
+            },
+            propIsShow: {
+                type: Array,
+                default: () => [],
+            },
+            propChunkPadding: {
+                type: Object,
+                default: () => {},
+            },
+            propGoodStyle: {
+                type: Object,
+                default: () => {},
+            },
+            propKey: {
+                type: [String, Number],
+                default: '',
+            },
+        },
+        data() {
+            return {
+                style_container: '',
+                style_img_container: '',
+                block_size: '',
+                float_pirce_style: '',
+            };
+        },
+        watch: {
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        mounted() {
+            this.init();
+        },
+        computed: {
+            img_padding_computer() {
+                if (!isEmpty(this.propChunkPadding)) {
+                    return padding_computer(this.propChunkPadding) + ';box-sizing: border-box;';
+                } else {
+                    return '';
+                }
+            },
+        },
+        methods: {
+            isEmpty,
+            init() {
+                if (!isEmpty(this.propGoodStyle)) {
+                    const { goods_color_list = [], goods_direction = '180deg', goods_radius = old_radius, goods_background_img = [], goods_background_img_style = '2', goods_chunk_padding = old_padding, goods_price_color_list = [], goods_price_direction = '180deg', goods_price_radius = old_radius, goods_price_padding = old_padding, goods_price_margin = old_margin, goods_price_location = 'center', goods_chunk_margin = old_margin} = this.propGoodStyle;
+                    const style_data = {
+                        color_list: goods_color_list,
+                        direction: goods_direction,
+                    }
+                    const style_img_data = {
+                        background_img: goods_background_img,
+                        background_img_style: goods_background_img_style,
+                    }
+                    
+                    const data = {
+                        color_list: goods_price_color_list,
+                        direction: goods_price_direction,
+                    }
+                    let location = 'left:50%;transform:translateX(-50%);bottom:0;'
+                    if (goods_price_location == 'left') {
+                        location = 'left:0;bottom:0;';
+                    } else if (goods_price_location == 'right') {
+                        location = 'right:0;bottom:0;';
+                    }
+                    // 左右间距
+                    const shop_left_right_width_margin = goods_chunk_margin?.margin_left || 0 + goods_chunk_margin?.margin_right || 0;
+                    // 上下间距
+                    const shop_top_bottom_width_margin = goods_chunk_margin?.margin_top || 0 + goods_chunk_margin?.margin_bottom || 0;
+                    // 内容间距
+                    const total_gap = this.propGoodStyle.data_goods_gap * (this.propValue.length - 1);
+                    // 总的宽度
+                    const all_width = total_gap + (shop_left_right_width_margin.value * this.propNum);
+                    // 总的高度
+                    const all_height = total_gap + (shop_top_bottom_width_margin.value * this.propNum);
+                    this.setData({
+                        float_pirce_style: gradient_computer(data) + radius_computer(goods_price_radius) + padding_computer(goods_price_padding) + margin_computer(goods_price_margin) + location,
+                        style_container: gradient_computer(style_data) + radius_computer(goods_radius) + margin_computer(goods_chunk_margin) + border_computer(this.propGoodStyle) + box_shadow_computer(this.propGoodStyle), // 用于样式显示
+                        style_img_container: this.propFlex == 'col' ? background_computer(style_img_data) : padding_computer(goods_chunk_padding) + background_computer(style_img_data) + 'box-sizing: border-box;',
+                        block_size: this.propOuterflex == 'row' ?  'height:calc(100% - ' +  shop_top_bottom_width_margin.value + 'px);width:calc((100% - ' + all_width + 'px) / ' + this.propNum  + ');' : 'width:calc(100% - ' +  shop_left_right_width_margin.value + 'px);height:calc((100% - ' + all_height + 'px) / ' + this.propNum  + ');',
+                    });
+                } else {
+                    return '';
+                }
+            },
+            url_event(e) {
+                // 存储数据显示缓存
+                let index = e.currentTarget.dataset.index || 0;
+                let goods = this.propValue[index];
+                app.globalData.goods_data_cache_handle(goods.id, goods);
+
+                this.$emit('url_event', e);
+            },
+        },
+    };
+</script>
+
+<style scoped lang="scss">
+    .w {
+        width: 100%;
+    }
+    .h {
+        height: 100%;
+    }
+    .half-width {
+        width: 50%;
+    }
+    .gap-20 {
+        gap: 40rpx;
+    }
+</style>
diff --git a/components/diy/modules/data-magic/video/index.vue b/components/diy/modules/data-magic/video/index.vue
new file mode 100644
index 0000000..9b4daee
--- /dev/null
+++ b/components/diy/modules/data-magic/video/index.vue
@@ -0,0 +1,57 @@
+<template>
+    <!-- 视频 -->
+    <view class="video pr wh-auto ht-auto">
+        <video :src="video" class="wh-auto ht-auto" :poster="video_img" objectFit="cover" :style="'object-fit: cover;' + video_style"></video>
+    </view>
+</template>
+
+<script>
+    import { padding_computer, radius_computer } from '@/common/js/common/common.js';
+    export default {
+        props: {
+            propKey: {
+                type: [String, Number],
+                default: '',
+            },
+            propValue: {
+                type: Object,
+                default: () => ({}),
+            },
+            propDataStyle: {
+                type: Object,
+                default: () => ({}),
+            }
+        },
+        data() {
+            return {
+                style_container: '',
+                video_img: '',
+                video: '',
+                video_style: '',
+            };
+        },
+        watch: {
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        created() {
+            this.init();
+        },
+        methods: {
+            // 初始化数据
+            init() {
+                const new_content = this.propValue || {};
+                // 视频比例
+                this.setData({
+                    video_img: new_content.video_img.length > 0 ? new_content.video_img[0].url : '',
+                    video: new_content.video.length > 0 ? new_content.video[0].url : '',
+                    video_style: radius_computer(this.propDataStyle.img_radius),
+                });
+            }
+        },
+    };
+</script>
+
+<style></style>
diff --git a/components/diy/modules/image-empty.vue b/components/diy/modules/image-empty.vue
new file mode 100644
index 0000000..c5bc752
--- /dev/null
+++ b/components/diy/modules/image-empty.vue
@@ -0,0 +1,79 @@
+<template>
+    <view :class="['oh img_wh', propClass]" :style="empty_outer_style + propStyle">
+        <image :src="img_url" :mode="propImgFit" :style="empty_style + 'display: block;'" />
+    </view>
+</template>
+
+<script>
+    import { is_obj, isEmpty } from '@/common/js/common/common.js';
+    export default {
+        props: {
+            propImageSrc: {
+                type: [Object, String],
+                default: () => {},
+            },
+            propErrorStyle: {
+                type: String,
+                default: () => '',
+            },
+            propImgFit: {
+                type: String,
+                default: () => 'aspectFill',
+            },
+            propStyle: {
+                type: String,
+                default: () => '',
+            },
+            propClass: {
+                type: String,
+                default: () => '',
+            },
+        },
+        data() {
+            return {
+                empty_outer_style: '',
+                empty_style: 'width: 100%; height: 100%;', // 有图片的时候显示为100%
+                img_url: '',
+                default_image: '/static/images/common/image-empty.png',
+            };
+        },
+        watch: {
+            propImageSrc(val) {
+                this.init();
+            }
+        },
+        mounted() {
+            this.init();
+        },
+        methods: {
+            init() {
+                let img_url = this.propImageSrc;
+                if (is_obj(this.propImageSrc)) {
+                    img_url = !isEmpty(this.propImageSrc) ? this.propImageSrc.url : '';
+                }
+                // 没有图片的时候根据默认值来算
+                if (img_url == undefined || img_url == null || img_url == '') {
+                    this.setData({
+                        empty_outer_style: 'background: #f4fcff;display:flex;align-items: center;justify-content: center;',
+                        empty_style: `${this.propErrorStyle}`,
+                    });
+                    img_url = this.default_image;
+                } else {
+                    this.setData({
+                        empty_outer_style: '',
+                        empty_style: 'width: 100%; height: 100%;', // 有图片的时候显示为100%
+                    });
+                }
+                this.setData({
+                    img_url: img_url,
+                });
+            },
+        },
+    };
+</script>
+<style lang="scss" scoped>
+    .img_wh {
+        width: 100%;
+        height: 100%;
+    }
+</style>
diff --git a/components/diy/modules/subscript/index.vue b/components/diy/modules/subscript/index.vue
new file mode 100644
index 0000000..62ba332
--- /dev/null
+++ b/components/diy/modules/subscript/index.vue
@@ -0,0 +1,98 @@
+<template>
+    <view v-if="form.seckill_subscript_show == '1'" class="corner-marker" :style="corner_marker">
+        <view class="flex-row nowrap" :style="corner_img_marker">
+            <template v-if="form.subscript_type == 'img-icon'">
+                <template v-if="!isEmpty(form.subscript_img_src)">
+                    <image :src="form.subscript_img_src[0].url" mode="aspectFill" :style="img_style" />
+                </template>
+                <template v-else>
+                    <iconfont :name="'icon-' + form.subscript_icon_class" propContainerDisplay="flex" :size="new_style.subscript_style.text_or_icon_size * 2 + 'rpx'" :color="new_style.subscript_style.text_or_icon_color"></iconfont>
+                </template>
+            </template>
+            <template v-else>
+                <span class="text-line-1" :style="text_size">{{ form.subscript_text }}</span>
+            </template>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { common_img_computer, common_styles_computer, isEmpty } from '@/common/js/common/common.js';
+    import iconfont from '@/components/iconfont/iconfont';
+    export default {
+        components: {
+            iconfont,
+        },
+        props: {
+            propValue: {
+                type: Object,
+                default: () => ({}),
+            },
+            propType: {
+                type: String,
+                default: 'outer',
+            },
+        },
+        data() {
+            return {
+                form: {},
+                new_style: {},
+                corner_img_marker: '',
+                img_style: '',
+                text_size: '',
+            };
+        },
+        created() {
+            this.init();
+        },
+        methods: {
+            isEmpty,
+            // 初始化数据
+            init() {
+                if (!isEmpty(this.propValue)) {
+                    const new_content = this.propValue.content || {};
+                    const new_style = this.propType == 'outer' ? this.propValue.style || {} : { subscript_style: this.propValue.style || {} };
+                    if (!isEmpty(new_style.subscript_style)) {
+                        // 视频比例
+                        this.setData({
+                            form: new_content,
+                            new_style: new_style,
+                            corner_marker: this.get_corner_marker(new_style),
+                            text_size: `font-size: ${ new_style.subscript_style.text_or_icon_size * 2 }rpx;color: ${ new_style.subscript_style.text_or_icon_color };`,
+                            corner_img_marker: common_img_computer(new_style.subscript_style),
+                            img_style: `height: ${new_style.subscript_style.img_height * 2}rpx; width: ${new_style.subscript_style.img_width * 2}rpx`,
+                        });
+                    }
+                }
+            },
+            get_corner_marker(new_style) {
+                const { subscript_style } = new_style;
+                let location = common_styles_computer(subscript_style);
+                // 获取内部的显示数据
+                const { seckill_subscript_location, top_or_bottom_spacing, left_or_right_spacing } = subscript_style;
+                // 圆角根据图片的圆角来计算 对角线是同样的圆角
+                if (seckill_subscript_location == 'top-left') {
+                    location += `top: ${ top_or_bottom_spacing * 2 }rpx;left: ${ left_or_right_spacing * 2 }rpx;`;
+                } else if (seckill_subscript_location == 'top-center') {
+                    location += 'top: 0;left: 50%;transform: translateX(-50%);';
+                } else if (seckill_subscript_location == 'top-right') {
+                    location += `top: ${ top_or_bottom_spacing * 2 }rpx;right:${ left_or_right_spacing * 2 }rpx;`;
+                } else if (seckill_subscript_location == 'bottom-left') {
+                    location += `bottom: ${ top_or_bottom_spacing * 2 }rpx;left: ${ left_or_right_spacing * 2 }rpx;`;
+                } else if (seckill_subscript_location == 'bottom-center') {
+                    location += 'bottom: 0;left: 50%;transform: translateX(-50%);';
+                } else if (seckill_subscript_location == 'bottom-right') {
+                    location += `bottom: ${ top_or_bottom_spacing * 2 }rpx;right: ${ left_or_right_spacing * 2 }rpx;`;
+                }
+                return location;
+            },
+        },
+    };
+</script>
+
+<style>
+.corner-marker {
+    position: absolute;
+    max-width: 100%;
+}
+</style>
diff --git a/components/diy/modules/tabs-view.vue b/components/diy/modules/tabs-view.vue
new file mode 100644
index 0000000..06631b3
--- /dev/null
+++ b/components/diy/modules/tabs-view.vue
@@ -0,0 +1,592 @@
+<template>
+    <!--  66rpx是自定义顶部导航栏的高度-->
+    <view class="tabs-view" :style="tabs_sticky">
+        <view class="tabs-view" :style="propStyle + propTabsBackground">
+            <view class="pr" :style="propsTabsContainer">
+                <view v-if="propIsRotatingBackground" class="pa top-0 wh-auto ht-auto" :style="propBgImgStyle"></view>
+                <view class="flex-row gap-10 jc-sb align-c" :style="propsTabsImgContainer">
+                    <view class="tabs flex-1 flex-width">
+                        <scroll-view :scroll-x="true" :show-scrollbar="false" :scroll-with-animation="tabs_list_is_sliding_fixed" :scroll-left="scroll_left" :class="'wh-auto interior-area-' + propKey">
+                            <view :class="'flex-row ' + flex_class" :style="'height:' + tabs_height + ';width:' + tabs_scroll_width + 'px;'">
+                                <view v-for="(item, index) in tabs_list" :key="index" :class="'item nowrap flex-col jc-c align-c gap-4 scroll-item-' + propKey + ' ' + tabs_theme + (index == active_index ? ' active' : '') + ((tabs_theme_index == '0' && tabs_theme_1_style) || tabs_theme_index == '1' || tabs_theme_index == '2' ? ' pb-0' : '')" :style="'flex:0 0 auto;padding-left:' + (index == 0 ? '0' : tabs_spacing) + 'rpx;padding-right:' + (index + 1 == tabs_list.length ? '0' : tabs_spacing) + 'rpx;' + get_item_style(item.is_sliding_fixed)" :data-index="index" @tap="handle_event">
+                                    <view class="nowrap ma-auto">
+                                        <view v-if="tabs_theme_index == '4'" :class="'img oh pr z-i-deep ' + (!isEmpty(item.img) ? 'img-no-empty' : '')" :style="tabs_theme_style.tabs_top_img">
+                                            <imageEmpty :propImageSrc="item.img[0]" propImgFit="aspectFit" propErrorStyle="width: 20rpx;height: 20rpx;"></imageEmpty>
+                                            <!-- <image :src="item.img[0].url" class="img" mode="aspectFit" /> -->
+                                        </view>
+                                        <template v-if="item.tabs_type == '1'">
+                                            <template v-if="!isEmpty(item.tabs_icon)">
+                                                <view :class="tabs_theme_index == '4' ? 'title pr z-i' : 'title pr z-i-deep'" :style="(tabs_theme_index == '4' ? tabs_sign_spacing : '') + (index == active_index ? (['2', '4'].includes(tabs_theme_index) ? tabs_check : '') :  '' + tabs_padding_bottom)">
+                                                    <iconfont :name="'icon-' + item.tabs_icon" :color="index == active_index ? tabs_icon_checked_color : tabs_icon_color" propContainerDisplay="flex" :size="index == active_index ? tabs_icon_checked_size : tabs_icon_size"></iconfont>
+                                                </view>
+                                            </template>
+                                            <template v-else>
+                                                <view :class="tabs_theme_index == '4' ? 'title pr z-i' : 'title pr z-i-deep'" :style="(tabs_theme_index == '4' ? tabs_sign_spacing : '') + index == active_index ? new_style.is_tabs_img_background == '1' && ['2', '4'].includes(tabs_theme_index) ? tabs_check : '' : tabs_padding_bottom">
+                                                    <imageEmpty :propImageSrc="item.tabs_img[0]" :propStyle="index == active_index ? tabs_theme_style.tabs_img_checked : tabs_theme_style.tabs_img" propImgFit="heightFix" propErrorStyle="width: 40rpx;height: 40rpx;"></imageEmpty>
+                                                </view>
+                                            </template>
+                                        </template>
+                                        <template v-else>
+                                            <view :class="tabs_theme_index == '4' ? 'title pr z-i' : 'title pr z-i-deep'" :style="(tabs_theme_index == '4' ? tabs_sign_spacing : '') + (index == active_index ? ['2', '4'].includes(tabs_theme_index) ? tabs_theme_style.tabs_title_checked + tabs_check : tabs_theme_style.tabs_title_checked : tabs_theme_style.tabs_title + tabs_padding_bottom)">{{ item.title }}</view>
+                                        </template>
+                                        <view class="desc pr z-i wh-auto" :style="tabs_sign_spacing + (tabs_theme_index == '1' && index == active_index ? tabs_check : '')">{{ item.desc }}</view>
+                                        <template v-if="tabs_theme_index == '3' && index == active_index">
+                                            <template v-if="!isEmpty(form.tabs_adorn_icon)">
+                                                <view class="icon pr z-i wh-auto flex-row jc-c align-c" :style="tabs_sign_spacing">
+                                                    <iconfont :name="'icon-' + form.tabs_adorn_icon" :style="icon_tabs_check" propContainerDisplay="flex" :size="tabs_adorn_icon_size"></iconfont>
+                                                </view>
+                                            </template>
+                                            <template v-else>
+                                                <view class="pr z-i wh-auto flex-row jc-c align-c ma-auto" :style="tabs_sign_spacing">
+                                                    <imageEmpty :propImageSrc="form.tabs_adorn_img[0]" :propStyle="tabs_adorn_img_style" propImgFit="aspectFit" propErrorStyle="width: 20rpx;height: 20rpx;"></imageEmpty>
+                                                </view>
+                                            </template>
+                                        </template>
+                                        <view class="bottom_line z-i" :class="tabs_bottom_line_theme" :style="tabs_check + tabs_sign_spacing"></view>
+                                    </view>
+                                </view>
+                            </view>
+                        </scroll-view>
+                    </view>
+                    <view v-if="propIsTabsIcon && form.show_more !== '0'" :style="tabs_padding_bottom">
+                        <iconfont :name="'icon-' + icon.more_icon_class || 'category-more'" :size="icon.more_icon_size + '' || '14'" :color="icon.more_icon_color || '#000'" propContainerDisplay="flex" @click="category_check_event"></iconfont>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <!-- 选项卡更多弹窗 -->
+        <componentPopup :propShow="popup_status" :propIsBar="propIsBar" propPosition="top" :propMask="true" :propTop="newPropTop" :propStyle="newPropStyle" @onclose="quick_close_event">
+            <view :class="'padding-bottom-lg ' + (['toutiao', 'app', 'h5'].includes(platform) ? 'padding-top-lg' : 'padding-top')">
+                <view class="padding-left-main padding-bottom-main">全部选项卡</view>
+                <view class="divider-b">
+                    <view class="nav-list-more">
+                        <view class="flex-row flex-wrap align-c">
+                            <view v-for="(item, index) in tabs_list" :key="index" class="item tc cr-base cp text-size-xs" :data-index="index" @tap="handle_event">
+                                <view class="dis-inline-block padding-vertical-xs padding-horizontal round" :class="active_index == index ? 'bg-main border-color-main cr-white' : ''">
+                                    {{ item.title }}
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <view class="tc padding-top-lg flex-row jc-c align-c" @tap="quick_close_event">
+                    <text class="padding-right-sm">{{ $t('nav-more.nav-more.h9g4b1') }}</text>
+                    <iconfont name="icon-arrow-top" color="#ccc" propContainerDisplay="flex"></iconfont>
+                </view>
+            </view>
+        </componentPopup>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import { gradient_computer, isEmpty, radius_computer } from '@/common/js/common/common.js';
+    import componentPopup from '@/components/popup/popup';
+    import imageEmpty from '@/components/diy/modules/image-empty.vue';
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        components: {
+            componentPopup,
+            imageEmpty,
+        },
+        props: {
+            propValue: {
+                type: Object,
+                default: () => {},
+            },
+            // 是否需要icon
+            propIsTabsIcon: {
+                type: Boolean,
+                default: false,
+            },
+            // 是否需要粘性定位置顶
+            propIsTop: {
+                type: Boolean,
+                default: false,
+            },
+            // 指定样式
+            propStyle: {
+                type: String,
+                default: '',
+            },
+            // 层级
+            propZIndex: {
+                type: Number,
+                default: 11,
+            },
+            // 自定义导航栏高度
+            propCustomNavHeight: {
+                type: String,
+                default: '66rpx',
+            },
+            // tabs背景色
+            propTabsBackground: {
+                type: String,
+                default: 'transparent',
+            },
+            // 置顶距离顶部高度
+            propTop: {
+                type: [String, Number],
+                default: '0',
+            },
+            propsTabsContainer: {
+                type: String,
+                default: ''
+            },
+            propsTabsImgContainer: {
+                type: String,
+                default: '',
+            },
+            propIsRotatingBackground: {
+                type: Boolean,
+                default: false,
+            },
+            propBgImgStyle: {
+                type: String,
+                default: '',
+            },
+            propKey: {
+                type: [String, Number],
+                default: '',
+            },
+            propTabsSlidingFixedBg: {
+                type: String,
+                default: ''
+            }
+        },
+        data() {
+            return {
+                form: {},
+                new_style: {},
+                tabs_theme_index: '',
+                tabs_theme: '',
+                tabs_check: '',
+                icon_tabs_check: '',
+                tabs_spacing: '',
+                tabs_sign_spacing: '',
+                tabs_padding_bottom: '',
+                tabs_list: [],
+                active_index: 0,
+                tabs_theme_style: {
+                    tabs_title_checked: '',
+                    tabs_title: '',
+                    tabs_img_checked: '',
+                    tabs_img: '',
+                    tabs_top_img: ''
+                },
+                tabs_icon_checked_size: '',
+                tabs_icon_size: '',
+                tabs_icon_checked_color: '',
+                tabs_icon_color: '',
+                icon: {
+                    more_icon_class: '',
+                    more_icon_size: '',
+                    more_icon_color: '',
+                },
+                // 过滤弹窗
+                popup_status: false,
+                propIsBar: false,
+                tabs_bottom_line_theme: '',
+                tabs_sticky: '',
+                tabs_height: '100%',
+                tabs_adorn_img_style: '',
+                tabs_width: 0,
+                tabs_scroll_width: 0,
+                // #ifdef MP
+                sticky_top: bar_height,
+                // #endif
+                // #ifdef H5 || MP-TOUTIAO
+                sticky_top: bar_height,
+                // #endif
+                // #ifdef APP
+                sticky_top: bar_height,
+                // #endif
+                newPropTop: '',
+                newPropStyle: '',
+                platform: app.globalData.application_client_type(),
+                is_out_of_range: false,
+                tabs_list_is_sliding_fixed: true,
+                scroll_left: 0,
+                tabs_adorn_icon_size: '0rpx',
+                // 默认数据
+                old_radius: { radius: 0, radius_top_left: 0, radius_top_right: 0, radius_bottom_left: 0, radius_bottom_right: 0 },
+                old_padding: { padding: 0, padding_top: 0, padding_bottom: 0, padding_left: 0, padding_right: 0 },
+                old_margin: { margin: 0, margin_top: 10, margin_bottom: 0, margin_left: 0, margin_right: 0 },
+            };
+        },
+        computed: {
+            flex_class() {
+                if (this.is_out_of_range) {
+                    return this.form.justification == 'center' ? 'jc-c' : this.form.justification == 'right' ? 'jc-e': '';
+                } else {
+                    return '';
+                }
+            },
+            get_item_style() {
+                return (val) => {
+                    return val == '1' ? `${ this.propTabsSlidingFixedBg };position: sticky;left: 0;z-index: 11;` : ''
+                }
+            }
+        },
+        watch: {
+            propValue() {
+                this.init();
+            },
+            propIsTop: {
+                deep: true,
+                immediate: true,
+                handler(new_val) {
+                    if (new_val) {
+                        this.tabs_sticky = 'position: sticky;top: calc(' + parseInt(this.propTop) + 'px + ' + this.propCustomNavHeight + ');z-index: ' + this.propZIndex + ';';
+                    } else {
+                        this.tabs_sticky = '';
+                    }
+                },
+            },
+            propTop(new_val, old_val) {
+                if (this.propIsTop) {
+                    this.tabs_sticky = 'position: sticky;top: calc(' + parseInt(this.propTop) + 'px + ' + this.propCustomNavHeight + ');z-index: ' + this.propZIndex + ';';
+                } else {
+                    this.tabs_sticky = '';
+                }
+            },
+        },
+        mounted() {
+            this.init();
+        },
+        methods: {
+            // 判断是否为空
+            isEmpty,
+            // 初始化数据
+            init() {
+                const new_content = this.propValue.content || {};
+                const new_style = this.propValue.style || {};
+                const new_tabs_check = this.tabs_check_computer(new_style);
+                const new_icon = {
+                    more_icon_class: new_style.more_icon_class,
+                    more_icon_size: new_style.more_icon_size,
+                    more_icon_color: new_style.more_icon_color,
+                };
+                const tabs_top_img_height = new_style?.tabs_top_img_height || 39;
+                const tabs_top_img_radius = new_style?.tabs_top_img_radius || { radius: 100, radius_top_left: 100, radius_top_right: 100, radius_bottom_left: 100, radius_bottom_right: 100}
+                // 标题样式
+                const new_tabs_theme_style = {
+                    tabs_title_checked: `font-weight: ${new_style.tabs_weight_checked};font-size: ${new_style.tabs_size_checked * 2}rpx;line-height: ${new_style.tabs_size_checked * 2}rpx;color:${new_style.tabs_color_checked};`,
+                    tabs_title: `font-weight: ${new_style.tabs_weight};font-size: ${new_style.tabs_size * 2}rpx;line-height: ${new_style.tabs_size * 2}rpx;color:${new_style.tabs_color};`,
+                    tabs_img_checked: `height: ${(new_style?.tabs_img_height || 0) * 2}rpx;` + radius_computer(new_style?.tabs_img_radius || this.old_radius),
+                    tabs_img: `height: ${(new_style?.tabs_img_height || 0) * 2}rpx;` + radius_computer(new_style?.tabs_img_radius || this.old_radius),
+                    tabs_top_img: `height: ${tabs_top_img_height * 2 }rpx;width: ${tabs_top_img_height * 2 }rpx;box-sizing: border-box;` + radius_computer(tabs_top_img_radius),
+                };
+                const { tabs_size_checked, tabs_size, tabs_icon_size_checked = 0, tabs_icon_size = 0, tabs_img_height = 0, tabs_sign_spacing = 0 } = new_style || {};
+                let default_height = 0;
+                if (new_content.tabs_theme == '2') {
+                    default_height = 12; // 选中的时候,风格二的内间距
+                } else if (new_content.tabs_theme == '4') {
+                    // const top_index = new_content?.tabs_list?.findIndex((item) => !isEmpty(item.img)) ?? -1;
+                    // default_height = 4 + (top_index > -1 ? tabs_top_img_height + tabs_sign_spacing : 0); // 选中的时候,风格二的内间距 加上上边图片的大小和上边图片之间的间距
+                    default_height = 4 + tabs_top_img_height + tabs_sign_spacing;
+                }
+                // 筛选出所有的icon
+                const is_icon = new_content?.tabs_list?.findIndex((item) => item.tabs_type === '1' && !isEmpty(item.tabs_icon)) ?? -1;
+                // 如果有icon，则取选中的icon大小和未选中的icon大小取最大值，作为图标的高度
+                let icon_height = 0;
+                if (is_icon > -1) {
+                    icon_height = Math.max(tabs_icon_size_checked + default_height, tabs_icon_size);
+                }
+                // 筛选出所有的图片, 没有选择图标的时候默认是图片
+                const is_img = new_content?.tabs_list?.findIndex((item) => item.tabs_type === '1' && isEmpty(item.tabs_icon)) ?? -1;
+                // 选项卡高度 五个值，作为判断依据，因为图片没有未选中的大小设置，所以高度判断的时候只取选中的高度, 其余的icon和标题都分别取选中和未选中的大小对比，取出最大的值，作为选项卡的高度，避免选项卡切换时会出现抖动问题
+                const height = Math.max(tabs_size_checked + default_height, tabs_size, icon_height, is_img > -1 ? (tabs_img_height + default_height) : '');
+                const findIndex = new_content.tabs_list.findIndex(item => item.is_sliding_fixed == '1');
+                // 参数设置
+                this.setData({
+                    form: new_content,
+                    tabs_list_is_sliding_fixed: findIndex == -1,
+                    newPropTop: `calc(${ this.sticky_top * 2}rpx);`,
+                    newPropStyle: `padding-top: ${ this.sticky_top * 2 }rpx;margin-top: -${ this.sticky_top * 2 }rpx;`,
+                    new_style: new_style,
+                    tabs_spacing: Number(new_style.tabs_spacing),
+                    tabs_sign_spacing: !isEmpty(new_style.tabs_sign_spacing) ? `margin-top: ${new_style.tabs_sign_spacing * 2}rpx;` : 'margin-top: 8rpx;',
+                    tabs_list: new_content.tabs_list,
+                    tabs_padding_bottom: this.get_padding_bottom(new_content, new_style) + 'z-index: 11;',
+                    // 选项卡主题
+                    tabs_theme: this.get_tabs_theme(new_content),
+                    tabs_theme_index: new_content.tabs_theme,
+                    // 选项卡样式
+                    tabs_check: new_tabs_check,
+                    icon_tabs_check: `${new_tabs_check};line-height: 1;background-clip: text;-webkit-background-clip: text;-webkit-text-fill-color: transparent;`,
+                    icon: new_icon,
+                    tabs_icon_checked_size: (new_style?.tabs_icon_size_checked || 0) * 2 + 'rpx',
+                    tabs_icon_size: (new_style?.tabs_icon_size || 0) * 2 + 'rpx',
+                    tabs_icon_checked_color: new_style?.tabs_icon_color_checked || '',
+                    tabs_icon_color: new_style?.tabs_icon_color || '',
+                    tabs_theme_style: new_tabs_theme_style,
+                    tabs_bottom_line_theme: new_style.tabs_one_theme == '1' ? 'tabs-bottom-line-theme' : '',
+                    tabs_theme_1_style: new_style.tabs_one_theme == '1',
+                    tabs_height: ['2', '4'].includes(new_content.tabs_theme) ? height * 2 + 'rpx' : '100%;',
+                    tabs_adorn_img_style: this.get_tabs_adorn_img_style(new_style),
+                    tabs_adorn_icon_size: (new_style?.tabs_adorn_icon_size || 0) * 2 + 'rpx',
+                });
+                // 只有居中居右的才重新获取dom判断
+                // if (['center', 'right'].includes(this.form.justification)) {
+                setTimeout(() => {
+                    const query = uni.createSelectorQuery().in(this);
+                    query.select('.interior-area-' + this.propKey)
+                        .fields({ size: true, scrollOffset: true},(res) => {
+                            if ((res || null) != null) {
+                                const { scrollWidth, width } = res;
+                                this.setData({
+                                    is_out_of_range: scrollWidth <= width,
+                                    tabs_scroll_width: scrollWidth,
+                                    tabs_width: width
+                                });
+                            }
+                        })
+                        .exec();
+                }, 0)
+                // }
+            },
+            get_tabs_adorn_img_style(new_style) {
+                return radius_computer(new_style?.tabs_adorn_img_radius || this.old_radius) + `height: ${(new_style?.tabs_adorn_img_height || 10) * 2}rpx;${ new_style.is_tabs_adorn_img_background == '1' ? tabs_check.value : ''}`;
+            },
+            // 获取选项卡主题
+            get_tabs_theme(data) {
+                let arr = {
+                    1: 'tabs-style-2',
+                    2: 'tabs-style-3',
+                    3: 'tabs-style-4',
+                    4: 'tabs-style-5',
+                };
+                let value = arr[data.tabs_theme];
+                return value === undefined ? 'tabs-style-1' : value;
+            },
+            get_padding_bottom(form, new_style) {
+                let bottom = 0;
+                if (form.tabs_theme == '0') {
+                    if (new_style.tabs_one_theme == '1') {
+                        bottom = 6;
+                    } else {
+                        bottom = 3;
+                    }
+                } else if (form.tabs_theme == '3') {
+                    bottom = !isEmpty(form.tabs_adorn_icon) ? new_style.tabs_adorn_icon_size : new_style.tabs_adorn_img_height;
+                }
+                const tabs_sign_spacing = !isEmpty(new_style.tabs_sign_spacing) ? new_style.tabs_sign_spacing : 4;
+                return ['1', '2', '4'].includes(form.tabs_theme) ? '' : `padding-bottom: ${(tabs_sign_spacing + bottom) * 2 }rpx;`;
+            },
+            // 选中的背景渐变色样式
+            tabs_check_computer(data) {
+                const new_gradient_params = {
+                    color_list: data.tabs_checked,
+                    direction: data.tabs_direction,
+                };
+                return gradient_computer(new_gradient_params);
+            },
+
+            // 事件
+            // tabs切换事件
+            handle_event(e) {
+                const index = e.currentTarget.dataset.index;
+                const tabs_list_item = this.tabs_list[index];
+                this.setData({
+                    active_index: index,
+                    popup_status: false,
+                });
+                this.set_scoll_left(index);
+                this.$emit('onTabsTap', index, tabs_list_item);
+                setTimeout(() => {
+                    this.$emit('tabsZindex', 11)
+                }, 200)
+            },
+            // 将选中的内容定位到中间
+            set_scoll_left(index) {
+                const query = uni.createSelectorQuery().in(this);
+                query.selectAll(`.scroll-item-` + this.propKey)
+                .boundingClientRect((rect) => {
+                    const tabs_index = this.form.tabs_list.findIndex(item => item.is_sliding_fixed == '1');
+                    // 如果第一个悬浮了，就取第二个的left加上 第一个的宽度和left
+                    let new_width = tabs_index == 0 && index != 0 ? rect[1].left - rect[0].width - rect[0].left : rect[0].left;
+                    // 如果悬浮的不是第一个并且选中的是悬浮的内容
+                    if (index > 0 && tabs_index == index) {
+                        new_width = rect[0].left - rect[index + 1].left + rect[index].width; 
+                    }
+                    const scrollLeft =
+                        rect[index].left +
+                        rect[index].width / 2 -
+                        this.tabs_width / 2 -
+                        new_width
+                    this.setData({
+                        scroll_left: scrollLeft,
+                    });
+                })
+                .exec();
+            },
+            // 分类选择事件
+            category_check_event() {
+                this.setData({
+                    popup_status: true,
+                });
+                setTimeout(() => {
+                    this.$emit('tabsZindex', 13)
+                }, 0)
+            },
+            // 关闭分类选择事件
+            quick_close_event(e) {
+                this.setData({
+                    popup_status: false,
+                });
+                setTimeout(() => {
+                    this.$emit('tabsZindex', 11)
+                }, 200)
+            },
+        },
+    };
+</script>
+<style lang="scss" scoped>
+    .tabs {
+        .item {
+            // padding: 0 0 10rpx 0;
+            position: relative;
+            &:first-of-type {
+                margin-left: 0;
+            }
+            &:last-of-type {
+                margin-right: 0;
+            }
+            .title {
+                font-size: 28rpx;
+                text-align: center;
+            }
+            .desc {
+                font-size: 22rpx;
+                color: #999;
+                text-align: center;
+                display: none;
+            }
+            .bottom_line {
+                width: 100%;
+                height: 6rpx;
+                border-radius: 20rpx;
+                background-color: red;
+                // position: absolute;
+                left: 0;
+                right: 0;
+                bottom: 0;
+                display: none;
+            }
+            .icon {
+                // position: absolute;
+                bottom: 0;
+                text-align: center;
+                font-size: 40rpx;
+                line-height: 20rpx !important;
+                display: none;
+            }
+            .img {
+                // width: 78rpx;
+                // height: 78rpx;
+                border-radius: 100%;
+                border: 2rpx solid transparent;
+                display: none;
+                margin: 0 auto;
+            }
+            &.tabs-style-1 {
+                &.active {
+                    .bottom_line {
+                        display: block;
+                    }
+                }
+                .tabs-bottom-line-theme {
+                    opacity: 0.6;
+                    bottom: 0;
+                    z-index: 0;
+                    height: 14rpx;
+                    border-radius: 0;
+                    // left: 12%;
+                }
+            }
+            &.tabs-style-2 {
+                &.active {
+                    .desc {
+                        background: #ff5e5e;
+                        color: #fff;
+                    }
+                }
+                .desc {
+                    border-radius: 40rpx;
+                    padding: 4rpx 12rpx;
+                    box-sizing: border-box;
+                    display: block;
+                }
+            }
+            &.tabs-style-3 {
+                &.active {
+                    .title {
+                        // background: #ff2222;
+                        border-radius: 40rpx;
+                        padding: 6px 12px;
+                        box-sizing: border-box;
+                        color: #fff;
+                    }
+                }
+            }
+            &.tabs-style-4 {
+                // padding-bottom: 28rpx;
+                &.active {
+                    .title {
+                        color: #ff2222;
+                    }
+                    .icon {
+                        color: #ff2222;
+                        display: flex;
+                    }
+                }
+            }
+            &.tabs-style-5 {
+                align-items: center;
+                &.active {
+                    .title {
+                        // font-size: 22rpx;
+                        // background: #ff5e5e;
+                        border-radius: 40rpx;
+                        padding: 2px 7px;
+                        box-sizing: border-box;
+                        // color: #fff;
+                    }
+                    .img {
+                        border-color: #ff5e5e;
+                    }
+                }
+                .img-no-empty {
+                    width: 100% !important;
+                }
+                .img {
+                    display: block;
+                }
+            }
+        }
+    }
+    .nav-list-more {
+        width: 100%;
+        max-height: 550rpx;
+        padding-bottom: 20rpx;
+        overflow-y: auto;
+    }
+    .nav-list-more .item {
+        width: 20%;
+        padding: 20rpx 0;
+    }
+    .pb-14 {
+        padding-bottom: 28rpx;
+    }
+    .pb-0 {
+        padding-bottom: 0 !important;
+    }
+    .ma-auto {
+        margin: auto;
+    }
+</style>
diff --git a/components/diy/nav-group.vue b/components/diy/nav-group.vue
new file mode 100644
index 0000000..0a902c2
--- /dev/null
+++ b/components/diy/nav-group.vue
@@ -0,0 +1,248 @@
+<template>
+    <view :style="style_container">
+        <view class="pr" :style="style_img_container">
+            <swiper class="swiper" circular="true" :autoplay="new_style.is_roll == '1'" :interval="new_style.interval_time * 1000" :duration="500" :display-multiple-items="slides_per_group" :style="{ height: new_height }" @change="slideChange">
+                <swiper-item v-for="(item, index) in nav_content_list" :key="index" class="swiper-item">
+                    <view class="banner-img flex-row flex-wrap wh-auto" :class="'banner-img-' + propKey" :style="space">
+                        <view v-for="(item1, index1) in item.split_list" :key="index1" class="flex-col gap-10 align-c" :style="group_width + nav_title_space" :data-value="item1.link.page" @tap="url_open_event">
+                            <view v-if="['image_with_text', 'image'].includes(nav_style)" class="flex-row align-c jc-c pr">
+                                <view class="top-img" :style="img_size">
+                                    <imageEmpty :propImageSrc="item1.img[0]" :propStyle="img_style" propErrorStyle="width: 60rpx;height: 60rpx;"></imageEmpty>
+                                </view>
+                                <!-- 角标 -->
+                                <subscriptIndex :propValue="item1.subscript" propType="nav-group"></subscriptIndex>
+                            </view>
+                            <view v-if="['image_with_text', 'text'].includes(nav_style)" class="wh-auto size-12 ma-0 nowrap oh tc" :style="text_style">{{ item1.title }}</view>
+                        </view>
+                    </view>
+                </swiper-item>
+            </swiper>
+            <view v-if="form.display_style == 'slide' && new_style.is_show == '1'" :class="['left', 'right'].includes(new_style.indicator_new_location) ? 'indicator_up_down_location' : 'indicator_about_location'" :style="indicator_location_style">
+                <block v-if="new_style.indicator_style == 'num'">
+                    <view :style="indicator_style" class="dot-item">
+                        <text :style="{ color: new_style.actived_color }">{{ actived_index + 1 }}</text>
+                        <text>/{{ nav_content_list.length }}</text>
+                    </view>
+                </block>
+                <block v-else>
+                    <view v-for="(item, index) in nav_content_list" :key="index" :style="indicator_style + (actived_index == index ? 'background:' + new_style.actived_color : '')" class="dot-item" />
+                </block>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+const app = getApp();
+import { isEmpty, common_styles_computer, common_img_computer, radius_computer, padding_computer, get_indicator_style, get_indicator_location_style } from '@/common/js/common/common.js';
+import imageEmpty from '@/components/diy/modules/image-empty.vue';
+import subscriptIndex from '@/components/diy/modules/subscript/index.vue';
+export default {
+    components: {
+        imageEmpty,
+        subscriptIndex,
+    },
+    props: {
+        propValue: {
+            type: Object,
+            default: () => {
+                return {};
+            },
+        },
+        propKey: {
+            type: [String, Number],
+            default: '',
+        },
+        // 组件渲染的下标
+        propIndex: {
+            type: Number,
+            default: 1000000,
+        },
+    },
+    data() {
+        return {
+            form: {},
+            new_style: {},
+            style_container: '',
+            style_img_container: '',
+            img_style: '',
+            text_style: '',
+            indicator_style: '',
+            new_height: '300rpx',
+            actived_index: 0,
+            group_width: '',
+            nav_content_list: [],
+            nav_title_space: 'row-gap:20rpx', // 导航标题间距
+            space: 'row-gap:20rpx', // 导航间距
+            img_size: '72rpx',
+            slides_per_group: 1,
+            indicator_location_style: '',
+            subscriptStyle: {
+                seckill_subscript_location: 'top-left',
+                text_or_icon_color: '#fff',
+                text_or_icon_size: 12,
+                img_width: 20,
+                img_height: 20,
+                direction: '90deg',
+                top_or_bottom_spacing: 0,
+                left_or_right_spacing: 0,
+                color_list: [{ color: '#FF7607', color_percentage: undefined }],
+                background_img_style: '2',
+                background_img: [],
+                margin: 0,
+                margin_top: 0,
+                margin_bottom: 0,
+                margin_left: 0,
+                margin_right: 0,
+                radius: 4,
+                radius_top_left: 4,
+                radius_top_right: 4,
+                radius_bottom_left: 4,
+                radius_bottom_right: 4,
+                padding: 0,
+                padding_top: 0,
+                padding_bottom: 0,
+                padding_left: 0,
+                padding_right: 0,
+                box_shadow_color: '',
+                box_shadow_x: 0,
+                box_shadow_y: 0,
+                box_shadow_blur: 0,
+                box_shadow_spread: 0,
+            }
+        };
+    },
+    watch: {
+        propKey(val) {
+            // 初始化
+            this.init();
+        },
+    },
+    mounted() {
+        this.init();
+    },
+    methods: {
+        init() {
+            const new_content = this.propValue.content;
+            const new_style = this.propValue.style;
+
+            let group = 1;
+            let group_width = `width: ${100 / (new_content.single_line || 4)}%;`;
+            // 判断是否是轮播图
+            if (new_content?.display_style == 'slide') {
+                if (new_content.row == 1 && new_style.rolling_fashion == 'translation') {
+                    group = new_content.single_line || 4;
+                    group_width = 'width: 100%;';
+                } else {
+                    group = 1;
+                    group_width = `width: ${100 / (new_content.single_line || 4)}%;`;
+                }
+            }
+
+            this.setData({
+                form: new_content,
+                new_style: new_style,
+                style_container: common_styles_computer(new_style.common_style), // 用于样式显示
+                style_img_container: common_img_computer(new_style.common_style, this.propIndex),
+                img_style: radius_computer(new_style), // 图片的设置
+                text_style: `font-size: ${new_style.title_size * 2 || 24}rpx; color: ${new_style.title_color || '#000'};`, // 标题的样式
+                indicator_style: get_indicator_style(new_style), // 指示器的样式
+                indicator_location_style: get_indicator_location_style(new_style), // 指示器位置处理
+                actived_color: new_style.actived_color || '#2A94FF', // 轮播图显示样式
+                slides_per_group: group, // 每个轮播图显示的个数
+                group_width: group_width, // 每个导航所占位置
+                nav_title_space: 'row-gap:' + (new_style.title_space || 0) * 2 + 'rpx', // 导航标题间距
+                space: 'row-gap:' + (new_style.space || 0) * 2 + 'rpx;' + padding_computer(new_style.data_padding), // 导航间距
+                img_size: 'width:' + (new_style.img_size || 0) * 2 + 'rpx;height:' + (new_style.img_size || 0) * 2 + 'rpx;', // 图片大小
+                nav_style: new_content.nav_style || 'image_with_text', // 是否显示文字和图片
+                nav_content_list: this.get_nav_content_list(new_content, new_style),
+            });
+            setTimeout(() => {
+                const query = uni.createSelectorQuery().in(this);
+                // 选择我们想要的元素
+                query
+                    .select('.banner-img-' + this.propKey)
+                    .boundingClientRect((res) => {
+                        if ((res || null) != null) {
+                            // data包含元素的宽度、高度等信息
+                            this.setData({
+                                new_height: res.height + 'px',
+                            });
+                        }
+                    })
+                    .exec(); // 执行查询
+            }, 50);
+        },
+        get_nav_content_list(data, new_style) {
+            // 深拷贝一下，确保不会出现问题
+            const list = JSON.parse(JSON.stringify(data.nav_content_list || Array(4))).map(item => ({
+                ...item,
+                // 角标配置
+                subscript: isEmpty(item.subscript) ?
+                    {
+                        content: {
+                            seckill_subscript_show: '0',
+                            subscript_type: 'text',
+                            subscript_img_src: [],
+                            subscript_icon_class: '',
+                            subscript_text: '',
+                        },
+                        style: this.subscriptStyle,
+                    } : item.subscript,
+            }));
+            // 如果是分页滑动情况下，根据选择的行数和每行显示的个数来区分具体是显示多少个
+            if (list.length > 0 && data.display_style == 'slide') {
+                // 存储数据显示
+                let nav_list = [];
+                if (data.row == 1 && new_style.rolling_fashion == 'translation') {
+                    // 拆分的数量
+                    list.forEach((item) => {
+                        nav_list.push({
+                            split_list: [item],
+                        });
+                    });
+                    return nav_list;
+                } else {
+                    // 每页显示的数量
+                    const num = (data.single_line || 4) * (data.row || 1);
+                    // 拆分的数量
+                    const split_num = Math.ceil(list.length / num);
+                    for (let i = 0; i < split_num; i++) {
+                        nav_list.push({
+                            split_list: list.slice(i * num, (i + 1) * num),
+                        });
+                    }
+                    return nav_list;
+                }
+            } else {
+                // 否则的话，就返回全部的信息
+                return [
+                    {
+                        split_list: list,
+                    },
+                ];
+            }
+        },
+        slideChange(e) {
+            this.setData({
+                actived_index: e.detail.current,
+            });
+        },
+        url_open_event(link) {
+            app.globalData.url_event(link);
+        },
+    },
+};
+</script>
+
+<style scoped lang="scss">
+.top-img {
+    height: 72rpx;
+    width: 72rpx;
+    border-radius: 8rpx;
+}
+
+.gap-x-10 {
+    row-gap: 20rpx;
+}
+</style>
diff --git a/components/diy/notice.vue b/components/diy/notice.vue
new file mode 100644
index 0000000..1eb52ef
--- /dev/null
+++ b/components/diy/notice.vue
@@ -0,0 +1,211 @@
+<template>
+    <!-- 公告 -->
+    <view :style="style_container">
+        <view :style="style_img_container">
+            <template v-if="form_content.notice_style == 'inherit'">
+                <view class="news-box" :style="container_background_style + container_height">
+                    <view class="flex-row align-c gap-8" :style="container_background_img_style">
+                        <template v-if="form_content.title_type == 'img-icon'">
+                            <view v-if="form_content.icon_class">
+                                <iconfont :name="'icon-' + form_content.icon_class" :size="form_style.icon_size * 2 + 'rpx'" :color="form_style.icon_color" propContainerDisplay="flex"></iconfont>
+                            </view>
+                            <view v-else>
+                                <image v-if="form_content.img_src.length > 0" :src="form_content.img_src[0].url" class="border-radius-sm dis-block" mode="aspectFill" :style="img_style"></image>
+                            </view>
+                        </template>
+                        <template v-else>
+                            <view :style="title_style" class="padding-horizontal-sm border-radius-sm">{{ form_content.title || '公告' }}</view>
+                        </template>
+                        <swiper class="swiper flex-1" circular :indicator-dots="false" :autoplay="true" :interval="interval_time" :vertical="direction_type == 'vertical'" :style="container_height">
+                            <swiper-item v-for="(item, index) in notice_list" :key="index">
+                                <view class="swiper-item flex-row align-c ht-auto" :style="content_title_style + 'color:' + form_style.news_color" :data-value="item.notice_link.page" @tap="url_event">
+                                    <view class="text-line-1">{{ item.notice_title }}</view>
+                                </view>
+                            </swiper-item>
+                        </swiper>
+                        <view v-if="form_content.is_right_button == '1'" class="flex-row align-c" :style="'color: ' + form_style.right_button_color + ';font-size:' + form_style.right_button_size * 2 + 'rpx;'" :data-value="form_content.more_link.page" @tap="url_event">
+                            {{ form_content.right_title }}
+                            <view class="pr">
+                                <iconfont name="icon-arrow-right" :color="form_style.right_button_color || '#999'" :size="form_style.right_button_size * 2 + 'rpx'"  propContainerDisplay="flex"></iconfont>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </template>
+            <template v-else>
+                <view class="news-card" :style="container_background_style">
+                    <view class="flex-col gap-10" :style="container_background_img_style">
+                        <view class="flex-row wh-auto jc-sb align-c">
+                            <template v-if="form_content.title_type == 'img-icon'">
+                                <template v-if="form_content.icon_class">
+                                    <iconfont :name="'icon-' + form_content.icon_class" :size="form_style.icon_size * 2 + 'rpx'" :color="form_style.icon_color" propContainerDisplay="flex"></iconfont>
+                                </template>
+                                <template v-else>
+                                    <image v-if="form_content.img_src.length > 0" :src="form_content.img_src[0].url" class="border-radius-sm dis-block" mode="aspectFill" :style="img_style"></image>
+                                </template>
+                            </template>
+                            <template v-else>
+                                <view :style="title_style" class="padding-horizontal-sm border-radius-sm">{{ form_content.title }}</view>
+                            </template>
+                            <view v-if="form_content.is_right_button == '1'" class="flex-row align-c" :style="'color: ' + form_style.right_button_color + ';font-size:' + form_style.right_button_size * 2 + 'rpx;'" :data-value="form_content.more_link.page" @tap="url_event">
+                                {{ form_content.right_title }}
+                                <view class="pr">
+                                    <iconfont name="icon-arrow-right" :color="form_style.right_button_color || '#999'" :size="form_style.right_button_size * 2 + 'rpx'" propContainerDisplay="flex"></iconfont>
+                                </view>
+                            </view>
+                        </view>
+                        <view v-for="(item, index) in notice_list" :key="index" class="flex-row" :style="content_title_style" :data-value="item.notice_link.page" @tap="url_event">
+                            <view class="num" :class="'one' + (index + 1)">{{ index + 1 }}</view>
+                            <view class="break" :style="'color:' + form_style.news_color">{{ item.notice_title }}</view>
+                        </view>
+                    </view>
+                </view>
+            </template>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import { background_computer, common_styles_computer, common_img_computer, gradient_computer, gradient_handle, radius_computer } from '@/common/js/common/common.js';
+    export default {
+        props: {
+            propValue: {
+                type: Object,
+                default: () => ({}),
+            },
+            propKey: {
+                type: [String,Number],
+                default: '',
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 1000000,
+            },
+        },
+        data() {
+            return {
+                form_content: {},
+                form_style: {},
+                style_container: '',
+                style_img_container: '',
+                // 容器高度
+                container_height: '',
+                // 容器背景
+                container_background_style: '',
+                // 图片设置
+                img_style: '',
+                // 标题的设置
+                title_style: '',
+                // 内容标题设置
+                content_title_style: '',
+                // 指示器的样式
+                // 轮播图定时显示
+                interval_time: 2000,
+                // 轮播图滚动方向 // vertical' | 'horizontal
+                direction_type: 'vertical',
+                // 记录当前显示的轮播图的数据
+                interval_list: {
+                    time: 2000,
+                    direction: 'vertical',
+                    notice_length: 1,
+                },
+                // 公告数据
+                notice_list: [],
+            };
+        },
+        watch: {
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        created() {
+            this.init();
+        },
+        methods: {
+            // 初始化数据
+            init() {
+                const new_content = this.propValue.content || {};
+                const new_style = this.propValue.style || {};
+                // 容器背景
+                const { container_color_list, container_direction, container_background_img_style, container_background_img } = new_style;
+                const temp_obj = {
+                    color_list: container_color_list,
+                    direction: container_direction,
+                    background_img: container_background_img,
+                    background_img_style: container_background_img_style,
+                };
+                const temp_container_background_style = gradient_computer(temp_obj) + radius_computer(new_style.container_radius) + `overflow:hidden;`;
+                const temp_container_background_img_style = background_computer(temp_obj);
+                // 标题渐变色处理
+                const gradient = gradient_handle(new_style.title_color_list, '90deg');
+                const time = (new_style.interval_time || 2) * 1000;
+                const direction = new_content.direction;
+                const new_notice_list = new_content.notice_list.filter((item) => item.is_show == '1');
+                // 判断长度是否相等
+                const notice_length = new_notice_list.length;
+                const new_interval_list = {
+                    time: time,
+                    direction: direction,
+                    notice_length: notice_length,
+                };
+                this.setData({
+                    form_content: new_content,
+                    form_style: new_style,
+                    container_height: 'height:' + new_style.container_height * 2 + 'rpx',
+                    container_background_style: temp_container_background_style,
+                    container_background_img_style: temp_container_background_img_style,
+                    img_style: `height: ${new_style.title_height * 2}rpx; width: ${new_style.title_width * 2}rpx`,
+                    title_style: `color:${new_style.title_color}; font-size: ${new_style.title_size * 2}rpx; font-weight: ${new_style.title_typeface}; ${gradient}`,
+                    content_title_style: `font-size: ${new_style.news_size * 2}rpx; font-weight: ${new_style.news_typeface};`,
+                    notice_list: new_notice_list,
+                    interval_time: time,
+                    direction_type: direction,
+                    interval_list: new_interval_list,
+                    style_container: common_styles_computer(new_style.common_style),
+                    style_img_container: common_img_computer(new_style.common_style, this.propIndex),
+                });
+            },
+            // 跳转链接
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+        },
+    };
+</script>
+
+<style lang="scss" scoped>
+    .news-box {
+        overflow: hidden;
+        padding: 0 20rpx;
+        background: #fff;
+    }
+    .news-card {
+        padding: 30rpx;
+        background: #fff;
+    }
+    .num {
+        padding-right: 14rpx;
+        color: #999;
+    }
+    .one1 {
+        color: #ea3323;
+    }
+    .one2 {
+        color: #ff7303;
+    }
+    .one3 {
+        color: #ffc300;
+    }
+    .two-style {
+        width: 48rpx;
+        height: 48rpx;
+    }
+    .break {
+        word-break: break-word;
+        overflow-wrap: break-word;
+        word-wrap: break-word;
+    }
+</style>
diff --git a/components/diy/rich-text.vue b/components/diy/rich-text.vue
new file mode 100644
index 0000000..3264df3
--- /dev/null
+++ b/components/diy/rich-text.vue
@@ -0,0 +1,73 @@
+<template>
+    <!-- 富文本 -->
+    <view class="diy-rich-text" :style="style_container">
+        <view :style="style_img_container">
+            <mp-html :content="content" />
+        </view>
+    </view>
+</template>
+
+<script>
+    import { common_styles_computer, common_img_computer } from '@/common/js/common/common.js';
+    export default {
+        props: {
+            propValue: {
+                type: Object,
+                default: () => ({}),
+            },
+            propKey: {
+                type: [String,Number],
+                default: '',
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 1000000,
+            },
+        },
+        data() {
+            return {
+                style_container: '',
+                style_img_container: '',
+                content: '',
+            };
+        },
+        watch: {
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        created() {
+            this.init();
+        },
+        methods: {
+            // 初始化数据
+            init() {
+                const new_content = this.propValue.content || {};
+                const new_style = this.propValue.style || {};
+                this.setData({
+                    content: new_content.html,
+                    style_container: common_styles_computer(new_style.common_style),
+                    style_img_container: common_img_computer(new_style.common_style, this.propIndex),
+                });
+            },
+        },
+    };
+</script>
+
+<style>
+    .diy-rich-text {
+        * {
+            max-width: 100%;
+        }
+        /* #ifdef H5 */
+        [id^=v] {
+            width: 100%;
+        }
+        /* #endif */
+    }
+    .diy-rich-text video {
+        width: 100%;
+    }
+</style>
diff --git a/components/diy/search.vue b/components/diy/search.vue
new file mode 100644
index 0000000..3d18f33
--- /dev/null
+++ b/components/diy/search.vue
@@ -0,0 +1,327 @@
+<template>
+    <view :style="style_container">
+        <view :style="style_img_container">
+            <view class="search wh-auto pr">
+                <view class="box oh flex-row align-c" :style="box_style">
+                    <view v-if="form.positioning_name_float == '1' && propSearchType == 'header'" :style="propLocationMargin">
+                        <component-choice-location propType="search" :propLocationContainerStyle="propLocationContainerStyle" :propLocationImgContainerStyle="propLocationImgContainerStyle" :propBaseColor="propBaseColor" :propTextDefaultName="form.positioning_name" :propIsLeftIconArrow="form.is_location_left_icon_show == '1'" :propLeftImgValue="form.location_left_img" :propLeftIconValue="'icon-' + form.location_left_icon" :propIconLocationSize="propIconLocationSize" :propIconArrowSize="propIconArrowSize" :propIsRightIconArrow="form.is_location_right_icon_show == '1'" :propRightImgValue="form.location_right_img" :propRightIconValue="'icon-' + form.location_right_icon" :propTextMaxWidth="['4'].includes(form.theme) ? '300rpx' : '200rpx'" propContainerDisplay="flex" @onBack.stop="choice_location_back"></component-choice-location>
+                    </view>
+                    <view :class="'oh flex-1 ht-auto flex-row align-c gap-10' + (form.is_center == '1' ? ' tips-float' : '')" @tap.stop="search_tap">
+                        <view v-if="form.is_icon_show == '1'" class="pr">
+                            <view class="search-icon-before" :style="(form.positioning_name_float == '1' && propSearchType == 'header') || form.is_center == '1' ? '' : 'left: -' + (new_style.search_padding_left ? new_style.search_padding_left * 2 : 30) + 'rpx;'" @tap.stop="search_icon_tap"></view>
+                            <view class="wh-auto ht-auto">
+                                <template v-if="form.icon_img.length > 0">
+                                    <view class="img-box">
+                                        <image :src="form.icon_img[0].url" class="img" mode="heightFix"></image>
+                                    </view>
+                                </template>
+                                <template v-else>
+                                    <view>
+                                        <iconfont :name="!isEmpty(form.icon_class) ? 'icon-' + form.icon_class : 'icon-search-max'" size="28rpx" :color="new_style.icon_color" propContainerDisplay="flex"></iconfont>
+                                    </view>
+                                </template>
+                            </view>
+                        </view>
+                        <view v-if="!isEmpty(form.hot_word_list) && form.is_hot_word_show == '1'" :style="form.is_center == '1' ? `min-width:100px;` : 'width:100%;'">
+                            <swiper circular="true" :autoplay="new_style.is_roll == '1'" :interval="new_style.interval_time * 1000" :vertical="true" :duration="500" class="swiper_style" @change="slideChange">
+                                <swiper-item v-for="(item, index) in form.hot_word_list" :key="index">
+                                    <view class="flex-row align-c wh-auto ht-auto" :style="{ color: !isEmpty(item.color) ? item.color : !isEmpty(new_style.hot_words_color) ? new_style.hot_words_color : '#999' }" :data-value="item.value" @tap.stop="serch_event">
+                                        {{ item.value }}
+                                    </view>
+                                </swiper-item>
+                            </swiper>
+                        </view>
+                        <template v-else>
+                            <text v-if="form.is_tips_show == '1'" :class="[propIsPageSettings ? 'text-size-xs text-line-1' : 'text-size-md text-line-1']" :style="'color:' + new_style.tips_color">{{ form.tips }}</text>
+                        </template>
+                    </view>
+                </view>
+                <view class="flex-row align-c pa search-outer-botton oh" :style="right_icon_style">
+                    <view v-if="form.is_right_icon_show == '1' && (form.right_icon_img.length > 0 || !isEmpty(form.right_icon_class))" class="pr margin-right-main">
+                        <view class="search-icon-before" @tap.stop="search_right_icon_tap"></view>
+                        <view class="wh-auto ht-auto">
+                            <template v-if="form.right_icon_img.length > 0">
+                                <view class="img-box right_icon_height flex-row align-c">
+                                    <image :src="form.right_icon_img[0].url" class="img" mode="heightFix"></image>
+                                </view>
+                            </template>
+                            <template v-else>
+                                <view class="right_icon_height flex-row align-c">
+                                    <iconfont :name="!isEmpty(form.right_icon_class) ? 'icon-' + form.right_icon_class : 'icon-search-max'" size="28rpx" :color="new_style.right_icon_color" propContainerDisplay="flex"></iconfont>
+                                </view>
+                            </template>
+                        </view>
+                    </view>
+                    <view v-if="form.is_search_show == '1'" class="flex-row align-c jc-c">
+                        <view class="search-botton flex-row align-c jc-c z-i" :style="search_button_style" @tap.stop="serch_button_event">
+                            <view class="oh" :style="search_button_img_style">
+                                <template v-if="form.search_type === 'text'">
+                                    <view class="text-size-xs">{{ form.search_tips }}</view>
+                                </template>
+                                <template v-else-if="!isEmpty(form.search_botton_img) && form.search_botton_img.length > 0">
+                                    <image :src="form.search_botton_img[0].url" class="img" :style="search_button_height" mode="heightFix"></image>
+                                </template>
+                                <template v-else>
+                                    <view class="text-size-xs">
+                                        <iconfont :name="!isEmpty(form.search_botton_icon) ? 'icon-' + form.search_botton_icon : ''" size="28rpx" propContainerDisplay="flex"></iconfont>
+                                    </view>
+                                </template>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import componentChoiceLocation from '@/components/choice-location/choice-location';
+const app = getApp();
+import { background_computer, common_styles_computer, common_img_computer, gradient_computer, radius_computer, isEmpty, padding_computer, old_padding, old_radius, margin_computer } from '@/common/js/common/common.js';
+export default {
+    components: {
+        componentChoiceLocation,
+    },
+    props: {
+        propValue: {
+            type: Object,
+            default: () => {
+                return {};
+            },
+        },
+        propIsPageSettings: {
+            type: Boolean,
+            default: false,
+        },
+        propKey: {
+            type: [String,Number],
+            default: '',
+        },
+        // 组件渲染的下标
+        propIndex: {
+            type: Number,
+            default: 1000000,
+        },
+        propSearchType: {
+            type: String,
+            default: 'search',
+        },
+        propBaseColor: {
+            type: String,
+            default: '',
+        },
+        propLocationMargin: {
+            type: String,
+            default: '',
+        },
+        propLocationContainerStyle: {
+            type: String,
+            default: '',
+        },
+        propLocationImgContainerStyle: {
+            type: String,
+            default: '',
+        },
+        propIconLocationSize: {
+            type: String,
+            default: '',
+        },
+        propIconArrowSize: {
+            type: String,
+            default: '',
+        },
+    },
+    data() {
+        return {
+            search_content: '',
+            form: {},
+            new_style: {},
+            style: '',
+            style_container: '',
+            style_img_container: '',
+            search_button_radius: '',
+            box_style: '',
+            keywords: '',
+            right_icon_style: '',
+            search_button_style: '',
+            search_button_img_style: '',
+            search_button_height: '',
+            button_padding: { padding: 0, padding_bottom: 3, padding_left: 12, padding_right: 12, padding_top: 3 },
+            button_margin: { margin: 0, margin_bottom: 2, margin_left: 0, margin_right: 2, margin_top: 2 },
+        };
+    },
+    watch: {
+        propKey(val) {
+            // 初始化
+            this.init();
+        },
+    },
+    created() {
+        this.init();
+    },
+    methods: {
+        isEmpty,
+        init() {
+            const new_form = this.propValue.content;
+            const new_style = this.propValue.style;
+            const { search_button_radius, common_style } = new_style;
+            this.setData({
+                form: new_form,
+                new_style: new_style,
+                search_button_img_style: this.get_search_button_img_style(new_style),
+                search_button_height: this.get_search_button_height(new_style),
+                // style: this.get_style(new_style), // 内部样式
+                style_container: this.propIsPageSettings ? '' : common_styles_computer(common_style), // 全局样式
+                style_img_container: this.propIsPageSettings ? '' : common_img_computer(common_style, this.propIndex),
+                search_button_radius: radius_computer(search_button_radius), // 按钮圆角
+                box_style: this.get_box_style(new_style, new_form), // 搜索框设置
+                search_box_style: `border: 2rpx solid ${new_style.search_border == '#fff' ? '#eee' : new_style.search_border};`,
+                search_button_style: this.get_search_button_style(new_form, new_style), // 搜索按钮显示
+                right_icon_style: `border-radius: 0px ${ new_style.search_border_radius?.radius_top_right * 2 || 0 }rpx ${ new_style.search_border_radius?.radius_bottom_right * 2 || 0 }rpx 0px;`,
+            });
+        },
+        get_search_button_style(form, new_style) {
+            const { search_botton_color_list = [], search_botton_direction, search_botton_background_img_style, search_button_radius = old_radius, search_botton_background_img, search_botton_margin = this.button_margin, search_botton_border_show = '0', search_botton_border_size = old_padding, search_botton_border_style = 'solid', search_botton_border_color = '' } = new_style;
+            let style = radius_computer(search_button_radius);
+            if (form.search_type != 'img') {
+                const data = {
+                    color_list: search_botton_color_list,
+                    direction: search_botton_direction,
+                    background_img: search_botton_background_img,
+                    background_img_style: search_botton_background_img_style,
+                }
+                style += gradient_computer(data) + margin_computer(search_botton_margin) + `color: ${ new_style.button_inner_color };`;
+            }
+            let border = ``;
+            if (search_botton_border_show == '1') {
+                border += `border-width: ${search_botton_border_size.padding_top * 2}rpx ${search_botton_border_size.padding_right * 2}rpx ${search_botton_border_size.padding_bottom * 2}rpx ${search_botton_border_size.padding_left * 2}rpx;border-style: ${ search_botton_border_style };border-color: ${search_botton_border_color};`
+            }
+            const height = 32 - search_botton_margin.margin_top - search_botton_margin.margin_bottom - search_botton_border_size.padding_top - search_botton_border_size.padding_bottom;
+            return style + border + `height: ${height > 0 ? height * 2 : 0}rpx;line-height: ${height > 0 ? height * 2 : 0}rpx;`;
+        },
+        get_search_button_height(new_style) {
+            const { search_botton_border_size = old_padding, search_botton_padding = this.button_padding } = new_style;
+            const height = 32 - search_botton_border_size.padding_top - search_botton_border_size.padding_bottom - search_botton_padding.padding_top - search_botton_padding.padding_bottom;
+            return `height: ${height > 0 ? height * 2 : 0}rpx !important;line-height: ${height > 0 ? height * 2 : 0}rpx;`;
+        },
+        // 搜索按钮圆角
+        get_search_button_img_style(new_style) {
+            const { search_botton_background_img_style, search_botton_background_img } = new_style;
+            const data = {
+                background_img: search_botton_background_img,
+                background_img_style: search_botton_background_img_style,
+            }
+            return background_computer(data) + padding_computer(new_style?.search_botton_padding || this.button_padding) + 'box-sizing: border-box;';
+        },
+        // get_style(new_style) {
+        //     let common_styles = '';
+        //     if (new_style.text_style == 'italic') {
+        //         common_styles += `font-style: italic`;
+        //     } else if (new_style.text_style == '500') {
+        //         common_styles += `font-weight: 500`;
+        //     }
+        //     return common_styles;
+        // },
+        get_box_style(new_style, form) {
+            let style = `background: ${ new_style?.search_bg_color || '' };border: 2rpx solid ${new_style.search_border}; ${radius_computer(new_style.search_border_radius)};box-sizing: border-box;`;
+            if (form.positioning_name_float == '1' && this.propSearchType == 'header') {
+                style += `padding-left: ${ (new_style.search_padding_left? new_style.search_padding_left : 15) * 2 }rpx;`;
+            } else if (form.is_center != '1') {
+                style += `padding-left: ${ (new_style.search_padding_left ? new_style.search_padding_left : 15) * 2 }rpx;`;
+            }
+            return style;
+        },
+        search_tap() {
+            app.globalData.url_open('/pages/goods-search-start/goods-search-start?keywords=' + this.keywords);
+        },
+        serch_event() {
+            app.globalData.url_open('/pages/goods-search-start/goods-search-start?keywords=' + this.keywords);
+        },
+        serch_button_event() {
+            if (!isEmpty(this.keywords)) {
+                app.globalData.url_open('pages/goods-search/goods-search?keywords=' + this.keywords);
+            }
+            app.globalData.url_open('/pages/goods-search-start/goods-search-start?keywords=' + this.keywords);
+        },
+        search_icon_tap() {
+            if (isEmpty(this.form.icon_link)) {
+                this.search_tap();
+                return;
+            }
+            app.globalData.url_open(this.form.icon_link.page);
+        },
+        search_right_icon_tap() {
+            if (isEmpty(this.form.right_icon_link)) {
+                this.search_tap();
+                return;
+            }
+            app.globalData.url_open(this.form.right_icon_link.page);
+        },
+        slideChange(e) {
+            let actived_index = e.detail.current;
+            this.setData({
+                keywords: this.form.hot_word_list[actived_index].value,
+            })
+        },
+        // 位置回调
+        onBack(e) {
+            this.$emit('onBack', e);
+        },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.search {
+    .box {
+        height: 64rpx;
+        // padding: 12rpx 30rpx;
+    }
+    .swiper_style {
+        height: 64rpx;
+        width: 100%;
+    }
+
+    .img-box {
+        height: 100%;
+        .img {
+            height: 36rpx;
+            display: block;
+        }
+    }
+    .search-outer-botton {
+        height: 64rpx;
+        top: 0;
+        right: 0;
+        .search-botton {
+            height: 64rpx;
+            .img {
+                height: 64rpx;
+                min-width: 6rpx;
+                max-width: 20rpx;
+            }
+        }
+    }
+    .right_icon_height {
+        position: relative;
+        height: 56rpx !important;
+    }
+    .search-icon {
+        position: relative;
+    }
+    .search-icon-before {
+        position: absolute;
+        z-index: 10; // 确保悬浮在内容上层
+        top: -20rpx;
+        right: -20rpx;
+        bottom: -20rpx;
+        left: -20rpx
+    }
+    .tips-float {
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+    }
+}
+</style>
diff --git a/components/diy/seckill.vue b/components/diy/seckill.vue
new file mode 100644
index 0000000..5a5ca06
--- /dev/null
+++ b/components/diy/seckill.vue
@@ -0,0 +1,643 @@
+<template>
+    <view v-if="!isEmpty(list) || !isEmpty(sckill_list)" :style="style_container">
+        <view :style="style_img_container">
+            <view class="flex-col gap-10">
+                <view v-if="form.head_state == '1'" class="oh" :style="seckill_head_style">
+                    <view class="seckill-head flex-row align-c jc-sb" :style="seckill_head_img_style">
+                        <view :class="['flex-row align-c', { 'gap-10': form.theme != '1', 'jc-sb wh-auto': form.theme == '2' }]">
+                            <view class="seckill-title">
+                                <imageEmpty v-if="form.title_type == 'image'" :propImageSrc="form.title_src[0]" propImgFit="heightFix" propErrorStyle="width:42rpx; height: 20rpx;"></imageEmpty>
+                                <text v-else :style="{ color: new_style.title_color, 'font-size': new_style.title_size * 2 + 'rpx', 'line-height': '42rpx', 'font-weight': 600 }">{{ form.title_text }}</text>
+                            </view>
+                            <view v-if="form.theme == '1'" class="padding-horizontal-sm cr-white">|</view>
+                            <view v-if="intervalId != undefined" class="flex-row align-c gap-4">
+                                <text class="text-size-xss" :style="{ color: new_style.end_text_color }">{{ seckill_time.time_first_text }}</text>
+                                <view class="flex-row gap-3 jc-c align-c" :style="form.theme == '4' ? time_bg + 'padding: 6rpx 8rpx;border-radius: 22rpx;' : ''">
+                                    <image v-if="form.theme == '4' && form.theme_4_static_img.length > 0" class="seckill-head-icon radius-xs" :src="form.theme_4_static_img[0].url" />
+                                    <view v-for="(item, index) in time_config" :key="item.key" class="flex-row gap-3 jc-c align-c">
+                                        <template v-if="form.theme == '4'">
+                                            <view class="text-size-xs flex-row jc-c align-c" :style="'min-width:50rpx;color:' + new_style.countdown_color">{{ item.value }}</view>
+                                            <text v-if="[0, 1].includes(index)" class="colon" :style="{ color: new_style.countdown_color }">:</text>
+                                        </template>
+                                        <template v-else>
+                                            <view class="time-config text-size-xs flex-row jc-c align-c" :style="time_bg + 'min-width:50rpx;color:' + new_style.countdown_color">{{ item.value }}</view>
+                                            <text v-if="[0, 1].includes(index)" class="colon" :style="icon_time_check">:</text>
+                                        </template>
+                                    </view>
+                                </view>
+                            </view>
+                            <view v-else class="flex-row align-c gap-4">
+                                <text class="text-size-xss" :style="{ color: new_style.end_text_color }">已结束</text>
+                            </view>
+                        </view>
+                        <view v-if="form.button_status == '1'" class="flex-row align-c" :style="{ color: new_style.head_button_color }" :data-value="'/pages/plugins/seckill/index/index'" @tap="url_event">
+                            <text :style="{ 'font-size': new_style.head_button_size * 2 + 'rpx' }">{{ form.button_text }}</text>
+                            <iconfont name="icon-arrow-right" :color="new_style.head_button_color" propContainerDisplay="flex"></iconfont>
+                        </view>
+                    </view>
+                </view>
+                <view class="oh" :style="shop_container">
+                    <view class="oh" :style="shop_img_container">
+                        <template v-if="form.shop_style_type != '3'">
+                            <view class="flex-row flex-wrap wh-auto ht-auto" :style="{ gap: content_outer_spacing }">
+                                <view v-for="(item, index) in sckill_list" :key="index"  :style="layout_style + layout_type_style + content_radius" :data-value="item.goods_url" @tap="url_event">
+                                    <view :class="layout_type" :style="layout_img_style">
+                                        <template v-if="!isEmpty(item)">
+                                            <view class="oh pr">
+                                                <view v-if="!isEmpty(item.new_cover)" :style="img_size">
+                                                    <imageEmpty :propImageSrc="item.new_cover[0]" :propStyle="content_img_radius" propErrorStyle="width:100rpx; height: 100rpx;"></imageEmpty>
+                                                </view>
+                                                <view v-else :style="img_size">
+                                                    <imageEmpty :propImageSrc="item.images" :propStyle="content_img_radius" propErrorStyle="width:100rpx; height: 100rpx;"></imageEmpty>
+                                                </view>
+                                                <!-- 角标 -->
+                                                <subscriptIndex :propValue="propValue"></subscriptIndex>
+                                            </view>
+                                        </template>
+                                        <view v-if="is_show('title') || is_show('simple_desc') || is_show('price') || is_show('original_price') || form.is_shop_show == '1'" class="flex-col gap-10 wh-auto flex-1 jc-sb oh" :style="content_style">
+                                            <view class="flex-col gap-10 wh-auto">
+                                                <!-- 标题 -->
+                                                <view v-if="is_show('title') || is_show('simple_desc')" class="flex-col" :style="{'gap': new_style.title_simple_desc_spacing * 2 + 'rpx'  }">
+                                                    <view v-if="is_show('title')" :style="title_style" class="text-line-2">{{ item.title }}</view>
+                                                    <view v-if="is_show('simple_desc')" class="text-line-1" :style="simple_desc">{{ item.simple_desc }}</view>
+                                                </view>
+                                                <!-- 进度条 -->
+                                                <!-- <view v-if="form.shop_style_type == '1'" class="flex-row align-c gap-6">
+                                                        <view class="re flex-1">
+                                                            <view class="slide-bottom" :style="`background: ${new_style.progress_bg_color}`"></view>
+                                                            <view class="slide-top" :style="` width: 51%; ${slide_active_color}`">
+                                                                <view class="slide-top-icon round" :style="`background: ${new_style.progress_button_color}`"><icon name="a-miaosha" :color="new_style.progress_button_icon_color" size="9"></icon></view>
+                                                            </view>
+                                                        </view>
+                                                        <text class="text-size-xss" :style="`color: ${new_style.progress_text_color}`">已抢51%</text>
+                                                    </view> -->
+                                            </view>
+                                            <view class="flex-row align-e gap-10 jc-sb">
+                                                <view class="flex-col gap-5">
+                                                    <view v-if="is_show('price') && !isEmpty(item.min_price)" class="num" :style="{ color: new_style.shop_price_color }">
+                                                        <text v-if="form.shop_style_type == '1'" class="text-size-xss pr-4">{{ form.seckill_pirce_title ?  form.seckill_pirce_title : ''}}</text>
+                                                        <text :style="price_symbol">{{ item.show_price_symbol }}</text>
+                                                        <text :style="price_style">{{ item.min_price }}</text>
+                                                        <text v-if="is_show('price_unit')" :style="price_unit">{{ item.show_price_unit }}</text>
+                                                    </view>
+                                                    <view v-if="is_show('original_price') && !isEmpty(item.min_original_price)" class="size-11 flex" :style="original_price">
+                                                        <text class="original-price text-line-1 flex-1">
+                                                            {{ item.show_original_price_symbol }}{{ item.min_original_price }}
+                                                            <template v-if="is_show('original_price_unit')">
+                                                                {{ item.show_original_price_unit }}
+                                                            </template>
+                                                        </text>
+                                                    </view>
+                                                </view>
+                                                <view v-if="form.is_shop_show == '1'">
+                                                    <template v-if="form.shop_type == 'text'">
+                                                        <view class="plr-11 padding-vertical-xs round" :style="button_style + 'color:' + new_style.shop_button_text_color">{{ form.shop_button_text }}</view>
+                                                    </template>
+                                                    <view v-else class="round padding-horizontal-sm ptb-5" :styles="button_gradient">
+                                                        <iconfont :name="'icon-' + (!isEmpty(form.shop_button_icon_class) ? form.shop_button_icon_class : 'cart')" :color="new_style.shop_icon_color" :size="new_style.shop_icon_size * 2 + 'rpx'" propContainerDisplay="flex"></iconfont>
+                                                    </view>
+                                                </view>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                        </template>
+                        <template v-else>
+                            <swiper circular="false" :autoplay="new_style.is_roll == '1'" :next-margin="new_style.rolling_fashion == 'translation' ? '-' + content_outer_spacing_magin : '0rpx'" :interval="new_style.interval_time * 1000" :duration="500" :display-multiple-items="slides_per_group" :style="{ height: new_style.content_outer_height * 2 + 'rpx' }">
+                                <swiper-item v-for="(item1, index1) in list" :key="index1">
+                                    <view class="wh-auto ht-auto" :class="{ 'flex-row': new_style.rolling_fashion != 'translation' }" :style="new_style.rolling_fashion != 'translation' ? 'gap:' + content_outer_spacing_magin : ''">
+                                        <view v-for="(item, index) in item1.split_list" :key="index" :style="layout_style + content_radius + (new_style.rolling_fashion != 'translation' ? layout_type_style : 'margin-right:' + content_outer_spacing_magin + ';height: 100%;whith: 100%')" :data-value="item.goods_url" @tap="url_event">
+                                            <view :class="layout_type" :style="layout_img_style">
+                                                <template v-if="!isEmpty(item)">
+                                                    <view class="oh pr wh-auto ht-auto">
+                                                        <view v-if="!isEmpty(item.new_cover)" class="wh-auto ht-auto">
+                                                            <imageEmpty :propImageSrc="item.new_cover[0]" :propStyle="content_img_radius" propErrorStyle="width:100rpx; height: 100rpx;"></imageEmpty>
+                                                        </view>
+                                                        <view v-else class="wh-auto ht-auto">
+                                                            <imageEmpty :propImageSrc="item.images" :propStyle="content_img_radius" propErrorStyle="width:100rpx; height: 100rpx;"></imageEmpty>
+                                                        </view>
+                                                        <!-- 角标 -->
+                                                        <subscriptIndex :propValue="propValue"></subscriptIndex>
+                                                    </view>
+                                                </template>
+                                                <view v-if="is_show('title') || is_show('simple_desc') || is_show('price') || is_show('original_price') || form.is_shop_show == '1'"  class="flex-col gap-10 wh-auto flex-1 jc-sb" :style="content_style">
+                                                    <view class="flex-col gap-10 wh-auto">
+                                                        <!-- 标题 -->
+                                                        <view v-if="is_show('title') || is_show('simple_desc')" class="flex-col" :style="{'gap': new_style.title_simple_desc_spacing * 2 + 'rpx'  }">
+                                                            <view v-if="is_show('title')" :style="title_style" class="text-line-2">{{ item.title }}</view>
+                                                            <view v-if="is_show('simple_desc')" class="text-line-1" :style="simple_desc">{{ item.simple_desc }}</view>
+                                                        </view>
+                                                        <!-- 进度条 -->
+                                                        <!-- <view v-if="form.shop_style_type == '1'" class="flex-row align-c gap-6">
+                                                        <view class="re flex-1">
+                                                            <view class="slide-bottom" :style="{ 'background': new_style.progress_bg_color }"></view>
+                                                            <view class="slide-top" :style="'width: 51%;' + slide_active_color ">
+                                                                <view class="slide-top-icon round" :style="{ 'background': new_style.progress_button_color}"><icon name="a-miaosha" :color="new_style.progress_button_icon_color" size="9"></icon></view>
+                                                            </view>
+                                                        </view>
+                                                        <text class="text-size-xss" :style="{ 'color': new_style.progress_text_color }">已抢51%</text>
+                                                    </view> -->
+                                                    </view>
+                                                    <view class="flex-row align-e gap-10 jc-sb">
+                                                        <view class="flex-col gap-5">
+                                                            <view v-if="is_show('price') && !isEmpty(item.min_price)" class="num" :style="{ color: new_style.shop_price_color }">
+                                                                <text v-if="form.shop_style_type == '1'" class="text-size-xss pr-4">{{ form.seckill_pirce_title ? form.seckill_pirce_title : ''}}</text>
+                                                                <text :style="price_symbol">{{ item.show_price_symbol }}</text>
+                                                                <text :style="price_style">{{ item.min_price }}</text>
+                                                                <text v-if="is_show('price_unit')" :style="price_unit">{{ item.show_price_unit }}</text>
+                                                            </view>
+                                                            <view v-if="is_show('original_price') && !isEmpty(item.min_original_price)" class="size-11 flex" :style="original_price">
+                                                                <text class="original-price text-line-1 flex-1">
+                                                                    {{ item.show_original_price_symbol }}{{ item.min_original_price }}
+                                                                    <template v-if="is_show('original_price_unit')">
+                                                                        {{ item.show_original_price_unit }}
+                                                                    </template>
+                                                                </text>
+                                                            </view>
+                                                        </view>
+                                                        <view v-if="form.is_shop_show == '1'">
+                                                            <template v-if="form.shop_type == 'text'">
+                                                                <view class="plr-11 padding-vertical-xs round" :style="button_style + 'color:' + new_style.shop_button_text_color">{{ form.shop_button_text }}</view>
+                                                            </template>
+                                                            <view v-else class="round padding-horizontal-sm ptb-5" :styles="button_gradient">
+                                                                <iconfont :name="'icon-' + (!isEmpty(form.shop_button_icon_class) ? form.shop_button_icon_class : 'cart')" :color="new_style.shop_icon_color" :size="new_style.shop_icon_size * 2 + 'rpx'" propContainerDisplay="flex"></iconfont>
+                                                            </view>
+                                                        </view>
+                                                    </view>
+                                                </view>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </swiper-item>
+                            </swiper>
+                        </template>
+                    </view>
+                </view>
+                
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import { background_computer, common_styles_computer, common_img_computer, gradient_computer, gradient_handle, padding_computer, radius_computer, isEmpty, margin_computer, box_shadow_computer, border_computer, old_margin, old_border_and_box_shadow } from '@/common/js/common/common.js';
+    import imageEmpty from '@/components/diy/modules/image-empty.vue';
+    import subscriptIndex from '@/components/diy/modules/subscript/index.vue';
+    var system = app.globalData.get_system_info(null, null, true);
+    var sys_width = app.globalData.window_width_handle(system.windowWidth);
+    export default {
+        components: {
+            imageEmpty,
+            subscriptIndex
+        },
+        props: {
+            propValue: {
+                type: Object,
+                default: () => {
+                    return {};
+                },
+            },
+            propKey: {
+                type: [String,Number],
+                default: '',
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 1000000,
+            },
+        },
+        data() {
+            return {
+                form: {},
+                new_style: {},
+                time_bg: '',
+                slide_active_color: '',
+                seckill_head_style: '',
+                style_container: '',
+                style_img_container: '',
+                time_config: [
+                    { key: 'hour', value: '00' },
+                    { key: 'minute', value: '00' },
+                    { key: 'second', value: '00' },
+                ],
+                seckill_time: {},
+                // 商品间距
+                content_outer_spacing: '',
+                content_outer_spacing_magin: '',
+                // 圆角设置
+                content_radius: '',
+                // 内边距设置
+                content_padding: '',
+                // 内容区域的样式
+                content_style: '',
+                // 不同风格下的样式
+                img_size: '',
+                layout_type: '',
+                layout_type_style: '',
+                layout_img_style: '',
+                layout_style: '',
+                //图片圆角设置
+                content_img_radius: '',
+                //角标设置
+                corner_marker: '',
+                // 定时器
+                intervalId: null,
+                // 数据存储
+                list: [],
+                // 一屏显示的数量
+                slides_per_group: '',
+                // 内容样式
+                title_style: '',
+                price_style: '',
+                button_style: '',
+                simple_desc: '',
+                price_symbol: '',
+                price_unit: '',
+                original_price: '',
+                shop_container: '',
+                shop_img_container: '',
+                // 商品列表
+                sckill_list: [],
+            };
+        },
+        computed: {
+            icon_time_check() {
+                return `${this.time_bg};line-height: 1;background-clip: text;-webkit-background-clip: text;-webkit-text-fill-color: transparent;`;
+            },
+            // 按钮渐变色处理
+            button_gradient() {
+                return gradient_handle(this.new_style.shop_button_color, '180deg');
+            },
+        },
+        watch: {
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        created() {
+            this.init();
+        },
+        beforeDestroy() {
+            // 如果有定时任务执行，在离开的时候清空掉定时任务
+            if (!isEmpty(this.intervalId)) {
+                clearInterval(this.intervalId);
+            }
+        },
+        methods: {
+            isEmpty,
+            init() {
+                const new_form = this.propValue.content;
+                const new_style = this.propValue.style;
+                const data = new_form.data;
+                let new_list = [];
+                if (data && !isEmpty(data.current)) {
+                    if (!isEmpty(data.current.goods)) {
+                        new_list = data.current.goods;
+                    }
+                    const { status, time_first_text } = data.current.time;
+                    this.setData({
+                        seckill_time: {
+                            time_end_number: Number(data.current.time_end_number + '000'),
+                            time_start_number: Number(data.current.time_start_number + '000'),
+                            status: status,
+                            time_first_text: time_first_text,
+                        },
+                    });
+                    // 先执行一次倒计时，后续的等待倒计时执行
+                    setTimeout(() => {
+                        this.updateCountdown();
+                    }, 0);
+                    this.setData({
+                        intervalId: setInterval(this.updateCountdown, 1000),
+                    });
+                }
+                // 默认数据
+                const product_style_list = [
+                    { name: '单列', value: '1', width: 110, height: 120 },
+                    { name: '双列', value: '2', width: 180, height: 180 },
+                    { name: '横向滑动', value: '3', width: 0, height: 0 },
+                ];
+                const scale = sys_width / 390;
+                let img_style = ``;
+                if (['1'].includes(new_form.shop_style_type)) {
+                    // 图片宽度
+                    if (typeof new_style.content_img_width == 'number') {
+                        img_style += `width: ${ new_style.content_img_width * scale }px;`;
+                    } else {
+                        const list = product_style_list.filter(item => item.value == new_form.shop_style_type);
+                        if (list.length > 0) {
+                            img_style += `width: ${ list[0].width * scale }px;`;
+                        } else {
+                            img_style += 'width: auto;';
+                        }
+                    }
+                }
+                if (!['3'].includes(new_form.shop_style_type)) {
+                    // 图片宽度
+                    if (typeof new_style.content_img_height == 'number') {
+                        img_style += `height: ${ new_style.content_img_height * scale }px;`;
+                    } else {
+                        const list = product_style_list.filter(item => item.value == new_form.shop_style_type);
+                        if (list.length > 0) {
+                            img_style += `height: ${ list[0].height * scale }px;`;
+                        } else {
+                            img_style += 'height: auto;';
+                        }
+                    }
+                }
+                const shop_style = new_style?.shop_style || old_border_and_box_shadow;
+                this.setData({
+                    form: this.propValue.content,
+                    new_style: this.propValue.style,
+                    time_bg: this.get_time_bg(new_style),
+                    slide_active_color: this.get_slide_active_color(new_style),
+                    seckill_head_style: this.get_seckill_head_style(new_style, '1'),
+                    seckill_head_img_style: this.get_seckill_head_style(new_style, '2'),
+                    style_container: common_styles_computer(new_style.common_style) + 'box-sizing: border-box;',
+                    style_img_container: common_img_computer(new_style.common_style, this.propIndex),
+                    content_outer_spacing: new_style.content_outer_spacing + 'px',
+                    content_outer_spacing_magin: new_style.content_outer_spacing * 2 + 'rpx',
+                    content_radius: radius_computer(new_style.shop_radius),
+                    content_padding: padding_computer(new_style.shop_padding) + 'box-sizing: border-box;',
+                    content_style: this.get_content_style(new_style, new_form),
+                    layout_type: new_form.shop_style_type == '1' ? 'flex-row wh-auto ht-auto oh' : 'flex-col wh-auto ht-auto oh',
+                    layout_img_style: this.get_layout_img_style(new_style, new_form),
+                    layout_type_style: this.get_layout_type_style(new_style, new_form),
+                    layout_style: gradient_handle(new_style.shop_color_list, new_style.shop_direction) + margin_computer(new_style?.shop_margin || old_margin) + border_computer(shop_style) + box_shadow_computer(shop_style),
+                    content_img_radius: radius_computer(new_style.shop_img_radius),
+                    corner_marker: this.get_corner_marker(new_style),
+                    slides_per_group: new_style.rolling_fashion == 'translation' ? new_form.carousel_col : 1,
+                    // 内容样式设置
+                    title_style: this.trends_config(new_style, 'title', 'title'),
+                    price_style: this.trends_config(new_style, 'price'),
+                    button_style: this.trends_config(new_style, 'button', 'gradient'),
+                    simple_desc: this.trends_config(new_style, 'simple_desc', 'desc'),
+                    price_symbol: !isEmpty(new_style.shop_price_symbol_color) ? this.trends_config(new_style, 'price_symbol') : 'font-size: 18rpx;color: #EA3323;' ,
+                    price_unit: !isEmpty(new_style.shop_price_unit_color) ? this.trends_config(new_style, 'price_unit') : 'font-size: 18rpx;color: #EA3323;',
+                    original_price: this.trends_config(new_style, 'original_price'),
+                    list: this.get_shop_content_list(new_list, new_form, new_style),
+                    shop_container: this.get_shop_container(new_style),
+                    shop_img_container: this.get_shop_img_container(new_style),
+                    sckill_list: new_list,
+                    img_size: img_style,
+                });
+            },
+            // 商品内容区域显示
+            get_shop_container(new_style){
+                const { shop_content_color_list = [], shop_content_direction = '', shop_content_radius = old_radius, shop_content_margin = old_margin, shop_content = old_border_and_box_shadow } = new_style;
+                // 渐变
+                const gradient = { color_list: shop_content_color_list, direction: shop_content_direction };
+                return gradient_computer(gradient) + radius_computer(shop_content_radius) + margin_computer(shop_content_margin) + border_computer(shop_content) + box_shadow_computer(shop_content);
+            },
+            get_shop_img_container (new_style) {
+                const { shop_content_background_img_style = '2', shop_content_background_img = [], shop_content_padding = old_padding } = new_style;
+                // 背景图
+                const back = { background_img: shop_content_background_img, background_img_style: shop_content_background_img_style };
+                return padding_computer(shop_content_padding) + background_computer(back);
+            },
+            get_shop_content_list(list, form, new_style) {
+                // 深拷贝一下，确保不会出现问题
+                const cloneList = JSON.parse(JSON.stringify(list));
+                if (new_style.rolling_fashion != 'translation') {
+                    // 如果是分页滑动情况下，根据选择的行数和每行显示的个数来区分具体是显示多少个
+                    if (cloneList.length > 0) {
+                        // 每页显示的数量
+                        const num = form.carousel_col;
+                        // 存储数据显示
+                        let nav_list = [];
+                        // 拆分的数量
+                        const split_num = Math.ceil(cloneList.length / num);
+                        for (let i = 0; i < split_num; i++) {
+                            nav_list.push({
+                                split_list: cloneList.slice(i * num, (i + 1) * num),
+                            });
+                        }
+                        return nav_list;
+                    } else {
+                        // 否则的话，就返回全部的信息
+                        return [
+                            {
+                                split_list: cloneList,
+                            },
+                        ];
+                    }
+                } else {
+                    // 存储数据显示
+                    let nav_list = [];
+                    cloneList.forEach((item) => {
+                        nav_list.push({
+                            split_list: [item],
+                        });
+                    });
+                    return nav_list;
+                }
+            },
+            get_time_bg(new_style) {
+                const { countdown_bg_color_list, countdown_direction } = new_style;
+                // 渐变
+                const gradient = { color_list: countdown_bg_color_list, direction: countdown_direction };
+                return gradient_computer(gradient);
+            },
+            get_slide_active_color(new_style) {
+                const { progress_actived_color_list, progress_actived_direction } = new_style;
+                // 渐变
+                const gradient = { color_list: progress_actived_color_list, direction: progress_actived_direction };
+                return gradient_computer(gradient);
+            },
+            get_seckill_head_style(new_style, num) {
+                const { header_background_img, header_background_img_style, header_background_color_list, header_background_direction, seckill_head_padding, seckill_head_radius, seckill_head_margin = old_margin, seckill_head_style = old_border_and_box_shadow } = new_style;
+                // 渐变
+                const gradient = { color_list: header_background_color_list, direction: header_background_direction };
+                // 背景图
+                const back = { background_img: header_background_img, background_img_style: header_background_img_style };
+                if (num == '1') {
+                    return gradient_computer(gradient) + radius_computer(seckill_head_radius) + margin_computer(seckill_head_margin) + border_computer(seckill_head_style) + box_shadow_computer(seckill_head_style);
+                } else {
+                    // 秒杀头部内间距设置， 没有的时候默认15px
+                    const padding = !isEmpty(seckill_head_padding) ? seckill_head_padding : { padding: 0, padding_top: 15, padding_bottom: 15, padding_left: 13, padding_right: 13};
+                    return background_computer(back) + padding_computer(padding) + 'box-sizing: border-box;';
+                }
+            },
+            updateCountdown() {
+                let time_end_number = this.seckill_time.time_end_number;
+                if (this.seckill_time.status === 0) {
+                    time_end_number = this.seckill_time.time_start_number;
+                }
+                // 先获取秒杀结束时间和当前时间的差值
+                const distance = time_end_number - new Date().getTime();
+                // 如果倒计时结束，显示结束信息
+                if (distance <= 1000) {
+                    clearInterval(this.intervalId);
+                    // 如果是待开始状态，则显示开始倒计时，并且在结束的时候根据结束时候再执行一个定时器
+                    if (this.seckill_time.status === 0) {
+                        this.setData({
+                            seckill_time: {
+                                time_end_number: this.seckill_time.time_end_number,
+                                time_start_number: this.seckill_time.time_start_number,
+                                status: 1,
+                                time_first_text: '距结束',
+                            },
+                        });
+                        // 先执行一次倒计时，后续的等待倒计时执行
+                        setTimeout(() => {
+                            this.updateCountdown();
+                        }, 0);
+                        this.setData({
+                            intervalId: setInterval(this.updateCountdown, 1000),
+                        });
+                    }
+                    return;
+                }
+                // 计算时间
+                const hours = Math.floor((distance % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
+                const minutes = Math.floor((distance % (1000 * 60 * 60)) / (1000 * 60));
+                const seconds = Math.floor((distance % (1000 * 60)) / 1000);
+                this.time_config.forEach((item) => {
+                    if (item.key == 'hour') {
+                        item.value = hours < 10 ? '0' + hours : hours.toString();
+                    } else if (item.key == 'minute') {
+                        item.value = minutes < 10 ? '0' + minutes : minutes.toString();
+                    } else if (item.key == 'second') {
+                        item.value = seconds < 10 ? '0' + seconds : seconds.toString();
+                    }
+                });
+            },
+            get_content_style(new_style, form) {
+                const spacing_value = new_style.content_spacing;
+                let spacing = '';
+                if (form.shop_style_type == '1') {
+                    spacing = `margin-left: ${spacing_value * 2}rpx;`;
+                } else {
+                    spacing = padding_computer(new_style.shop_padding) + 'box-sizing: border-box;';
+                }
+                return `${spacing}`;
+            },
+            get_layout_type_style(new_style, form) {
+                return ['1', '2'].includes(form.shop_style_type) ? `height: 100%;width: ${this.get_multicolumn_columns_width(new_style, form)};min-width: ${this.get_multicolumn_columns_width(new_style, form)};` : `height: ${new_style.content_outer_height * 2}rpx;width: ${this.get_multicolumn_columns_width(new_style, form)};min-width: ${this.get_multicolumn_columns_width(new_style, form)};`;
+            },
+            get_layout_img_style(new_style, form) {
+                const padding = ['1'].includes(form.shop_style_type) ? padding_computer(new_style.shop_padding) + 'box-sizing: border-box;' : '';
+                const data = {
+                    background_img_style: new_style.shop_background_img_style,
+                    background_img: new_style.shop_background_img,
+                }
+                return `${padding} ${ background_computer(data) }`;
+            },
+            // 根据传递的参数，从对象中取值
+            trends_config(new_style, key, type) {
+                return this.style_config(new_style[`shop_${key}_typeface`], new_style[`shop_${key}_size`], new_style[`shop_${key}_color`], type, new_style);
+            },
+            // 根据传递的值，显示不同的内容
+            style_config(typeface, size, color, type, new_style) {
+                let style = `font-weight:${typeface}; font-size: ${size * 2}rpx;`;
+                if (type == 'gradient') {
+                    style += gradient_handle(new_style.shop_button_color, '180deg');
+                } else if (type == 'title') {
+                    style += `line-height: ${size > 0 ? (size + 3) * 2 : 0}rpx;height: ${size > 0 ? (size + 3) * 4 : 0}rpx;color: ${color};`;
+                } else if (type == 'desc') {
+                    style += `line-height: ${size * 2}rpx;height: ${size * 2}rpx;color: ${color};`;
+                } else {
+                    style += `color: ${color};`;
+                }
+                return style;
+            },
+            get_multicolumn_columns_width(new_style, form) {
+                let model_number = form.carousel_col;
+                if (form.shop_style_type == '1') {
+                    model_number = 1;
+                } else if (form.shop_style_type == '2') {
+                    model_number = 2;
+                }
+                // 计算间隔的空间。(gap * gap数量) / 模块数量
+                let gap = (new_style.content_outer_spacing * (model_number - 1)) / model_number;
+                return `calc(${100 / model_number}% - ${gap}px)`;
+            },
+            is_show(index) {
+                return this.form.is_show.includes(index);
+            },
+            get_corner_marker(new_style) {
+                const { seckill_subscript_location, shop_img_radius, seckill_subscript_bg_color, seckill_subscript_text_color } = new_style;
+                let location = `background: ${seckill_subscript_bg_color};color: ${seckill_subscript_text_color};`;
+                // 圆角根据图片的圆角来计算 对角线是同样的圆角
+                if (seckill_subscript_location == 'top-left') {
+                    location += `top: 0;left: 0;border-radius: ${shop_img_radius.radius_top_left * 2}rpx 0 ${shop_img_radius.radius_top_left * 2}rpx 0;`;
+                } else if (seckill_subscript_location == 'top-right') {
+                    location += `top: 0;right: 0;border-radius: 0 ${shop_img_radius.radius_top_right * 2}rpx 0 ${shop_img_radius.radius_top_right * 2}rpx;`;
+                } else if (seckill_subscript_location == 'bottom-left') {
+                    location += `bottom: 0;left: 0;border-radius: 0 ${shop_img_radius.radius_bottom_left * 2}rpx 0 ${shop_img_radius.radius_bottom_left * 2}rpx;`;
+                } else if (seckill_subscript_location == 'bottom-right') {
+                    location += `bottom: 0;right: 0;border-radius: ${shop_img_radius.radius_bottom_right * 2}rpx 0 ${shop_img_radius.radius_bottom_right * 2}rpx 0;`;
+                }
+                return location;
+            },
+            // 跳转链接
+            url_event(link) {
+                app.globalData.url_event(link);
+            },
+        },
+    };
+</script>
+
+<style scoped lang="scss">
+    .seckill-head {
+        padding: 30rpx 26rpx;
+        width: 100%;
+        height: 102rpx;
+        border-radius: 16rpx 16rpx 0 0;
+        box-sizing: border-box;
+        .seckill-title {
+            width: auto;
+            height: 42rpx;
+        }
+        .time-config {
+            padding: 2rpx 10rpx;
+            box-sizing: border-box;
+            line-height: 34rpx;
+            border-radius: 8rpx;
+        }
+    }
+    .seckill-head-icon {
+        width: 32rpx;
+        height: 32rpx;
+    }
+    .colon {
+        position: relative;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 33rpx;
+        top: -2rpx;
+    }
+    .slide-bottom {
+        height: 20rpx;
+        border-radius: 10rpx;
+        background: red;
+    }
+    .slide-top {
+        position: absolute;
+        height: 20rpx;
+        top: 0;
+        left: 0;
+        border-radius: 10rpx;
+        .slide-top-icon {
+            position: absolute;
+            top: -6rpx;
+            right: 0;
+            width: 32rpx;
+            height: 32rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+    }
+    .original-price {
+        text-decoration-line: line-through;
+    }
+    .size-11 {
+        font-size: 22rpx;
+    }
+</style>
diff --git a/components/diy/tabs-carousel.vue b/components/diy/tabs-carousel.vue
new file mode 100644
index 0000000..22ec567
--- /dev/null
+++ b/components/diy/tabs-carousel.vue
@@ -0,0 +1,231 @@
+<template>
+    <view class="ou pr" :style="style_container + swiper_bg_style">
+        <view class="pa top-0 wh-auto ht-auto" :style="swiper_bg_img_style"></view>
+        <view class="ou wh-auto" :style="style_img_container + (!isEmpty(swiper_bg_img_style) ? swiper_bg_img_style_null : '')">
+            <componentDiyTabs :propKey="propKey" :propContentPadding="propContentPadding" :propValue="propValue" :propTop="propTop" :propIsRotatingBackground="is_rotating_background" :propBgStyle="swiper_bg_style" :propBgImgStyle="swiper_bg_img_style" :propStickyTop="propStickyTop" :propIsImmersionModel="propIsImmersionModel" :propNewIsTabsSafeDistance="new_is_tabs_safe_distance" :propNavIsTop="propNavIsTop" :propTabsIsTop="propTabsIsTop" :propIsCommon="false" :propsTabsContainer="tabs_container" :propsTabsImgContainer="tabs_img_container" :propSpacingCommonStyle="spacing_common_style" :propTabsSlidingFixedBg="tabs_sliding_fixed_bg" @onComputerHeight="tabs_height_event" @onTabsTap="tabs_click_event"></componentDiyTabs>
+            <view :style="carousel_margin_top">
+                <view :style="carousel_container">
+                    <view :style="carousel_img_container">
+                        <componentDiycarousel :propValue="propValue" :propIsCommon="false" @onVideoPlay="video_play" @slideChange="slideChange"></componentDiycarousel>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import { common_styles_computer, common_img_computer, padding_computer, isEmpty, gradient_computer, margin_computer, background_computer, radius_computer, old_margin, old_padding, old_radius, old_border_and_box_shadow, border_computer, box_shadow_computer, } from '@/common/js/common/common.js';
+    import componentDiyTabs from '@/components/diy/tabs';
+    import componentDiycarousel from '@/components/diy/carousel';
+    export default {
+        components: {
+            componentDiyTabs,
+            componentDiycarousel,
+        },
+        props: {
+            propValue: {
+                type: Object,
+                default: () => {
+                    return {};
+                },
+            },
+            propTop: {
+                type: [String, Number],
+                default: 0,
+            },
+            propStickyTop: {
+                type: Number,
+                default: 0,
+            },
+            // 是否导航栏置顶
+            propNavIsTop: {
+                type: Boolean,
+                default: true,
+            },
+            // 是否选项卡置顶
+            propTabsIsTop: {
+                type: Boolean,
+                default: false,
+            },
+            propKey: {
+                type: [String, Number],
+                default: '',
+            },
+            propContentPadding: {
+                type: String,
+                default: '',
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 1000000,
+            },
+            // 选项卡是否使用安全距离
+            propIsImmersionModel: {
+                type: Boolean,
+                default: false
+            }
+        },
+        data() {
+            return {
+                style_container: '',
+                style_img_container: '',
+                style_margin_container: '',
+                spacing_common_style: {
+                    padding: 0,
+                    padding_top: 0,
+                    padding_bottom: 0,
+                    padding_left: 0,
+                    padding_right: 0,
+                    margin: 0,
+                    margin_top: 0,
+                    margin_bottom: 0,
+                    margin_left: 0,
+                    margin_right: 0,
+                },
+                tabs_padding_style: '',
+                // 选项卡内容
+                tabs_container: '',
+                tabs_img_container: '',
+                tabs_sliding_fixed_bg: '',
+                // 轮播图内容
+                carousel_margin_top: '',
+                carousel_container: '',
+                carousel_img_container: '',
+                // top_up: '0',
+                actived_index: 0,
+                // 轮播图背景
+                swiper_bg_style: '',
+                swiper_bg_img_style: '',
+                swiper_bg_img_style_null: `background-image: url('')`,
+                is_rotating_background: false,
+                new_is_tabs_safe_distance: false,
+            };
+        },
+        created() {
+            this.init();
+        },
+        // 属性值改变监听
+        watch: {
+            // 数据
+            propTabsIsTop(value, old_value) {
+                this.init();
+            },
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        methods: {
+            isEmpty,
+            init() {
+                const new_content = this.propValue.content || {};
+                const new_style = this.propValue.style || {};
+                const { tabs_bg_color_list = [], tabs_bg_direction = '', tabs_bg_background_img_style = '', tabs_bg_background_img = [], tabs_radius = old_radius, tabs_padding = old_padding, tabs_margin = old_margin, tabs_content = old_border_and_box_shadow, carousel_content_color_list = [], carousel_content_direction = '', carousel_content_background_img_style = '', carousel_content_background_img = [], carousel_content_margin = old_margin, carousel_content_padding = old_padding, carousel_content_radius = old_radius, carousel_content = old_border_and_box_shadow } = new_style;
+                // 选项卡背景设置
+                const tabs_data = {
+                    color_list: tabs_bg_color_list,
+                    direction: tabs_bg_direction,
+                    background_img_style: tabs_bg_background_img_style,
+                    background_img: tabs_bg_background_img,
+                }
+                // 商品区域背景设置
+                const carousel_content_data = {
+                    color_list: carousel_content_color_list,
+                    direction: carousel_content_direction,
+                    background_img_style: carousel_content_background_img_style,
+                    background_img: carousel_content_background_img,
+                }
+                // 头部的高度
+                const newPropTop = app.globalData.rpx_to_px(this.propTop);
+                // 选项卡的外边距
+                const new_tabs_top = app.globalData.rpx_to_px(tabs_margin?.margin_top || 0);
+                // 选项卡的实际外边距
+                const tabs_margin_top = new_content.is_tabs_safe_distance == '1' ? newPropTop + this.propStickyTop : 0;
+                // 选项卡的内边距处理
+                const new_padding_top = new_style.common_style.padding_top - newPropTop;
+                this.setData({
+                    // style_container: `${common_styles_computer(common_style)};gap:${new_style.data_spacing * 2}rpx`,
+                    style_container: `${common_styles_computer(new_style.common_style)};`,
+                    style_img_container: common_img_computer(new_style.common_style, this.propIndex),
+                    carousel_margin_top: 'margin-top:' + new_style.data_spacing * 2 + 'rpx',
+                    new_is_tabs_safe_distance: new_content.is_tabs_safe_distance == '1',
+                    // 是否开启轮播图背景设置
+                    is_rotating_background: new_content.rotating_background == '1',
+                    tabs_sliding_fixed_bg: gradient_computer(tabs_data),
+                    tabs_container: gradient_computer(tabs_data) + radius_computer(tabs_radius) + margin_computer(tabs_margin) + border_computer(tabs_content) + box_shadow_computer(tabs_content) + `overflow: hidden;margin-top: ${ new_tabs_top - tabs_margin_top }px;`,
+                    tabs_img_container: background_computer(tabs_data) + padding_computer(tabs_padding) + `box-sizing: border-box;overflow: hidden;padding-top: ${ (tabs_padding?.padding_top || 0) + tabs_margin_top }px;`,
+                    carousel_container: gradient_computer(carousel_content_data) + margin_computer(carousel_content_margin) + radius_computer(carousel_content_radius) + border_computer(carousel_content) + box_shadow_computer(carousel_content)  + 'overflow: hidden;',
+                    carousel_img_container: background_computer(carousel_content_data) + padding_computer(carousel_content_padding) + 'box-sizing: border-box;overflow: hidden;',
+                    spacing_common_style: {
+                        padding: 0,
+                        padding_top: (this.propIsImmersionModel && new_content.is_tabs_safe_distance == '1' ? new_style.common_style.padding_top + this.propStickyTop : new_padding_top > 0 ? new_padding_top : 0),
+                        padding_bottom: 0,
+                        padding_left: new_style.common_style.padding_left,
+                        padding_right: new_style.common_style.padding_right,
+                        margin: 0,
+                        margin_top: new_style.common_style.margin_top,
+                        margin_left: new_style.common_style.margin_left,
+                        margin_right: new_style.common_style.margin_right,
+                    },
+                    swiper_bg_style: this.get_swiper_bg_style(new_content, 0),
+                    swiper_bg_img_style: this.get_swiper_bg_img_style(new_content, 0),
+                });
+            },
+            // tab点击
+            tabs_click_event(tabs_id, is_micro_page) {
+                this.$emit('onTabsTap', tabs_id, is_micro_page);
+            },
+            // tab高度
+            tabs_height_event(height) {
+                this.$emit('onComputerHeight', height);
+            },
+            // 视频播放
+            video_play(url, popup_width, popup_height) {
+                this.$emit('onVideoPlay', url, popup_width, popup_height);
+            },
+            get_swiper_bg_style(form, actived_index) {
+                const style = form?.carousel_list?.[actived_index]?.style;
+                if (style && !isEmpty(style.color_list)) {
+                    const color_list = style.color_list;
+                    const list = color_list.filter((item) => !isEmpty(item.color));
+                    if (list.length > 0) {
+                        try {
+                            return gradient_computer(style);
+                        } catch (error) {
+                            return '';
+                        }
+                    }
+                    return '';
+                }
+                return '';
+            },
+            get_swiper_bg_img_style(form, actived_index) {
+                const { carousel_img, style = {} } = form?.carousel_list[actived_index] || {};
+                // 如果是自定义的图片 判断图片是否存在
+                if (!isEmpty(carousel_img) && style?.background_type == 'carousel') {
+                    // 如果是使用轮播图，判断轮播图是否存在
+                    const data = {
+                        background_img: carousel_img,
+                        background_img_style: style?.background_img_style || '2',
+                    }
+                    return background_computer(data) + (style.is_background_img_blur == '1' ? `filter: blur(14px);opacity: 0.6;` : '');
+                } else if (!isEmpty(style?.background_img)) {
+                    return background_computer(style) + (style.is_background_img_blur == '1' ? `filter: blur(14px);opacity: 0.6;` : '');
+                }
+                return '';
+            },
+            slideChange(index) {
+                this.setData({
+                    actived_index: index,
+                    swiper_bg_style: this.get_swiper_bg_style(this.propValue.content || {}, index),
+                    swiper_bg_img_style: this.get_swiper_bg_img_style(this.propValue.content || {}, index),
+                });
+            },
+        },
+    };
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/components/diy/tabs.vue b/components/diy/tabs.vue
new file mode 100644
index 0000000..926299a
--- /dev/null
+++ b/components/diy/tabs.vue
@@ -0,0 +1,270 @@
+<template>
+    <!-- 选项卡 -->
+    <view class="tabs-container pr" :style="tabs_z_index">
+        <view :class="top_up == '1' ? 'tabs-top' : ''" :style="tabs_top_style + (top_up == '1' ? propContentPadding : '')">
+            <view :style="style_margin_container">
+                <view class="tabs-contents bs-bb pr" :style="style_container">
+                    <view :class="top_up == '1' ? 'bs-bb' : 'wh-auto bs-bb'" :style="style_img_container">
+                        <componentDiyModulesTabsView :propKey="propKey" :propValue="tabs_data" :propIsTabsIcon="true" :propTop="propTop" :propsTabsContainer="propsTabsContainer + (propIsRotatingBackground ? propBgStyle : '')" :propIsRotatingBackground="propIsRotatingBackground" :propBgImgStyle="propBgImgStyle" :propsTabsImgContainer="propsTabsImgContainer" :propStyle="propStyle" :propTabsSlidingFixedBg="tabs_sliding_fixed_bg" @onTabsTap="tabs_click_event" @tabsZindex="tabsZindex"></componentDiyModulesTabsView>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <view v-if="top_up == '1'" class="tabs-seat" :style="'height:' + (propIsCommon ? tabs_seat_height : tabs_carousel_seat_height) + 'px;'"></view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import { common_styles_computer, common_img_computer, padding_computer, margin_computer, gradient_computer, background_computer } from '@/common/js/common/common.js';
+    import componentDiyModulesTabsView from '@/components/diy/modules/tabs-view';
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        props: {
+            propValue: {
+                type: Object,
+                default: () => ({}),
+            },
+            // 置顶距离顶部高度
+            propTop: {
+                type: [String, Number],
+                default: '0',
+            },
+            propStickyTop: {
+                type: Number,
+                default: 0,
+            },
+            // 是否导航栏置顶
+            propNavIsTop: {
+                type: Boolean,
+                default: true,
+            },
+            // 是否选项卡置顶
+            propTabsIsTop: {
+                type: Boolean,
+                default: false,
+            },
+            propIsCommon: {
+                type: Boolean,
+                default: true,
+            },
+            propSpacingCommonStyle: {
+                type: Object,
+                default: () => ({}),
+            },
+            // 样式
+            propStyle: {
+                type: String,
+                default: '',
+            },
+            propKey: {
+                type: [String, Number],
+                default: '',
+            },
+            propsTabsContainer: {
+                type: String,
+                default: ''
+            },
+            propsTabsImgContainer: {
+                type: String,
+                default: '',
+            },
+            propContentPadding: {
+                type: String,
+                default: '',
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 1000000,
+            },
+            propIsImmersionModel: {
+                type: Boolean,
+                default: false
+            },
+            propNewIsTabsSafeDistance: {
+                type: Boolean,
+                default: true
+            },
+            propTabsSlidingFixedBg: {
+                type: String,
+                default: ''
+            },
+            propIsRotatingBackground: {
+                type: Boolean,
+                default: false
+            },
+            propBgStyle: {
+                type: String,
+                default: ''
+            },
+            propBgImgStyle: {
+                type: String,
+                default: ''
+            }
+        },
+        components: {
+            componentDiyModulesTabsView,
+        },
+        data() {
+            return {
+                style_container: '',
+                style_img_container: '',
+                tabs_sliding_fixed_bg: '',
+                content: '',
+                tabs_data: {},
+                // 是否滑动置顶
+                top_up: '0',
+                // 置顶时，选项卡高度
+                tabs_seat_height: 0,
+                // 置顶时，轮播选项卡高度
+                tabs_carousel_seat_height: 0,
+                // 置顶时，选项卡样式
+                tabs_top_style: '',
+                style_margin_container: '',
+                tabs_z_index: ''
+            };
+        },
+        created() {
+            this.init();
+        },
+        mounted() {
+            setTimeout(() => {
+                this.get_tabs_height();
+            }, 100);
+        },
+        // 属性值改变监听
+        watch: {
+            // 数据
+            propTabsIsTop(value, old_value) {
+                this.init();
+                setTimeout(() => {
+                    this.get_tabs_height();
+                }, 100);
+            },
+            propTop(val) {
+                this.init();
+            },
+            propStickyTop(val) {
+                this.init();
+            },
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+            propSpacingCommonStyle(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        methods: {
+            // 初始化数据
+            init() {
+                const new_content = this.propValue.content || {};
+                const new_style = this.propValue.style || {};
+                let new_tabs_data = JSON.parse(JSON.stringify(this.propValue));
+                new_tabs_data.content.tabs_list.unshift(new_tabs_data.content.home_data);
+                // 判断选项卡是否置顶
+                let other_style = this.propTop;
+                let new_tabs_top_style = this.propNavIsTop || this.propTabsIsTop || new_content.tabs_top_up == '1' ? (new_content.tabs_top_up == '1' ? 'top:calc(' + (this.propStickyTop > 0 ? this.propStickyTop + 'px + ' : '') + other_style * 2 + 'rpx);z-index:11;' : '') : '';
+                let new_top_up = new_content.tabs_top_up;
+                // #ifdef H5 || MP-TOUTIAO
+                // if (this.propTabsIsTop) {
+                //     other_style = '0';
+                // }
+                new_tabs_top_style = 'top:calc(' + (this.propStickyTop > 0 ? this.propStickyTop + 'px + ' : '') + other_style * 2 + 'rpx);z-index:11;';
+                new_top_up = this.propNavIsTop || this.propTabsIsTop ? new_content.tabs_top_up : '0';
+                // #endif
+                let tabs_bg = new_style.common_style.color_list;
+                let new_tabs_background = '';
+                if (!Array.isArray(tabs_bg) || tabs_bg.length === 0 || !tabs_bg[0] || !tabs_bg[0].color) {
+                    new_tabs_background = 'background:#fff;';
+                }
+                const newPropTop = this.propIsCommon ? (app.globalData.rpx_to_px(this.propTop) + this.propStickyTop) : (app.globalData.rpx_to_px(this.propTop + this.propStickyTop));
+                this.setData({
+                    tabs_data: new_tabs_data,
+                    tabs_sliding_fixed_bg: this.propIsCommon ? gradient_computer(new_style.common_style) : this.propTabsSlidingFixedBg,
+                    style_container: this.propIsCommon ? new_tabs_background + common_styles_computer(new_style.common_style) : new_content.tabs_top_up == '1' ? new_tabs_background + gradient_computer(new_style.common_style) + margin_computer(this.propSpacingCommonStyle) : '', // 如果是选项卡轮播，不需要走默认样式
+                    // 如果开了滑动置顶，并且开了沉浸式，不需要走传递过来的index，否则的话就用传递过来的index
+                    style_img_container: this.propIsCommon ? common_img_computer(new_style.common_style, this.propIndex) : new_content.tabs_top_up == '1' ? background_computer(new_style.common_style) + padding_computer(this.propSpacingCommonStyle, 1, false) + 'box-sizing: border-box;' : '', // 如果是选项卡轮播，不需要走默认样式
+                    tabs_top_style: new_tabs_top_style,
+                    // 沉浸模式下并且开通了安全距离 会显示-的margin
+                    style_margin_container: this.propIsImmersionModel && this.propNewIsTabsSafeDistance ? `margin-top: -${ newPropTop }px;` : '',
+                    // 判断是否置顶
+                    top_up: new_top_up,
+                    tabs_z_index: 'z-index: 11;'
+                });
+            },
+            // 获取选项卡高度
+            get_tabs_height() {
+                if (this.top_up == '1') {
+                    // 选择我们想要的元素
+                    const query = uni.createSelectorQuery();
+                    query
+                        .in(this)
+                        .select('.tabs-top')
+                        .boundingClientRect((res) => {
+                            if ((res || null) != null) {
+                                const newPropTop = app.globalData.rpx_to_px(this.propTop);
+                                // data包含元素的宽度、高度等信息
+                                this.setData({
+                                    tabs_seat_height: res.height + (this.propIsImmersionModel ? newPropTop + this.propStickyTop : 0),
+                                    tabs_carousel_seat_height: (res.height + (this.propIsImmersionModel ? newPropTop + this.propStickyTop : 0)) - this.propSpacingCommonStyle.padding_top - this.propSpacingCommonStyle.margin_top, // 轮播选项卡置顶时去掉顶部间距
+                                });
+                                this.$emit('onComputerHeight', this.tabs_seat_height);
+                            }
+                        })
+                        .exec();
+                } else {
+                    this.$emit('onComputerHeight', 0);
+                }
+            },
+            tabsZindex(val) {
+                this.setData({
+                    tabs_z_index: `z-index: ${ val };`
+                });
+            },
+            // 选项卡回调
+            tabs_click_event(index, item) {
+                let tabs_id = '';
+                // 抽象出获取 tabs_id 的逻辑
+                tabs_id = this.get_tabs_id(item, index);
+                // 是否是商品分类页面
+                const is_micro_page = item.data_type == '0';
+                this.$emit('onTabsTap', tabs_id, is_micro_page);
+            },
+            // 获取 tabs_id
+            get_tabs_id(item, index) {
+                if (item.data_type === '0') {
+                    return index !== 0 ? item.micro_page_list?.id : '';
+                } else {
+                    return index !== 0 ? item.classify?.id : '';
+                }
+            },
+        },
+    };
+</script>
+
+<style lang="scss" scoped>
+    .tabs-container {
+        z-index: 11;
+        .tabs-top {
+            position: fixed;
+            left: 0;
+            right: 0;
+            max-width: 100%;
+        }
+    }
+    .tabs-contents {
+        max-width: 1600rpx !important;
+    }
+    @media only screen and (min-width: 1600rpx) {
+        .tabs-container .tabs-top {
+            left: calc(50% - 400px) !important;
+        }
+    }
+</style>
diff --git a/components/diy/title.vue b/components/diy/title.vue
new file mode 100644
index 0000000..7a6615c
--- /dev/null
+++ b/components/diy/title.vue
@@ -0,0 +1,143 @@
+<template>
+    <view :style="style_container">
+        <view :style="style_img_container">
+            <view class="flex-col gap-10">
+                <view class="pr flex-row" :class="title_center">
+                    <view class="z-i flex-row align-c gap-10">
+                        <template v-if="!isEmpty(form.img_src) && !isEmpty(form.img_src[0].url)">
+                            <view class="wh-auto" :style="{'height': new_style.img_height * 2 + 'rpx' }">
+                                <image :src="form.img_src[0].url" class="ht-auto" mode="heightFix"></image>
+                            </view>
+                        </template>
+                        <template v-else-if="!isEmpty(form.icon_class)">
+                            <iconfont :name="'icon-' + form.icon_class" :size="new_style.icon_size * 2 + 'rpx'" :color="new_style.icon_color" propContainerDisplay="flex"></iconfont>
+                        </template>
+                        <view v-if="!isEmpty(form.title)" class="nowrap" :style="title_style" :data-value="!isEmpty(form.title_link) ? form.title_link.page : ''" @tap="url_event">{{ form.title }}</view>
+                        <view v-if="!isEmpty(form.subtitle) && new_style.title_line == '1'" class="text-word-break nowrap" :style="subtitle_style">{{ form.subtitle }}</view>
+                    </view>
+                    <view class="flex-row gap-10 align-c right-0 pa">
+                        <template v-if="form.keyword_show == '1'">
+                            <view class="flex-row align-c" :style="keyword_gap">
+                                <view v-for="item in keyword_list" :key="item.id" :style="keyword_style" :data-value="!isEmpty(item.link) ? item.link.page : ''" @tap="url_event">
+                                    {{ item.title }}
+                                </view>
+                            </view>
+                        </template>
+                        <view v-if="form.right_show == '1'" class="nowrap flex-row align-c" :style="right_style" :data-value="!isEmpty(form.right_link) ? form.right_link.page : ''" @tap="url_event"
+                            >{{ form.right_title }}
+                            <iconfont name="icon-arrow-right" :color="new_style.right_color" :size="new_style.right_size * 2 + 'rpx'" propContainerDisplay="flex"></iconfont>
+                        </view>
+                    </view>
+                </view>
+                <view v-if="!isEmpty(form.subtitle) && new_style.title_line != '1'" class="text-word-break" :style="subtitle_style">{{ form.subtitle }}</view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import { common_styles_computer, common_img_computer, isEmpty } from '@/common/js/common/common.js';
+    export default {
+        props: {
+            propValue: {
+                type: Object,
+                default: () => {
+                    return {};
+                },
+            },
+            propKey: {
+                type: [String,Number],
+                default: '',
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 1000000,
+            },
+        },
+        data() {
+            return {
+                form: {},
+                new_style: {},
+                style_container: '',
+                style_img_container: '',
+                title_center: '',
+                subtitle_style: '',
+                keyword_list: [],
+                keyword_style: '',
+                keyword_gap: '',
+                right_style: '',
+                right_size: '',
+            };
+        },
+        watch: {
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        created() {
+            this.init();
+        },
+        methods: {
+            // 判断是否为空
+            isEmpty,
+            // 初始化数据
+            init() {
+                const new_form = this.propValue.content;
+                const new_style = this.propValue.style;
+                
+                const { keyword_color, keyword_size, right_color, right_size, common_style, title_weight, title_color, title_size, keyword_spacing = 10 } = new_style;
+                // 标题样式设置
+                let common_styles = '';
+                if (title_weight == 'italic') {
+                    common_styles += `font-style: italic`;
+                } else if (['bold', '500'].includes(title_weight)) {
+                    common_styles += `font-weight: bold`;
+                }
+                // 是否居中
+                this.setData({
+                    form: new_form,
+                    new_style: new_style,
+                    title_center: new_form.is_title_center == '1' ? 'jc-c' : '',
+                    keyword_list: new_form.keyword_list.filter((item) => item.is_show == '1'), // 关键字
+                    keyword_style: `color:${keyword_color}; font-size: ${keyword_size * 2}rpx;`, // 关键字设置
+                    keyword_gap: !isEmpty(keyword_spacing) ? `gap: ${ keyword_spacing * 2}rpx` : 'gap: 20rpx;', // 关键字间距设置
+                    right_size: right_size * 2 + 'rpx', // 右边按钮设置
+                    right_style: `color:${right_color}; font-size: ${right_size * 2}rpx;`, //右侧按钮样式
+                    title_style: `color:${title_color}; font-size: ${title_size * 2}rpx; ${common_styles}`, // 标题样式设置
+                    subtitle_style: this.get_subtitle_style(new_style), // 副标题样式设置
+                    style_container: common_styles_computer(common_style), // 通用样式区
+                    style_img_container: common_img_computer(common_style, this.propIndex), // 通用图片样式区
+                });
+            },
+            // 副标题样式设置
+            get_subtitle_style(new_style) {
+                let common_styles = '';
+                if (new_style.subtitle_weight == 'italic') {
+                    common_styles += `font-style: italic`;
+                } else if (['bold', '500'].includes(new_style.subtitle_weight)) {
+                    common_styles += `font-weight: bold;`;
+                }
+                return `color:${new_style.subtitle_color}; font-size: ${new_style.subtitle_size * 2}rpx; ${common_styles}`;
+            },
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+        },
+    };
+</script>
+
+<style scoped lang="scss">
+    .right-0 {
+        top: 50%;
+        transform: translateY(-50%);
+    }
+
+    .break {
+        word-break: break-word;
+        overflow-wrap: break-word;
+        word-wrap: break-word;
+    }
+</style>
diff --git a/components/diy/user-info.vue b/components/diy/user-info.vue
new file mode 100644
index 0000000..5c87bf8
--- /dev/null
+++ b/components/diy/user-info.vue
@@ -0,0 +1,164 @@
+<template>
+    <!-- 用户信息 -->
+    <view :style="style_container">
+        <view :style="style_img_container">
+            <view class="pr padding-xxl" :style="style">
+                <view class="flex-row jc-sb align-c margin-bottom-xxl">
+                    <view class="flex-1 flex-row align-c gap-12">
+                        <image :src="(user_info.user || null) !== null ? user_info.user.avatar : user.avatar" class="circle" mode="widthFix" :style="'width:' + base_data.user_avatar_size * 2 + 'rpx;height:' + base_data.user_avatar_size * 2 + 'rpx;'" data-value="/pages/personal/personal" @tap="url_event" />
+                        <view class="flex-col gap-8" data-value="/pages/personal/personal" @tap="url_event">
+                            <view class="text-size fw-b" :style="user_name_style">{{ (user_info.user || null) !== null ? user_info.user.user_name_view : user.user_name_view }}</view>
+                            <view v-if="id_bool && (user_info.user || null) !== null" class="padding-horizontal-sm padding-vertical-xsss border-radius-sm" :style="number_code_style">ID:{{ user_info.user.number_code }}</view>
+                        </view>
+                    </view>
+                    <view class="flex-row align-c" :style="'gap:' + base_data.img_space * 2 + 'rpx;'">
+                        <view v-for="(item, index) in icon_setting" :key="index" :style="{ width: base_data.img_size + 'px', height: base_data.img_size + 'px' }" :data-value="item.link.page || ''" @tap="url_event">
+                            <image v-if="item.img.length > 0" :src="item.img[0].url" class="border-radius-sm" mode="scaleToFill" :style="{ width: base_data.img_size + 'px', height: base_data.img_size + 'px' }" />
+                            <iconfont v-else :name="'icon-' + item.icon" :size="base_data.img_size * 2 + 'rpx'" color="#666" propContainerDisplay="flex"></iconfont>
+                        </view>
+                    </view>
+                </view>
+                <view class="flex-row jc-sa align-c">
+                    <template v-for="(item, index) in stats_list">
+                        <view v-if="config.includes(item.id)" :key="index" class="tc" :data-value="'/pages/' + item.url + '/' + item.url" @tap="url_event">
+                            <view class="text-size fw-b margin-bottom-sm" :style="stats_number_style">{{ item.value }}</view>
+                            <view class="text-size-xs" :style="stats_name_style">{{ item.name }}</view>
+                        </view>
+                    </template>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import { common_styles_computer, common_img_computer, gradient_computer } from '@/common/js/common/common.js';
+    export default {
+        props: {
+            propValue: {
+                type: Object,
+                default: () => ({}),
+            },
+            propKey: {
+                type: [String,Number],
+                default: '',
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 1000000,
+            },
+        },
+        data() {
+            return {
+                style_container: '',
+                style_img_container: '',
+                style: '',
+                id_bool: true,
+                stats_list: [
+                    { id: 'order_count', name: '订单总数', value: '100', url: 'user-order' },
+                    { id: 'goods_favor_count', name: '商品收藏', value: '10', url: 'user-favor' },
+                    { id: 'goods_browse_count', name: '我的足迹', value: '1000', url: 'user-goods-browse' },
+                    { id: 'integral_number', name: '我的积分', value: '10000', url: 'user-integral' },
+                ],
+                config: ['order_count', 'goods_favor_count', 'goods_browse_count', 'integral_number'],
+                icon_setting: [
+                    { id: '1', img: [], icon: '', link: {} },
+                    { id: '2', img: [], icon: '', link: {} },
+                ],
+                base_data: {},
+                // 样式
+                user_name_style: '',
+                number_code_style: '',
+                stats_name_style: '',
+                stats_number_style: '',
+                // 用户信息
+                user_info: {
+                    user: null,
+                    order_count: '0',
+                    goods_favor_count: '0',
+                    goods_browse_count: '0',
+                    message_unread_count: '0',
+                    integral_number: '0',
+                },
+                user: {
+                    avatar: app.globalData.data.default_user_head_src,
+                    user_name_view: '用户名',
+                    number_code: '',
+                },
+            };
+        },
+        watch: {
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        created() {
+            this.init();
+        },
+        methods: {
+            // 初始化数据
+            init() {
+                const new_content = this.propValue.content || {};
+                const new_style = this.propValue.style || {};
+                const temp_base_data = {
+                    // 头像
+                    user_avatar_size: new_style.user_avatar_size,
+                    // 人物
+                    user_name_color: new_style.user_name_color,
+                    user_name_weight: new_style.user_name_weight,
+                    user_name_size: new_style.user_name_size,
+                    // id
+                    number_code_color_list: new_style.number_code_color_list,
+                    number_code_color: new_style.number_code_color,
+                    number_code_direction: new_style.number_code_direction,
+                    number_code_weight: new_style.number_code_weight,
+                    number_code_size: new_style.number_code_size,
+                    // 图标设置
+                    img_size: new_style.img_size,
+                    img_space: new_style.img_space,
+                    stats_name_color: new_style.stats_name_color,
+                    stats_name_weight: new_style.stats_name_weight,
+                    stats_name_size: new_style.stats_name_size,
+                    stats_number_color: new_style.stats_number_color,
+                    stats_number_weight: new_style.stats_number_weight,
+                    stats_number_size: new_style.stats_number_size,
+                };
+                // id样式
+                const new_gradient_obj = {
+                    color_list: temp_base_data.number_code_color_list,
+                    direction: temp_base_data.number_code_direction,
+                };
+                let temp_stats_list = this.stats_list;
+                temp_stats_list.map((item) => {
+                    if (new_content.config.includes(item.id)) {
+                        item.value = new_content.data[item.id];
+                    }
+                });
+                this.setData({
+                    user_info: new_content.data,
+                    config: new_content.config,
+                    icon_setting: new_content.icon_setting,
+                    base_data: temp_base_data,
+                    id_bool: new_content.config ? new_content.config.includes('number_code') : true,
+                    stats_list: temp_stats_list,
+                    // 人物名称样式
+                    user_name_style: 'color:' + temp_base_data.user_name_color + ';' + 'font-size:' + temp_base_data.user_name_size * 2 + 'rpx;' + 'font-weight:' + temp_base_data.user_name_weight + ';',
+                    number_code_style: gradient_computer(new_gradient_obj) + 'color:' + temp_base_data.number_code_color + ';' + 'font-size:' + temp_base_data.number_code_size * 2 + 'rpx;' + 'font-weight:' + temp_base_data.number_code_weight + ';',
+                    // 统计名称样式
+                    stats_name_style: 'color:' + temp_base_data.stats_name_color + ';' + 'font-size:' + temp_base_data.stats_name_size * 2 + 'rpx;' + 'font-weight:' + temp_base_data.stats_name_weight + ';',
+                    stats_number_style: 'color:' + temp_base_data.stats_number_color + ';' + 'font-size:' + temp_base_data.stats_number_size * 2 + 'rpx;' + 'font-weight:' + temp_base_data.stats_number_weight + ';',
+                    style_container: common_styles_computer(new_style.common_style),
+                    style_img_container: common_img_computer(new_style.common_style, this.propIndex),
+                });
+            },
+            // 跳转链接
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+        },
+    };
+</script>
+<style></style>
diff --git a/components/diy/video.vue b/components/diy/video.vue
new file mode 100644
index 0000000..42d4181
--- /dev/null
+++ b/components/diy/video.vue
@@ -0,0 +1,86 @@
+<template>
+    <!-- 视频 -->
+    <view :style="style_container">
+        <view :style="style_img_container">
+            <view class="video pr" :style="style">
+                <video :src="video" class="wh-auto ht-auto" :poster="video_img" objectFit="cover" style="object-fit: cover"></video>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { common_styles_computer, common_img_computer } from '@/common/js/common/common.js';
+    export default {
+        props: {
+            propValue: {
+                type: Object,
+                default: () => ({}),
+            },
+            propKey: {
+                type: [String, Number],
+                default: '',
+            },
+            // 组件渲染的下标
+            propIndex: {
+                type: Number,
+                default: 1000000,
+            },
+        },
+        data() {
+            return {
+                style_container: '',
+                style_img_container: '',
+                style: '',
+                video_img: '',
+                video: '',
+            };
+        },
+        watch: {
+            propKey(val) {
+                // 初始化
+                this.init();
+            },
+        },
+        created() {
+            this.init();
+        },
+        methods: {
+            // 初始化数据
+            init() {
+                const new_content = this.propValue.content || {};
+                const new_style = this.propValue.style || {};
+                // 视频比例
+                this.get_video_height(new_content.video_ratio);
+                this.setData({
+                    video_img: new_content.video_img.length > 0 ? new_content.video_img[0].url : '',
+                    video: new_content.video.length > 0 ? new_content.video[0].url : '',
+                    style_container: common_styles_computer(new_style.common_style),
+                    style_img_container: common_img_computer(new_style.common_style, this.propIndex),
+                });
+            },
+            // 获取视频高度
+            get_video_height(data) {
+                uni.getSystemInfo({
+                    success: (res) => {
+                        let video_ratio = ``;
+                        const width = res.windowWidth;
+                        if (data == '4:3') {
+                            video_ratio = `height: ${(((width * 3) / 4) * 2).toFixed(2)}rpx;`;
+                        } else if (data == '1:1') {
+                            video_ratio = `height: ${width * 2}rpx;`;
+                        } else {
+                            // 16:9 保留两位小数
+                            video_ratio = `height: ${(((width * 9) / 16) * 2).toFixed(2)}rpx;`;
+                        }
+                        this.setData({
+                            style: video_ratio,
+                        });
+                    },
+                });
+            },
+        },
+    };
+</script>
+
+<style></style>
diff --git a/components/emoji-popup/emoji-popup.vue b/components/emoji-popup/emoji-popup.vue
new file mode 100644
index 0000000..eeda676
--- /dev/null
+++ b/components/emoji-popup/emoji-popup.vue
@@ -0,0 +1,95 @@
+<template>
+    <view :class="theme_view">
+        <component-popup :propShow="popup_status" propPosition="bottom" @onclose="popup_close_event">
+            <view class="emoji-popup bg-white">
+                <view class="close fr oh">
+                    <view class="fr" @tap.stop="popup_close_event">
+                        <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                    </view>
+                </view>
+                <view class="emoji-popup-content oh tc">
+                    <block v-if="emoji_list.length > 0">
+                        <block v-for="(item, index) in emoji_list" :key="index">
+                            <view class="emoji-item fl bs-bb text-size-xxxl" @tap="choice_confirm_event" :data-value="item.emoji">{{item.emoji}}</view>
+                        </block>
+                    </block>
+                </view>
+            </view>
+        </component-popup>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    var common_static_url = app.globalData.get_static_url('common');
+    import componentPopup from "@/components/popup/popup";
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                popup_status: false,
+                emoji_list: []
+            };
+        },
+
+        components: {
+            componentPopup
+        },
+
+        created: function() {},
+
+        methods: {
+            // 初始配置
+            init(config = {}) {
+                if(!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                this.setData({
+                    popup_status: config.status == undefined ? true : config.status,
+                    emoji_list: config.emoji_list || [],
+                });
+            },
+
+            // 弹层关闭
+            popup_close_event(e) {
+                this.setData({
+                    popup_status: false
+                });
+            },
+
+            // 选择确认事件
+            choice_confirm_event(e) {            
+                // 关闭弹窗
+                this.setData({
+                    popup_status: false
+                });
+            
+                // 调用父级
+                this.$emit('choiceConfirmEvent', e.currentTarget.dataset.value);
+            }
+        }
+    };
+</script>
+<style>
+    .emoji-popup {
+        padding: 20rpx 10rpx 0 10rpx;
+        position: relative;
+    }
+    .emoji-popup .close {
+        position: absolute;
+        top: 20rpx;
+        right: 20rpx;
+        z-index: 2;
+    }
+    .emoji-popup-content {
+        max-height: 50vh;
+        overflow-y: scroll;
+        overflow-x: hidden;
+        margin-top: 20rpx;
+    }
+    .emoji-popup-content .emoji-item {
+        height: 130rpx;
+        line-height: 130rpx;
+        width: 25%;
+    }
+</style>
\ No newline at end of file
diff --git a/components/goods-batch-buy/goods-batch-buy.vue b/components/goods-batch-buy/goods-batch-buy.vue
new file mode 100644
index 0000000..3ba32af
--- /dev/null
+++ b/components/goods-batch-buy/goods-batch-buy.vue
@@ -0,0 +1,576 @@
+<template>
+    <view :class="theme_view">
+        <component-popup :propShow="popup_status" propPosition="bottom" @onclose="popup_close_event">
+            <view class="bg-white">
+                <view class="close oh padding-horizontal-main padding-top-main">
+                    <view class="fr" @tap.stop="popup_close_event">
+                        <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                    </view>
+                </view>
+                <view class="plugins-batchbuy-container">
+                    <!-- 批发规则 -->
+                    <view v-if="(plugins_wholesale_data || null) != null" class="padding-main br-b-f5">
+                        <component-wholesale-rules :propCurrencySymbol="propCurrencySymbol" :propData="plugins_wholesale_data"></component-wholesale-rules>
+                    </view>
+                    <!-- 下单规格选择 -->
+                    <view v-if="(goods || null) != null && (batchbuy_data || null) != null && (batchbuy_data.goods_spec_data || null) != null && batchbuy_data.goods_spec_data.length > 0" :class="'spec-data-content oh '+((plugins_wholesale_data || null) != null ? 'wholesale' : '')">
+                        <block v-if="batchbuy_data.is_only_level_one == 0">
+                            <view class="left-nav ht-auto bg-base fl">
+                                <scroll-view :scroll-y="true" class="ht-auto">
+                                    <block v-for="(item, index) in batchbuy_data.goods_spec_data" :key="index">
+                                        <view :class="'padding-vertical-main tc cp oh pr ' + (nav_active_index == index ? 'bg-white cr-main' : '')" :data-index="index" @tap="nav_event">
+                                            <block v-if="(item.images || null) != null">
+                                                <image class="dis-inline-block br-f5 radius dis-block spec-images" :src="item.images" mode="widthFix"></image>
+                                                <view class="icon-enlarge-submit pa padding-xs lh-sm radius" :data-value="item.images" @tap="spec_images_view_event">
+                                                    <iconfont name="icon-enlarge" size="26rpx" color="#fff" propClass="lh-sm"></iconfont>
+                                                </view>
+                                            </block>
+                                            <view class="cr-base">{{ item.name }}</view>
+                                            <view v-if="(item.badge_total || 0) > 0" class="badge-icon pa">
+                                                <component-badge :propNumber="item.badge_total"></component-badge>
+                                            </view>
+                                        </view>
+                                    </block>
+                                </scroll-view>
+                            </view>
+                            <view class="right-conent ht-auto bs-bb fr">
+                                <scroll-view :scroll-y="true" class="ht-auto">
+                                    <block v-for="(item, index) in batchbuy_data.goods_spec_data[nav_active_index]['data']" :key="index">
+                                        <view class="padding-main oh">
+                                            <view class="fl item-left">
+                                                <view class="text-size-xs">{{ item.name }}</view>
+                                                <view class="sales-price text-size-xs">{{ propCurrencySymbol }}{{ item.base.price }}</view>
+                                            </view>
+                                            <text v-if="(item.base.inventory || 0) == 0" class="fr text-size-xs cr-grey">{{$t('goods-batch-buy.goods-batch-buy.dsfd98')}}</text>
+                                            <view v-else class="tc oh round fr item-right text-size-xs">
+                                                <view @tap="batchbuy_goods_buy_number_event" class="number-submit tc cr-grey fl va-m" data-type="0" :data-index="index">-</view>
+                                                <input @blur="batchbuy_goods_buy_number_blur" class="number-input tc cr-grey bg-white fl va-m radius-0" type="number" :value="item.buy_number || 0" :data-index="index" />
+                                                <view @tap="batchbuy_goods_buy_number_event" class="number-submit tc cr-grey fl va-m" data-type="1" :data-index="index">+</view>
+                                            </view>
+                                        </view>
+                                    </block>
+                                </scroll-view>
+                            </view>
+                        </block>
+                        <block v-else>
+                            <view class="right-conent ht-auto padding-main bs-bb right-conent-only-level-one">
+                                <scroll-view :scroll-y="true" class="ht-auto">
+                                    <block v-for="(item, index) in batchbuy_data.goods_spec_data" :key="index">
+                                        <view class="oh padding-vertical-main">
+                                            <view class="fl item-left">
+                                                <view class="pr">
+                                                    <block v-if="(item.images || null) != null">
+                                                        <image class="dis-inline-block va-m br-f5 radius margin-right-sm spec-images" :src="item.images" mode="widthFix"></image>
+                                                        <view class="icon-enlarge-submit pa padding-xs lh-sm radius" :data-value="item.images" @tap="spec_images_view_event">
+                                                            <iconfont name="icon-enlarge" size="26rpx" color="#fff" propClass="lh-sm"></iconfont>
+                                                        </view>
+                                                    </block>
+                                                    <text class="text-size-xs va-m">{{ item.name }}</text>
+                                                </view>
+                                                <view class="sales-price text-size-xs margin-top-xs">{{ propCurrencySymbol }}{{ item.base.price }}</view>
+                                            </view>
+                                            <text v-if="(item.base.inventory || 0) == 0" class="fr text-size-xs cr-grey">{{$t('goods-batch-buy.goods-batch-buy.dsfd98')}}</text>
+                                            <view v-else :class="'tc oh round fr item-right text-size-xs margin-top'+((item.images || null) == null ? 'xs' : '')">
+                                                <view @tap="batchbuy_goods_buy_number_event" class="number-submit tc cr-grey fl va-m" data-type="0" :data-index="index">-</view>
+                                                <input @blur="batchbuy_goods_buy_number_blur" class="tc cr-grey bg-white fl va-m radius-0" type="number" :value="item.buy_number || 0" :data-index="index" />
+                                                <view @tap="batchbuy_goods_buy_number_event" class="number-submit tc cr-grey fl va-m" data-type="1" :data-index="index">+</view>
+                                            </view>
+                                        </view>
+                                    </block>
+                                </scroll-view>
+                            </view>
+                        </block>
+                        <view class="confirm-submit pa wh-auto bottom-line-exclude bg-white padding-top-main br-t-f5">
+                            <view class="oh padding-horizontal-main padding-bottom-main cr-grey">
+                                <text class="text-size-xs">
+                                    <text>{{$t('buy.buy.g2vt78')}}</text>
+                                    <text class="cr-red padding-left-xs padding-right-xs">{{ base_data.kind }}</text>
+                                    <text>{{$t('goods-batch-buy.goods-batch-buy.9ectyf')}}</text>
+                                    <text class="cr-red padding-left-xs padding-right-xs">{{ base_data.quantity }}</text>
+                                    <text>{{ goods.inventory_unit }}</text>
+                                </text>
+                                <text class="text-size-xs fr">{{$t('goods-batch-buy.goods-batch-buy.geq82x')}}<text class="fw-b sales-price">{{ propCurrencySymbol }}{{ base_data.amount_money }}</text></text>
+                            </view>
+                            <view v-if="(opt_button || null) != null && opt_button.length > 0" class="padding-bottom-main">
+                                <view :class="'oh buy-nav-btn-number-' + (opt_button.length || 0)">
+                                    <block v-for="(item, index) in opt_button" :key="index">
+                                        <view v-if="(item.name || null) != null && (item.type || null) != null" class="item fl bs-bb padding-horizontal-main">
+                                            <button :class="'cr-white round text-size-sm bg-' + ((item.color || 'main') == 'main' ? 'main' : 'main-pair')" type="default" @tap="confirm_event" :data-type="item.type" hover-class="none">{{ item.name }}</button>
+                                        </view>
+                                    </block>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                    <block v-else>
+                        <view class="cr-grey tc padding-top-xl padding-bottom-xxxl">{{$t('goods-batch-buy.goods-batch-buy.ypby1k')}}</view>
+                    </block>
+                </view>
+            </view>
+        </component-popup>
+    </view>
+</template>
+<script>
+const app = getApp();
+import base64 from "@/common/js/lib/base64.js";
+import componentPopup from "@/components/popup/popup";
+import componentBadge from "@/components/badge/badge";
+import componentWholesaleRules from '@/components/wholesale-rules/wholesale-rules';
+export default {
+    data() {
+        return {
+            theme_view: app.globalData.get_theme_value_view(),
+            popup_status: false,
+            nav_active_index: 0,
+            goods: null,
+            batchbuy_data: null,
+            back_data: null,
+            opt_button: [],
+            base_data: {
+                kind: 0,
+                quantity: 0,
+                amount_money: "0.00",
+            },
+            // 批发数据
+            plugins_wholesale_data: null,
+        };
+    },
+
+    components: {
+        componentPopup,
+        componentBadge,
+        componentWholesaleRules
+    },
+    
+    props: {
+        // 价格符号
+        propCurrencySymbol: {
+            type: String,
+            default: app.globalData.currency_symbol(),
+        },
+        // 批发数据
+        propPluginsWholesaleData: {
+            type: [Array, Object],
+            default: null,
+        }
+    },
+
+    // 页面被展示
+    created: function () {
+        this.setData({
+            plugins_wholesale_data: this.propPluginsWholesaleData,
+        });
+    },
+
+    methods: {
+        // 初始化
+        init(params = {}) {
+            if (!app.globalData.is_single_page_check()) {
+                return false;
+            }
+
+            // 购买按钮处理，仅展示购买和购物车
+            var opt_button = [];
+            var buy_button = params.buy_button || null;
+            if(buy_button != null && (buy_button.data || null) != null && buy_button.data.length > 0) {
+                var arr = ['plugins-batchbuy-button-cart', 'plugins-batchbuy-button-buy'];
+                for(var i in buy_button.data) {
+                    if(arr.indexOf(buy_button.data[i]['type']) != -1) {
+                        opt_button.push(buy_button.data[i]);
+                    }
+                }
+            }
+
+            // 设置数据
+            this.setData({
+                popup_status: true,
+                opt_button: opt_button,
+                goods: params.goods || null,
+                batchbuy_data: params.batchbuy_data || null,
+                back_data: params.back_data || null,
+                plugins_wholesale_data: params.plugins_wholesale_data || null
+            });
+        },
+
+        // 弹层关闭
+        popup_close_event(e) {
+            this.setData({
+                popup_status: false,
+            });
+        },
+
+        // 弹层导航切换
+        nav_event(e) {
+            this.setData({
+                nav_active_index: e.currentTarget.dataset.index,
+            });
+        },
+
+        // 商品批量下单数量操作事件
+        batchbuy_goods_buy_number_event(e) {
+            var type = e.currentTarget.dataset.type;
+            var index = e.currentTarget.dataset.index;
+            var temp_data = this.batchbuy_data;
+            var temp_spec_data = parseInt(temp_data.is_only_level_one || 0) == 1 ? temp_data.goods_spec_data[index] : temp_data.goods_spec_data[this.nav_active_index]["data"][index];
+            var number = parseInt(temp_spec_data.buy_number || 0);
+            var min = parseInt(temp_spec_data.base.buy_min_number || 0);
+            // 首次增加使用起购数量
+            number = type == 0 ? number - 1 : number == 0 && min > 0 ? min : number + 1;
+            this.batch_goods_buy_number_handle(temp_data, temp_spec_data, index, number);
+        },
+
+        // 商品批量下单数量输入事件
+        batchbuy_goods_buy_number_blur(e) {
+            var number = parseInt(e.detail.value) || 0;
+            var index = e.currentTarget.dataset.index;
+            var temp_data = this.batchbuy_data;
+            var temp_spec_data = parseInt(temp_data.is_only_level_one || 0) == 1 ? temp_data.goods_spec_data[index] : temp_data.goods_spec_data[this.nav_active_index]["data"][index];
+            if (isNaN(number)) {
+                number = 0;
+            }
+            this.batch_goods_buy_number_handle(temp_data, temp_spec_data, index, number);
+        },
+
+        // 商品批量下单数量处理
+        batch_goods_buy_number_handle(temp_data, temp_spec_data, index, number) {
+            var min = parseInt(temp_spec_data.base.buy_min_number || 0);
+            var max = parseInt(temp_spec_data.base.buy_max_number || 0);
+            var inventory = parseInt(temp_spec_data.base.inventory || 0);
+            var inventory_unit = this.goods.inventory_unit;
+
+            // 是否负数
+            if (number < 0) {
+                number = 0;
+            }
+            // 不能小于起购数则0
+            if (number > 0 && min > 0 && number < min) {
+                number = 0;
+                app.globalData.showToast(this.$t('recommend-detail.recommend-detail.265vyu') + min + inventory_unit);
+            }
+            // 不能超过最大限购
+            if (max > 0 && number > max) {
+                number = max;
+                app.globalData.showToast(this.$t('goods-category.goods-category.z1eh3v') + max + inventory_unit);
+            }
+            // 不能超过库存
+            if (number > inventory) {
+                number = inventory;
+                app.globalData.showToast(this.$t('recommend-detail.recommend-detail.2sis3v') + inventory + inventory_unit);
+            }
+            temp_spec_data["buy_number"] = number;
+            if (parseInt(temp_data.is_only_level_one || 0) == 1) {
+                temp_data.goods_spec_data[index] = temp_spec_data;
+            } else {
+                temp_data.goods_spec_data[this.nav_active_index]["data"][index] = temp_spec_data;
+            }
+
+            // 非仅一级则处理一级总数
+            if (parseInt(temp_data.is_only_level_one || 0) != 1) {
+                var badge_total = 0;
+                temp_data.goods_spec_data[this.nav_active_index]["data"].forEach((item) => {
+                    var temp_badge = parseInt(item.buy_number || 0);
+                    if (temp_badge > 0) {
+                        badge_total += temp_badge;
+                    }
+                });
+                temp_data.goods_spec_data[this.nav_active_index]["badge_total"] = badge_total;
+            }
+
+            // 总数、汇总
+            var stock_total = 0;
+            var kind_total = 0;
+            var amount_money_total = 0;
+            temp_data.goods_spec_data.forEach((item) => {
+                if (parseInt(temp_data.is_only_level_one || 0) == 1) {
+                    var temp_stock = parseInt(item.buy_number || 0);
+                    if (temp_stock > 0) {
+                        stock_total += temp_stock;
+                        kind_total += 1;
+                        amount_money_total += temp_stock * parseFloat(item.base.price);
+                    }
+                } else {
+                    item.data.forEach((item2) => {
+                        var temp_stock = parseInt(item2.buy_number || 0);
+                        if (temp_stock > 0) {
+                            stock_total += temp_stock;
+                            kind_total += 1;
+                            amount_money_total += temp_stock * parseFloat(item2.base.price);
+                        }
+                    });
+                }
+            });
+
+            // 设置数据
+            this.setData({
+                batchbuy_data: temp_data,
+                base_data: {
+                    kind: kind_total,
+                    quantity: stock_total,
+                    amount_money: app.globalData.price_two_decimal(amount_money_total),
+                },
+            });
+
+            // 下单数据
+            var goods_data = [];
+            var goods_id = this.goods.id;
+            temp_data.goods_spec_data.forEach((item) => {
+                if (parseInt(temp_data.is_only_level_one || 0) == 1) {
+                    goods_data.push({
+                        id: goods_id,
+                        stock: stock_total,
+                        spec: item.spec || "",
+                    });
+                } else {
+                    item.data.forEach((item2) => {
+                        goods_data.push({
+                            id: goods_id,
+                            stock: stock_total,
+                            spec: item2.spec || "",
+                        });
+                    });
+                }
+            });
+
+            // 数量更新获取最新数据
+            uni.request({
+                url: app.globalData.get_request_url("stock", "goods"),
+                method: "POST",
+                data: { goods_data: goods_data },
+                dataType: "json",
+                success: (res) => {
+                    if (res.data.code == 0) {
+                        var plugins_wholesale_data = null;
+                        res.data.data.forEach((item) => {
+                            if (item.code == 0) {
+                                // 批发数据
+                                if((item.data.plugins_wholesale_data || null) != null && temp_spec_data.base_id == item.data.spec_base.id) {
+                                    plugins_wholesale_data = item.data.plugins_wholesale_data;
+                                }
+                                // 规格数据处理
+                                for (var i1 in temp_data.goods_spec_data) {
+                                    if (parseInt(temp_data.is_only_level_one || 0) == 1) {
+                                        if (temp_data.goods_spec_data[i1].base.id == item.data.spec_base.id) {
+                                            temp_data.goods_spec_data[i1].base.price = item.data.spec_base.price;
+                                            temp_data.goods_spec_data[i1].base.original_price = item.data.spec_base.original_price;
+                                            temp_data.goods_spec_data[i1].base.inventory = item.data.spec_base.inventory;
+                                        }
+                                    } else {
+                                        for (var i2 in temp_data.goods_spec_data[i1].data) {
+                                            if (temp_data.goods_spec_data[i1].data[i2].base.id == item.data.spec_base.id) {
+                                                temp_data.goods_spec_data[i1].data[i2].base.price = item.data.spec_base.price;
+                                                temp_data.goods_spec_data[i1].data[i2].base.original_price = item.data.spec_base.original_price;
+                                                temp_data.goods_spec_data[i1].data[i2].base.inventory = item.data.spec_base.inventory;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        });
+                        this.setData({
+                            batchbuy_data: temp_data,
+                            plugins_wholesale_data: plugins_wholesale_data,
+                        });
+                        
+                        // 调用父级
+                        this.$emit("BatchStockSuccessEvent", {
+                            current_spec: temp_spec_data,
+                            goods_data: goods_data,
+                            back_data: res.data.data,
+                            plugins_wholesale_data: plugins_wholesale_data,
+                        });
+                    } else {
+                        app.globalData.showToast(res.data.msg);
+                    }
+                },
+                fail: () => {
+                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                },
+            });
+        },
+
+        // 确认事件
+        confirm_event(e) {
+            var user = app.globalData.get_user_info(this, "confirm_event", e);
+            if (user != false) {
+                // 获取数据
+                var goods_data = [];
+                var goods_id = this.goods.id;
+                this.batchbuy_data.goods_spec_data.forEach((item) => {
+                    if (parseInt(this.batchbuy_data.is_only_level_one || 0) == 1) {
+                        var buy_number = parseInt(item.buy_number || 0);
+                        if (buy_number > 0) {
+                            goods_data.push({
+                                goods_id: goods_id,
+                                stock: buy_number,
+                                spec: item.spec || "",
+                            });
+                        }
+                    } else {
+                        item.data.forEach((item2) => {
+                            var buy_number = parseInt(item2.buy_number || 0);
+                            if (buy_number > 0) {
+                                goods_data.push({
+                                    goods_id: goods_id,
+                                    stock: buy_number,
+                                    spec: item2.spec || "",
+                                });
+                            }
+                        });
+                    }
+                });
+                if (goods_data.length <= 0) {
+                    app.globalData.showToast(this.$t('goods-detail.goods-detail.6brk57'));
+                    return false;
+                }
+
+                // 操作类型
+                switch (e.currentTarget.dataset.type) {
+                    case "plugins-batchbuy-button-buy":
+                        // 进入订单确认页面
+                        var data = {
+                            buy_type: "goods",
+                            goods_data: encodeURIComponent(base64.encode(JSON.stringify(goods_data))),
+                        };
+                        app.globalData.url_open("/pages/buy/buy?data=" + encodeURIComponent(base64.encode(JSON.stringify(data))));
+                        this.popup_close_event();
+                        break;
+
+                    // 加入购物车
+                    case "plugins-batchbuy-button-cart":
+                        this.goods_cart_event(goods_data);
+                        break;
+
+                    default:
+                        app.globalData.showToast(this.$t('goods-batch-buy.goods-batch-buy.7tp1tc'));
+                }
+            }
+        },
+
+        // 加入购物车事件
+        goods_cart_event(goods_data) {
+            uni.showLoading({
+                title: this.$t('common.processing_in_text'),
+            });
+            uni.request({
+                url: app.globalData.get_request_url("save", "cart"),
+                method: "POST",
+                data: { goods_data: goods_data },
+                dataType: "json",
+                success: (res) => {
+                    uni.hideLoading();
+                    if (res.data.code == 0) {
+                        app.globalData.showToast(res.data.msg, "success");
+
+                        // 调用父级
+                        this.$emit("BatchCartSuccessEvent", {
+                            cart_number: res.data.data.buy_number,
+                            back_data: this.back_data,
+                        });
+
+                        // 关闭购买弹窗窗口
+                        this.popup_close_event();
+                    } else {
+                        if (app.globalData.is_login_check(res.data, this, "confirm_event")) {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    }
+                },
+                fail: () => {
+                    uni.hideLoading();
+                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                },
+            });
+        },
+
+        // 规格图片预览事件
+        spec_images_view_event(e) {
+            var value = e.currentTarget.dataset.value || null;
+            if (value != null) {
+                uni.previewImage({
+                    current: value,
+                    urls: [value],
+                });
+            }
+        }
+    },
+};
+</script>
+<style>
+    .plugins-batchbuy-container {
+        height: 70vh;
+        padding-bottom: 160rpx;
+    }
+    .plugins-batchbuy-container .spec-data-content {
+        height: calc(100% - 15rpx);
+    }
+    .plugins-batchbuy-container .spec-data-content.wholesale {
+        height: calc(100% - 160rpx);
+    }
+    .plugins-batchbuy-container .left-nav {
+        width: 200rpx;
+    }
+    .plugins-batchbuy-container .left-nav .badge-icon {
+        top: 8rpx;
+        right: 36rpx;
+    }
+    .plugins-batchbuy-container .left-nav .spec-images {
+        width: 100rpx;
+        height: 100rpx !important;
+    }
+    .plugins-batchbuy-container .icon-enlarge-submit {
+        left: 55rpx;
+        top: 30rpx;
+        background: rgb(0, 0, 0, 30%);
+    }
+    .plugins-batchbuy-container .right-conent {
+        width: calc(100% - 210rpx);
+    }
+    .plugins-batchbuy-container .right-conent .item-left {
+        width: calc(100% - 290rpx);
+    }
+    .plugins-batchbuy-container .item-right {
+        background: #fbfbfb;
+        border: 1px solid #f0f0f0;
+    }
+    .plugins-batchbuy-container .item-right .number-submit {
+        width: 80rpx;
+        font-weight: bold;
+    }
+    .plugins-batchbuy-container .item-right .number-input {
+        width: 50px;
+    }
+    .plugins-batchbuy-container .item-right .number-submit,
+    .plugins-batchbuy-container .item-right .number-input {
+        padding: 0;
+        height: 60rpx;
+        line-height: 60rpx;
+    }
+    .plugins-batchbuy-container .right-conent-only-level-one {
+        width: 100%;
+    }
+    .plugins-batchbuy-container .right-conent-only-level-one .spec-images {
+        width: 100rpx;
+        height: 100rpx !important;
+    }
+    .plugins-batchbuy-container .right-conent-only-level-one .icon-enlarge-submit {
+        left: 5rpx;
+        top: 5rpx;
+    }
+    .plugins-batchbuy-container .confirm-submit {
+        left: 0;
+        bottom: 0;
+    }
+    .plugins-batchbuy-container .buy-nav-btn-number-0 .item,
+    .plugins-batchbuy-container .buy-nav-btn-number-1 .item {
+        width: 100% !important;
+    }
+    .plugins-batchbuy-container .buy-nav-btn-number-2 .item {
+        width: 50% !important;
+    }
+    .plugins-batchbuy-container .buy-nav-btn-number-3 .item {
+        width: 33.33% !important;
+    }
+    .plugins-batchbuy-container .buy-nav-btn-number-4 .item {
+        width: 25% !important;
+    }
+</style>
diff --git a/components/goods-buy/goods-buy.vue b/components/goods-buy/goods-buy.vue
new file mode 100644
index 0000000..45dbd78
--- /dev/null
+++ b/components/goods-buy/goods-buy.vue
@@ -0,0 +1,945 @@
+<template>
+    <view :class="theme_view" class="z-i-deep">
+        <component-popup :propShow="popup_status" propPosition="bottom" @onclose="popup_close_event" :propIndex="propIndex">
+            <view class="goods-spec-choice-container padding-main bg-white pr">
+                <view class="close fr oh">
+                    <view class="fr" @tap.stop="popup_close_event">
+                        <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                    </view>
+                </view>
+                <!-- 规格基础信息 -->
+                <view class="goods-spec-base oh br-b pr">
+                    <image :src="goods_spec_base_images" mode="scaleToFill" class="spec-images radius br" @tap="goods_detail_images_view_event" :data-value="goods_spec_base_images"></image>
+                    <view class="goods-spec-base-content">
+                        <view class="goods-price">
+                            <view v-if="(goods.show_field_price_status || 0) == 1">
+                                <text class="sales-price va-m">{{ goods.show_price_symbol }}{{ goods_spec_base_price }}</text>
+                                <text class="cr-grey text-size-xs va-m">{{ goods.show_price_unit }}</text>
+                            </view>
+                            <view v-if="(goods.show_field_original_price_status || 0) == 1 && (goods_spec_base_original_price || null) != null && goods_spec_base_original_price != 0" class="original-price margin-top-sm">{{ goods.show_original_price_symbol }}{{ goods_spec_base_original_price }}{{ goods.show_original_price_unit }}</view>
+                        </view>
+                        <view v-if="(goods.show_inventory_status || 0) == 1" class="inventory text-size-xs margin-top">
+                            <text class="cr-grey">{{ $t('goods-detail.goods-detail.1s79t4') }}</text>
+                            <text class="cr-base">{{ goods_spec_base_inventory }}</text>
+                            <text class="cr-grey">{{ goods.inventory_unit }}</text>
+                        </view>
+                    </view>
+                </view>
+                <block v-if="(goods.is_exist_many_spec || 0) == 1 && goods_spec_choose.length == 0">
+                    <view class="padding-top-xxxl padding-bottom-xxxl tc cr-red">{{ $t('goods-buy.goods-buy.ufdm25') }}</view>
+                </block>
+                <block v-else>
+                    <view class="goods-spec-choice-content">
+                        <!-- 商品规格 -->
+                        <view v-if="goods_spec_choose.length > 0" class="goods-spec-choose">
+                            <view v-for="(item, key) in goods_spec_choose" :key="key" class="item padding-top-xxl padding-bottom-xxl">
+                                <view class="text-size-sm">{{ item.name }}</view>
+                                <view v-if="item.value.length > 0" class="spec margin-top-sm">
+                                    <block v-for="(items, keys) in item.value" :key="keys">
+                                        <button @tap.stop="goods_spec_choice_event" :data-key="key" :data-keys="keys" type="default" size="mini" hover-class="none" :class="'spec-btn round ' + items.is_active + ' ' + items.is_dont + ' ' + items.is_disabled">
+                                            <image v-if="(items.images || null) != null" :src="items.images" mode="scaleToFill" class="spec-images va-m dis-inline-block round margin-right-sm"></image>
+                                            <text class="va-m">{{ items.name }}</text>
+                                        </button>
+                                    </block>
+                                </view>
+                            </view>
+                        </view>
+
+                        <!-- 购买数量 -->
+                        <view class="goods-buy-number oh pr margin-top-xl margin-bottom-xxl">
+                            <view class="fl margin-top">{{ $t('goods-buy.goods-buy.737wzz') }}</view>
+                            <view class="number-content tc oh round">
+                                <view @tap="goods_buy_number_event" class="number-submit tc cr-grey fl va-m" data-type="0">-</view>
+                                <input @blur="goods_buy_number_blur" class="number-input tc cr-grey bg-white fl va-m radius-0" type="number" :value="buy_number" />
+                                <view @tap="goods_buy_number_event" class="number-submit tc cr-grey fl va-m" data-type="1">+</view>
+                            </view>
+                        </view>
+                    </view>
+                    <view v-if="(opt_button || null) != null && opt_button.length > 0" class="padding-bottom-main">
+                        <view :class="'oh buy-nav-btn-number-' + (opt_button.length || 0)">
+                            <block v-for="(item, index) in opt_button" :key="index">
+                                <view v-if="(item.name || null) != null && (item.type || null) != null" class="item fl bs-bb padding-horizontal-main">
+                                    <button :class="'cr-white round text-size-sm bg-' + ((item.color || 'main') == 'main' ? 'main' : 'main-pair')" type="default" @tap="spec_confirm_event" :data-value="item.value" :data-type="item.type" :data-business="item.business || ''" hover-class="none">{{ item.name }}</button>
+                                </view>
+                            </block>
+                        </view>
+                    </view>
+                    <button v-else class="bg-main br-main cr-white text-size-sm round" type="default" @tap.stop="spec_confirm_event" hover-class="none">{{ $t('index.index.7w75zb') }}</button>
+                </block>
+            </view>
+        </component-popup>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import base64 from '@/common/js/lib/base64.js';
+    import componentPopup from '@/components/popup/popup';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                params: {},
+                back_data: {},
+                popup_status: false,
+                goods_spec_base_price: 0,
+                goods_spec_base_original_price: 0,
+                goods_spec_base_inventory: 0,
+                goods_spec_base_buy_min_number: 0,
+                goods_spec_base_buy_max_number: 0,
+                goods_spec_base_images: '',
+                goods: {},
+                goods_spec_choose: [],
+                buy_number: 1,
+                buy_event_type: 'cart',
+                opt_button: [],
+                is_direct_cart: 0,
+                is_success_tips: 1,
+                // 选中规格临时定时变量
+                spec_selected_timer: null,
+                spec_selected_timerout: null,
+                // 智能工具插件
+                plugins_intellectstools_config: app.globalData.get_config('plugins_base.intellectstools.data'),
+            };
+        },
+
+        components: {
+            componentPopup,
+        },
+        props: {
+            propParams: {
+                type: [String, Object],
+                default: () => {
+                    return {};
+                },
+            },
+            propCurrencySymbol: {
+                type: String,
+                default: app.globalData.currency_symbol(),
+            },
+            // 弹窗层级
+            propIndex: {
+                type: Number,
+                default: 100,
+            },
+        },
+
+        created: function () {},
+
+        methods: {
+            // 初始化
+            init(goods = {}, params = {}, back_data = null) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                params = params || {};
+
+                // 状态默认开启弹窗
+                var status = true;
+                // 商品可选规格
+                var goods_spec_choose = (goods.specifications || null) != null ? goods.specifications.choose || [] : [];
+                // 无规格是否直接操作
+                var is_direct_cart = 0;
+                if ((params.is_direct_cart || 0) == 1 && parseInt(goods.is_exist_many_spec || 0) == 0 && goods_spec_choose.length == 0) {
+                    status = false;
+                    is_direct_cart = 1;
+                }
+                // 是否成功提示、默认提示
+                var is_success_tips = params.is_success_tips == undefined ? 1 : params.is_success_tips || 0;
+                // 直接加购、并且用户已经存在购物车则依次+1
+                if (is_direct_cart == 1 && parseInt(goods.user_cart_count || 0) > 0) {
+                    var buy_number = 1;
+                } else {
+                    var buy_number = goods.buy_min_number || 1;
+                }
+
+                // 购买按钮处理，仅展示购买和购物车
+                var opt_button = [];
+                var buy_button = params.buy_button || null;
+                if (buy_button != null && (buy_button.data || null) != null && buy_button.data.length > 0) {
+                    var arr = ['buy', 'cart', 'show'];
+                    for (var i in buy_button.data) {
+                        if (arr.indexOf(buy_button.data[i]['type']) != -1) {
+                            opt_button.push(buy_button.data[i]);
+                        }
+                    }
+                }
+
+                // 设置数据
+                this.setData({
+                    popup_status: status,
+                    params: params || {},
+                    back_data: back_data,
+                    goods: goods || {},
+                    goods_spec_choose: goods_spec_choose,
+                    goods_spec_base_price: goods.price,
+                    goods_spec_base_original_price: goods.original_price || 0,
+                    goods_spec_base_inventory: goods.inventory,
+                    goods_spec_base_images: goods.images,
+                    buy_number: buy_number,
+                    buy_event_type: params.buy_event_type || 'cart',
+                    opt_button: opt_button,
+                    is_direct_cart: is_direct_cart,
+                    is_success_tips: is_success_tips,
+                });
+
+                // 初始化不能选择规格处理
+                this.spec_handle_dont(0, 1);
+
+                // 获取规格详情
+                this.get_spec_detail();
+
+                // 规格选中处理
+                this.selected_spec_handle();
+
+                // 是否直接操作加入购物车
+                if (is_direct_cart) {
+                    this.spec_confirm_event();
+                }
+            },
+
+            // 规格选中处理
+            selected_spec_handle() {
+                var temp_spec_choose = this.goods_spec_choose;
+                if (temp_spec_choose.length > 0) {
+                    // 是否已选择
+                    var active_count = 0;
+                    for (var i in temp_spec_choose) {
+                        for (var k in temp_spec_choose[i]['value']) {
+                            if ((temp_spec_choose[i]['value'][k]['is_active'] || null) != null) {
+                                active_count++;
+                            }
+                        }
+                    }
+                    if (active_count > 0) {
+                        return false;
+                    }
+
+                    // 是否指定规格初始化
+                    var spec = (this.propParams || null) != null && (this.propParams.spec || null) != null ? this.propParams.spec : null;
+                    if (spec != null) {
+                        this.appoint_selected_spec_handle(temp_spec_choose, spec);
+                    } else {
+                        // 是否默认选中第一个规格、、已存在指定规格初始化则不走默认选择第一个规格
+                        this.plugins_intellectstools_selected_spec_handle(temp_spec_choose);
+                    }
+                }
+            },
+
+            // 指定规格初始化
+            appoint_selected_spec_handle(spec_choose, spec) {
+                spec = decodeURIComponent(spec).split('|');
+                if (spec.length == spec_choose.length) {
+                    // 选择处理
+                    var self = this;
+                    // 销毁之前的任务
+                    clearInterval(self.spec_selected_timer);
+                    clearInterval(self.spec_selected_timerout);
+                    // 必须存在购买和加入购物车任意一个、规格必须多个
+                    var sku_count = app.globalData.get_length(spec_choose);
+                    // 先清除价格展示信息
+                    self.setData({
+                        goods_spec_base_price: '...',
+                        goods_spec_base_original_price: '...',
+                    });
+                    var num = 0;
+                    var timer = setInterval(function () {
+                        for (var i in spec_choose) {
+                            // 清除价格展示信息、避免获取价格类型赋值
+                            self.setData({
+                                goods_spec_base_price: '...',
+                                goods_spec_base_original_price: '...',
+                            });
+                            // 必须不存在已选择项
+                            var active =
+                                spec_choose[i]['value']
+                                    .map(function (v) {
+                                        return v.is_active;
+                                    })
+                                    .join('') || null;
+                            if (active == null) {
+                                // 不能选择规格处理
+                                self.spec_handle_dont(i);
+
+                                // 规格选择处理
+                                var temp_spec = spec[i];
+                                var status = false;
+                                for (var k in spec_choose[i]['value']) {
+                                    // 必须是可选和未选
+                                    if (!status && (spec_choose[i]['value'][k]['is_disabled'] || null) == null && (spec_choose[i]['value'][k]['is_dont'] || null) == null && temp_spec == spec_choose[i]['value'][k]['name']) {
+                                        self.goods_spec_choice_handle(i, k);
+                                        status = true;
+                                        num++;
+                                    }
+                                }
+                            }
+                        }
+                        if (num >= sku_count) {
+                            clearInterval(self.spec_selected_timer);
+                        }
+                    }, 100);
+                    var timerout = setTimeout(function () {
+                        clearInterval(self.spec_selected_timerout);
+                    }, 20000);
+                    self.setData({
+                        spec_selected_timer: timer,
+                        spec_selected_timerout: timerout,
+                    });
+                }
+            },
+
+            // 默认选中第一个规格 - 智能工具箱插件
+            plugins_intellectstools_selected_spec_handle(spec_choose) {
+                // 选择处理
+                var self = this;
+                // 销毁之前的任务
+                clearInterval(self.spec_selected_timer);
+                clearInterval(self.spec_selected_timerout);
+                // 读取智能工具插件配置、是否开启
+                var config = self.plugins_intellectstools_config || null;
+                if (config != null && (config.is_goods_detail_selected_first_spec || 0) == 1) {
+                    // 必须存在购买和加入购物车任意一个、规格必须多个
+                    var sku_count = app.globalData.get_length(spec_choose);
+                    // 先清除价格展示信息
+                    self.setData({
+                        goods_spec_base_price: '...',
+                        goods_spec_base_original_price: '...',
+                    });
+                    var num = 0;
+                    var timer = setInterval(function () {
+                        for (var i in spec_choose) {
+                            // 清除价格展示信息、避免获取价格类型赋值
+                            self.setData({
+                                goods_spec_base_price: '...',
+                                goods_spec_base_original_price: '...',
+                            });
+                            // 必须不存在已选择项
+                            var active =
+                                spec_choose[i]['value']
+                                    .map(function (v) {
+                                        return v.is_active;
+                                    })
+                                    .join('') || null;
+                            if (active == null) {
+                                // 不能选择规格处理
+                                self.spec_handle_dont(i);
+
+                                // 规格选择处理
+                                var status = false;
+                                for (var k in spec_choose[i]['value']) {
+                                    // 必须是可选和未选
+                                    if (!status && (spec_choose[i]['value'][k]['is_disabled'] || null) == null && (spec_choose[i]['value'][k]['is_dont'] || null) == null) {
+                                        self.goods_spec_choice_handle(i, k);
+                                        status = true;
+                                        num++;
+                                    }
+                                }
+                            }
+                        }
+                        if (num >= sku_count) {
+                            clearInterval(self.spec_selected_timer);
+                        }
+                    }, 100);
+                    var timerout = setTimeout(function () {
+                        clearInterval(self.spec_selected_timerout);
+                    }, 20000);
+                    self.setData({
+                        spec_selected_timer: timer,
+                        spec_selected_timerout: timerout,
+                    });
+                }
+            },
+
+            // 弹层关闭
+            popup_close_event(e) {
+                this.setData({
+                    popup_status: false,
+                });
+            },
+
+            // 规格事件
+            goods_spec_choice_event(e) {
+                var key = e.currentTarget.dataset.key || 0;
+                var keys = e.currentTarget.dataset.keys || 0;
+                this.goods_spec_choice_handle(key, keys);
+            },
+
+            // 规格选择处理
+            goods_spec_choice_handle(key, keys) {
+                var temp_spec = this.goods_spec_choose;
+                var temp_images = this.goods_spec_base_images;
+                // 不能选择和禁止选择跳过
+                if ((temp_spec[key]['value'][keys]['is_dont'] || null) == null && (temp_spec[key]['value'][keys]['is_disabled'] || null) == null) {
+                    // 规格选择
+                    for (var i in temp_spec) {
+                        for (var k in temp_spec[i]['value']) {
+                            if ((temp_spec[i]['value'][k]['is_dont'] || null) == null && (temp_spec[i]['value'][k]['is_disabled'] || null) == null) {
+                                if (key == i) {
+                                    if (keys == k && (temp_spec[i]['value'][k]['is_active'] || null) == null) {
+                                        temp_spec[i]['value'][k]['is_active'] = 'cr-white bg-main br-main';
+                                        if ((temp_spec[i]['value'][k]['images'] || null) != null) {
+                                            temp_images = temp_spec[i]['value'][k]['images'];
+                                        }
+                                    } else {
+                                        temp_spec[i]['value'][k]['is_active'] = '';
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    this.setData({
+                        goods_spec_choose: temp_spec,
+                        goods_spec_base_images: temp_images,
+                    });
+
+                    // 不能选择规格处理
+                    this.spec_handle_dont(key);
+
+                    // 获取下一个规格类型
+                    this.get_spec_type(key);
+
+                    // 获取规格详情
+                    this.get_spec_detail();
+
+                    // 规格选择回调
+                    this.$emit('SpecChoiceEvent', {
+                        goods_id: this.goods.id,
+                        spec: this.choice_spec_data(),
+                        goods_spec_choose: this.goods_spec_choose,
+                    });
+                }
+            },
+
+            // 获取下一个规格类型
+            get_spec_type(key) {
+                var temp_spec = this.goods_spec_choose;
+                var active_index = parseInt(key) + 1;
+                var sku_count = app.globalData.get_length(temp_spec);
+                if (active_index <= 0 || active_index >= sku_count) {
+                    return false;
+                }
+
+                // 获取规格值
+                var spec = this.choice_spec_data();
+                if (spec.length <= 0) {
+                    return false;
+                }
+
+                // 获取数据
+                var data = this.params;
+                data['id'] = this.goods.id;
+                data['spec'] = JSON.stringify(spec);
+                uni.request({
+                    url: app.globalData.get_request_url('spectype', 'goods'),
+                    method: 'POST',
+                    data: data,
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            var spec_type = res.data.data.spec_type;
+                            var spec_count = spec.length;
+                            var index = spec_count > 0 ? spec_count : 0;
+                            if (index < sku_count) {
+                                for (var i in temp_spec) {
+                                    for (var k in temp_spec[i]['value']) {
+                                        if (index == i) {
+                                            temp_spec[i]['value'][k]['is_dont'] = '';
+                                            var temp_value = temp_spec[i]['value'][k]['name'];
+                                            var temp_status = false;
+                                            for (var t in spec_type) {
+                                                if (spec_type[t] == temp_value) {
+                                                    temp_status = true;
+                                                    break;
+                                                }
+                                            }
+                                            if (temp_status == true) {
+                                                temp_spec[i]['value'][k]['is_disabled'] = '';
+                                            } else {
+                                                temp_spec[i]['value'][k]['is_disabled'] = 'spec-items-disabled';
+                                            }
+                                        }
+                                    }
+                                }
+                                this.setData({
+                                    goods_spec_choose: temp_spec,
+                                });
+                            }
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 选择规格数据
+            choice_spec_data() {
+                var spec = [];
+                var temp_spec = this.goods_spec_choose;
+                for (var i in temp_spec) {
+                    for (var k in temp_spec[i]['value']) {
+                        if ((temp_spec[i]['value'][k]['is_active'] || null) != null) {
+                            spec.push({
+                                type: temp_spec[i]['name'],
+                                value: temp_spec[i]['value'][k]['name'],
+                            });
+                            break;
+                        }
+                    }
+                }
+                return spec;
+            },
+
+            // 获取规格详情
+            get_spec_detail() {
+                // 获取规格值
+                var spec = this.goods_selected_spec();
+
+                // 存在规格的时候是否已完全选择规格
+                var sku_count = this.goods_spec_choose.length;
+                var active_count = spec.length;
+                if (spec.length <= 0 || active_count < sku_count) {
+                    var buy_number = parseInt(this.buy_number);
+                    var buy_min_number = parseInt(this.goods.buy_min_number || 1);
+                    var buy_max_number = parseInt(this.goods.buy_max_number || 0);
+                    if (buy_number < buy_min_number) {
+                        buy_number = buy_min_number;
+                    }
+                    if (buy_max_number > 0 && buy_number > buy_max_number) {
+                        buy_number = buy_max_number;
+                    }
+                    this.setData({
+                        goods_spec_base_price: this.goods.price,
+                        goods_spec_base_original_price: this.goods.original_price || 0,
+                        goods_spec_base_inventory: this.goods.inventory,
+                        goods_spec_base_buy_min_number: 0,
+                        goods_spec_base_buy_max_number: 0,
+                        buy_number: buy_number,
+                    });
+                    return false;
+                }
+
+                // 获取数据
+                var data = this.params;
+                data['id'] = this.goods.id;
+                data['spec'] = JSON.stringify(spec);
+                data['stock'] = this.buy_number;
+                uni.request({
+                    url: app.globalData.get_request_url('specdetail', 'goods'),
+                    method: 'POST',
+                    data: data,
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            this.goods_spec_detail_back_handle(res.data.data);
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 商品规格详情返回数据处理
+            goods_spec_detail_back_handle(data) {
+                var spec_base = data.spec_base;
+                var buy_number = parseInt(this.buy_number);
+                var spec_buy_min_number = parseInt(spec_base.buy_min_number || 1);
+                var spec_buy_max_number = parseInt(spec_base.buy_max_number || 0);
+                if (spec_buy_min_number > 0 && buy_number < spec_buy_min_number) {
+                    buy_number = spec_buy_min_number;
+                }
+                if (spec_buy_max_number > 0 && buy_number > spec_buy_max_number) {
+                    buy_number = spec_buy_max_number;
+                }
+                this.setData({
+                    goods_spec_base_price: spec_base.price,
+                    goods_spec_base_original_price: spec_base.original_price || 0,
+                    goods_spec_base_inventory: parseInt(spec_base.inventory || 0),
+                    goods_spec_base_buy_min_number: spec_buy_min_number,
+                    goods_spec_base_buy_max_number: spec_buy_max_number,
+                    buy_number: buy_number,
+                });
+
+                // 调用父级
+                this.$emit("BackSuccessEvent", {
+                    buy_number: this.buy_number,
+                    base_price: this.goods_spec_base_price,
+                    base_original_price: this.goods_spec_base_original_price,
+                    base_inventory: this.goods_spec_base_inventory,
+                    base_buy_min_number: this.goods_spec_base_buy_min_number,
+                    base_buy_max_number: this.goods_spec_base_buy_max_number,
+                    back_data: data
+                });
+            },
+
+            // 已选的商品规格
+            goods_selected_spec() {
+                var spec = [];
+                var temp_spec = this.goods_spec_choose;
+                for (var i in temp_spec) {
+                    for (var k in temp_spec[i]['value']) {
+                        if ((temp_spec[i]['value'][k]['is_active'] || null) != null) {
+                            spec.push({
+                                type: temp_spec[i]['name'],
+                                value: temp_spec[i]['value'][k]['name'],
+                            });
+                            break;
+                        }
+                    }
+                }
+                return spec;
+            },
+
+            // 不能选择规格处理
+            spec_handle_dont(key, is_init = 0) {
+                var temp_spec = this.goods_spec_choose || [];
+                if (temp_spec.length <= 0) {
+                    return false;
+                }
+
+                // 是否不能选择
+                key = parseInt(key);
+                for (var i in temp_spec) {
+                    for (var k in temp_spec[i]['value']) {
+                        if (i > key) {
+                            temp_spec[i]['value'][k]['is_dont'] = 'spec-dont-choose';
+                            temp_spec[i]['value'][k]['is_disabled'] = '';
+                            temp_spec[i]['value'][k]['is_active'] = '';
+                        } else {
+                            if (is_init == 1) {
+                                temp_spec[i]['value'][k]['is_active'] = '';
+                            }
+                        }
+
+                        // 当只有一个规格的时候
+                        if (key == 0 && temp_spec.length == 1) {
+                            temp_spec[i]['value'][k]['is_disabled'] = (temp_spec[i]['value'][k]['is_only_level_one'] || null) != null && parseInt(temp_spec[i]['value'][k]['inventory'] || 0) <= 0 ? 'spec-items-disabled' : '';
+                        }
+                    }
+                }
+
+                this.setData({
+                    goods_spec_choose: temp_spec,
+                });
+            },
+
+            // 数量输入事件
+            goods_buy_number_blur(e) {
+                var number = parseInt(e.detail.value) || 1;
+                if (isNaN(number)) {
+                    number = this.goods.buy_min_number || 1;
+                }
+                this.goods_buy_number_func(number);
+            },
+
+            // 数量操作事件
+            goods_buy_number_event(e) {
+                var type = parseInt(e.currentTarget.dataset.type || 0);
+                var temp_number = parseInt(this.buy_number);
+                var number = type == 0 ? temp_number - 1 : temp_number + 1;
+                this.goods_buy_number_func(number);
+            },
+
+            // 数量处理方法
+            goods_buy_number_func(number) {
+                var buy_min_number = parseInt(this.goods.buy_min_number || 1);
+                var buy_max_number = parseInt(this.goods.buy_max_number || 0);
+                var spec_buy_min_number = parseInt(this.goods_spec_base_buy_min_number || 0);
+                var spec_buy_max_number = parseInt(this.goods_spec_base_buy_max_number || 0);
+                var inventory = parseInt(this.goods_spec_base_inventory || 0);
+                var inventory_unit = this.goods.inventory_unit;
+
+                // 最小起购数量
+                var min = spec_buy_min_number > 0 ? spec_buy_min_number : buy_min_number;
+                if (min > 0 && number < min) {
+                    number = min;
+                    app.globalData.showToast(this.$t('recommend-detail.recommend-detail.265vyu') + min + inventory_unit);
+                }
+
+                // 最大购买数量
+                var max = spec_buy_max_number > 0 ? spec_buy_max_number : buy_max_number;
+                if (max > 0 && number > max) {
+                    number = max;
+                    app.globalData.showToast(this.$t('goods-category.goods-category.z1eh3v') + max + inventory_unit);
+                }
+
+                // 是否超过库存数量
+                if (number > inventory) {
+                    number = inventory;
+                    app.globalData.showToast(this.$t('recommend-detail.recommend-detail.2sis3v') + inventory + inventory_unit);
+                }
+
+                this.setData({ buy_number: number });
+
+                // 存在规格的时候是否已完全选择规格
+                var spec = this.goods_selected_spec();
+                var sku_count = this.goods_spec_choose.length;
+                var active_count = spec.length;
+                if (sku_count > 0 && active_count < sku_count) {
+                    return false;
+                }
+
+                // 获取数据
+                var data = this.params;
+                data['id'] = this.goods.id;
+                data['spec'] = spec;
+                data['stock'] = this.buy_number;
+                uni.request({
+                    url: app.globalData.get_request_url('stock', 'goods'),
+                    method: 'POST',
+                    data: data,
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            this.goods_spec_detail_back_handle(res.data.data);
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 详情图片查看
+            goods_detail_images_view_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value != null) {
+                    uni.previewImage({
+                        current: value,
+                        urls: [value],
+                    });
+                }
+            },
+
+            // 规格确认事件
+            spec_confirm_event(e = null) {
+                var user = app.globalData.get_user_info(this, 'spec_confirm_event');
+                if (user != false) {
+                    // 规格
+                    var temp_data = this.goods_spec_choose;
+                    var sku_count = temp_data.length;
+                    var active_count = 0;
+                    var spec = [];
+                    if (sku_count > 0) {
+                        for (var i in temp_data) {
+                            for (var k in temp_data[i]['value']) {
+                                if ((temp_data[i]['value'][k]['is_active'] || null) != null) {
+                                    active_count++;
+                                    spec.push({
+                                        type: temp_data[i]['name'],
+                                        value: temp_data[i]['value'][k]['name'],
+                                    });
+                                }
+                            }
+                        }
+                        if (active_count < sku_count) {
+                            app.globalData.showToast(this.$t('goods-detail.goods-detail.6brk57'));
+                            return false;
+                        }
+                    }
+
+                    // 操作类型
+                    var type = (e == null) ? this.buy_event_type : (e.currentTarget.dataset.type || this.buy_event_type);
+                    var value = (e == null) ? null : (e.currentTarget.dataset.value || null);
+                    var business = (e == null) ? null : (e.currentTarget.dataset.business || null);
+                    switch (type) {
+                        // 展示型、商品页面规格选择展示型 拨打电话操作
+                        case 'show':
+                        case 'spec-show':
+                            app.globalData.call_tel(value || app.globalData.get_config('config.common_app_customer_service_tel'));
+                            break;
+
+                        // 购买
+                        case 'buy':
+                            // 进入订单确认页面
+                            var data = {
+                                buy_type: 'goods',
+                                goods_data: encodeURIComponent(
+                                    base64.encode(
+                                        JSON.stringify([
+                                            {
+                                                goods_id: this.goods.id,
+                                                stock: this.buy_number,
+                                                spec: spec,
+                                            },
+                                        ])
+                                    )
+                                )
+                            };
+                            // 转换数据
+                            var data_params = encodeURIComponent(base64.encode(JSON.stringify(data)));
+
+                            // 是否互联网医院插件-开处方
+                            if(business == 'plugins-hospital') {
+                                app.globalData.url_open('/pages/plugins/hospital/prescription/prescription?data=' + data_params);
+                            } else {
+                                // 默认进去订单确认页面
+                                app.globalData.url_open('/pages/buy/buy?data=' + data_params);
+                            }
+                            // 关闭弹窗
+                            this.popup_close_event();
+                            break;
+
+                        // 加入购物车
+                        case 'cart':
+                            this.goods_cart_event(spec);
+                            break;
+
+                        default:
+                            app.globalData.showToast(this.$t('goods-buy.goods-buy.4maexq') + type + ')');
+                    }
+                }
+            },
+
+            // 加入购物车事件
+            goods_cart_event(spec) {
+                var data = this.params;
+                data['goods_id'] = this.goods.id;
+                data['spec'] = JSON.stringify(spec);
+                data['stock'] = this.buy_number;
+                uni.request({
+                    url: app.globalData.get_request_url('save', 'cart'),
+                    method: 'POST',
+                    data: data,
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            // 是否成功提示
+                            if (this.is_success_tips == 1) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                            }
+                            var cart_number = res.data.data.buy_number;
+
+                            // 调用父级
+                            this.$emit('CartSuccessEvent', {
+                                goods_id: this.goods.id,
+                                spec: spec,
+                                stock: this.buy_number,
+                                cart_number: cart_number,
+                                back_data: this.back_data,
+                                goods_spec_choose: this.goods_spec_choose,
+                            });
+
+                            // 是否返回定义来源返回
+                            if (parseInt(this.params.is_opt_buy_status || 0) == 1 && this.is_opt_back == 1) {
+                                setTimeout(function () {
+                                    uni.navigateBack();
+                                }, 1000);
+                            } else {
+                                // 关闭购买弹窗窗口
+                                this.popup_close_event();
+                            }
+                        } else {
+                            if (app.globalData.is_login_check(res.data, this, 'spec_confirm_event')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+        },
+    };
+</script>
+<style>
+    .goods-spec-choice-container .close {
+        position: absolute;
+        top: 20rpx;
+        right: 20rpx;
+        z-index: 2;
+    }
+    .goods-spec-base {
+        height: 230rpx;
+    }
+    .goods-spec-base .spec-images {
+        width: 200rpx;
+        height: 200rpx;
+        position: absolute;
+        left: 0;
+        top: 0;
+    }
+    .goods-spec-base-content {
+        position: absolute;
+        left: 220rpx;
+        top: 0;
+    }
+    .goods-spec-choice-content {
+        max-height: 50vh;
+        overflow-y: scroll;
+        overflow-x: hidden;
+        margin-top: 20rpx;
+    }
+    .goods-spec-choice-container .item .spec .spec-btn {
+        background-color: #f5f5f5;
+        color: #666;
+        border: 1px solid #ccc;
+    }
+    .goods-spec-choice-container .item .spec .spec-btn:not(:last-child) {
+        margin-right: 25rpx;
+    }
+    .goods-spec-choice-container .item .spec .spec-btn .spec-images {
+        width: 40rpx;
+        height: 40rpx !important;
+    }
+    .goods-spec-choice-container .spec-dont-choose {
+        color: #b4b3b3 !important;
+        background-color: #ffffff !important;
+        border: 1px solid #ebeaea !important;
+    }
+    .goods-spec-choice-container .spec-dont-choose .spec-images {
+        opacity: 0.5;
+    }
+    .goods-spec-choice-container .spec-items-disabled {
+        color: #d2cfcf !important;
+        background-color: #ffffff !important;
+        border: 1px dashed #d5d5d5 !important;
+    }
+    .goods-spec-choice-container .spec-items-disabled .spec-images {
+        opacity: 0.3;
+    }
+
+    .goods-spec-choice-container .goods-buy-number {
+        height: 70rpx;
+    }
+    .goods-spec-choice-container .number-content {
+        position: absolute;
+        right: 20rpx;
+        top: 0;
+        background: #eee;
+        border: 1px solid #eee;
+    }
+    .goods-spec-choice-container .number-content .number-submit {
+        width: 80rpx;
+        font-weight: bold;
+    }
+    .goods-spec-choice-container .number-content .number-input {
+        width: 50px;
+    }
+    .goods-spec-choice-container .number-content .number-submit,
+    .goods-spec-choice-container .number-content .number-input {
+        padding: 0;
+        height: 60rpx;
+        line-height: 60rpx;
+    }
+    .goods-spec-choice-container .buy-nav-btn-number-0 .item,
+    .goods-spec-choice-container .buy-nav-btn-number-1 .item {
+        width: 100% !important;
+    }
+    .goods-spec-choice-container .buy-nav-btn-number-2 .item {
+        width: 50% !important;
+    }
+    .goods-spec-choice-container .buy-nav-btn-number-3 .item {
+        width: 33.33% !important;
+    }
+    .goods-spec-choice-container .buy-nav-btn-number-4 .item {
+        width: 25% !important;
+    }
+</style>
diff --git a/components/goods-comments/goods-comments.vue b/components/goods-comments/goods-comments.vue
new file mode 100644
index 0000000..88b49fd
--- /dev/null
+++ b/components/goods-comments/goods-comments.vue
@@ -0,0 +1,127 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="(propData || null) != null && propData.length > 0">
+            <view v-for="(item, index) in propData" :key="index" class="goods-comment-item flex-row" :class="propClass">
+                <image class="avatar dis-block margin-right-xs" :src="item.user.avatar || common_static_url + 'default-user.png'" mode="aspectFit"></image>
+                <view class="base-nav flex-1 flex-width margin-left-sm" :class="propIsReply ? 'is-reply' : ''">
+                    <view class="oh nav padding-bottom-sm">
+                        <view class="">
+                            <text class="va-m">{{ item.user.user_name_view }}</text>
+                            <view class="dis-inline-block va-m margin-left-sm">
+                                <uni-rate :value="item.rating" :readonly="true" :is-fill="false" :size="14" />
+                            </view>
+                            <view class="fr">
+                                <text class="cr-grey text-size-xs">{{ item.add_time_date }}</text>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="base-content oh padding-vertical-sm">
+                        <view class="content cr-base text-size-sm">{{ item.content }}</view>
+                        <view v-if="(item.images || null) != null && item.images.length > 0" class="image-list oh margin-top-lg">
+                            <block v-for="(iv, ix) in item.images" :key="ix">
+                                <image class="image br radius" @tap="comment_images_show_event" :data-index="index" :data-ix="ix" :src="iv" mode="aspectFit"></image>
+                            </block>
+                        </view>
+                        <view v-if="(item.msg || null) != null" class="spec cr-grey margin-top-lg">{{ item.msg }}</view>
+                        <block v-if="propIsReply">
+                            <view v-if="item.is_reply == 1 && (item.reply || null) != null" class="reply br-t-dashed margin-top-sm padding-top-sm text-size-sm">
+                                <text class="cr-base">{{$t('goods-comments.goods-comments.s65197')}}</text>
+                                <text class="reply-desc cr-main-pair">{{ item.reply }}</text>
+                            </view>
+                        </block>
+                    </view>
+                </view>
+            </view>
+        </block>
+        <block v-else>
+            <view class="tc spacing-mb flex-row jc-c align-c margin-top-xxxxl">
+                <image :src="common_static_url + 'no-comment.png'" mode="widthFix" class="no-comment margin-right-main" />
+                <view class="cr-grey-d">{{$t('goods-comments.goods-comments.1p1r2e')}}</view>
+            </view>
+        </block>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    var common_static_url = app.globalData.get_static_url('common');
+    export default {
+        props: {
+            propData: {
+                type: [Array,String],
+                default: '',
+            },
+            // 是否需要显示管理员回复
+            propIsReply: {
+                type: Boolean,
+                default: false,
+            },
+            // 额外样式控制
+            propClass: {
+                type: String,
+                default: '',
+            },
+        },
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+            };
+        },
+
+        created: function () {},
+
+        methods: {
+            // 评价图片预览
+            comment_images_show_event(e) {
+                var index = e.currentTarget.dataset.index;
+                var ix = e.currentTarget.dataset.ix;
+                uni.previewImage({
+                    current: this.propData[index]['images'][ix],
+                    urls: this.propData[index]['images'],
+                });
+            },
+        },
+    };
+</script>
+<style scoped>
+    /**
+     * 商品评价
+    */
+    .goods-comment-item {
+        padding-bottom: 10rpx;
+        margin-bottom: 20rpx;
+    }
+    .goods-comment-item .avatar {
+        width: 50rpx;
+        height: 50rpx;
+        border-radius: 50%;
+        border: 1px solid #e2e2e2;
+    }
+    .goods-comment-item .base-nav {
+        border-bottom: 2rpx solid #f5f5f5;
+    }
+    .goods-comment-item .base-nav.is-reply {
+        border: 0;
+    }
+
+    .goods-comment-item:last-of-type {
+        margin-bottom: 0;
+    }
+    .goods-comment-item:last-of-type .base-nav {
+        border: 0;
+    }
+    .goods-comment-item .base-content .content,
+    .goods-comment-item .base-content .reply {
+        line-height: 46rpx;
+    }
+    .goods-comment-item .base-content .image-list .image {
+        width: 100rpx;
+        height: 100rpx;
+    }
+    .goods-comment-item .base-content .image-list .image:not(:last-child) {
+        margin-right: 10rpx;
+    }
+    .no-comment {
+        width: 174rpx;
+    }
+</style>
diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue
new file mode 100644
index 0000000..30b638b
--- /dev/null
+++ b/components/goods-list/goods-list.vue
@@ -0,0 +1,395 @@
+<template>
+    <view :class="theme_view">
+        <view class="plugins-goods" :class="data.style_type == 2 ? propStyleTypeTowClass : ''" v-if="(data || null) != null && (data.goods_list || null) != null && data.goods_list.length > 0">
+            <view v-if="(data.title || null) != null || (data.vice_title || null) != null" class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                <view class="title-left">
+                    <text v-if="(data.title || null) != null" class="text-wrapper" :class="data.style_type == 2 ? '' : 'title-left-border'" :style="'color:' + (data.color || '#333') + ';'">{{ data.title }}</text>
+                    <text v-if="(data.vice_title || null) != null" class="vice-name margin-left-sm cr-grey-9">{{ data.vice_title }}</text>
+                </view>
+                <text v-if="(data[propMoreUrlKey] || null) != null" :data-value="data[propMoreUrlKey]" @tap="url_event" class="arrow-right padding-right cr-grey cp">{{ $t('common.more') }}</text>
+            </view>
+            <view class="wh-auto oh pr goods-list">
+                <!-- 默认图文 -->
+                <block v-if="(data.style_type || 0) == 0">
+                    <view class="goods-data-list">
+                        <view v-for="(item, index) in data.goods_list" :key="index" class="item oh padding-main border-radius-main bg-white oh pr spacing-mb">
+                            <!-- 商品主体内容 -->
+                            <view class="cp" :data-index="index" :data-value="item.goods_url" @tap="goods_event">
+                                <image class="goods-img fl radius" :src="item.images" mode="aspectFit"></image>
+                                <view class="base fr">
+                                    <view class="multi-text">{{ item.title }}</view>
+                                    <view v-if="(item.simple_desc || null) != null" class="cr-grey single-text margin-top-sm text-size-sm">{{ item.simple_desc }}</view>
+                                    <view  v-if="(item.show_field_price_status || 0) == 1"class="flex-row jc-sb align-c margin-top-main pr">
+                                        <block v-if="(propPriceField || null) != null && item[propPriceField] != undefined">
+                                            <view class="base-bottom">
+                                                <text v-if="propIsShowPriceIcon && (item.price_icon || null) != null" class="bg-red br-red cr-white text-size-xs padding-left-sm padding-right-sm round va-m margin-right-xs">{{ item.price_icon }}</text>
+                                                <text class="sales-price va-m text-size-xs va-m">{{ item.show_price_symbol }}</text>
+                                                <text class="sales-price va-m">{{ item[propPriceField] }}</text>
+                                                <text class="cr-grey text-size-xs va-m">{{ item.show_price_unit }}</text>
+                                            </view>
+                                        </block>
+                                        <block v-if="(item.is_error || 0) == 0 && is_show_cart">
+                                            <view v-if="propOpenCart" class="bg-white right-cart-icon pr" :data-index="index" @tap.stop="goods_cart_event">
+                                                <iconfont name="icon-cart-inc" size="48rpx" :color="theme_color"></iconfont>
+                                                <view class="cart-badge-icon pa">
+                                                    <component-badge :propNumber="item.user_cart_count || 0"></component-badge>
+                                                </view>
+                                            </view>
+                                        </block>
+                                    </view>
+                                </view>
+                            </view>
+                            <!-- 标签插件 -->
+                            <view v-if="(propLabel || null) != null && propLabel.data.length > 0" :class="'plugins-label oh pa plugins-label-' + ((propLabel.base.is_user_goods_label_icon || 0) == 0 ? 'text' : 'img') + ' plugins-label-' + (propLabel.base.user_goods_show_style || 'top-left')">
+                                <block v-for="(lv, li) in propLabel.data" :key="li">
+                                    <view v-if="(lv.goods_ids || null) != null && lv.goods_ids.indexOf(item.id) != -1" class="lv dis-inline-block va-m" :data-value="(propLabel.base.is_user_goods_label_url || 0) == 1 ? lv.url || '' : ''" @tap="url_event">
+                                        <view v-if="(propLabel.base.is_user_goods_label_icon || 0) == 0" class="round cr-white bg-main text-size-xs fl" :style="('background-color:'+(lv.bg_color || '#666'))+' !important;'+('color:'+(lv.text_color || '#fff'))+' !important;'">
+                                            {{ lv.name }}
+                                        </view>
+                                        <block v-else>
+                                            <image v-if="(lv.icon || null) != null" class="dis-block" :src="lv.icon" mode="scaleToFill"></image>
+                                        </block>
+                                    </view>
+                                </block>
+                            </view>
+                        </view>
+                    </view>
+                </block>
+                <!-- 九方格 -->
+                <block v-else-if="data.style_type == 1">
+                    <view class="goods-data-grid-list flex-row flex-wrap">
+                        <view v-for="(item, index) in data.goods_list" :key="index" class="item oh border-radius-main bg-white oh pr spacing-mb">
+                            <!-- 商品主体内容 -->
+                            <view class="cp" :data-index="index" :data-value="item.goods_url" @tap="goods_event">
+                                <image class="goods-img dis-block wh-auto" :src="item.images" mode="widthFix"></image>
+                                <view class="base padding-horizontal-main margin-top-sm">
+                                    <view class="goods-title multi-text">{{ item.title }}</view>
+                                    <view v-if="(item.show_field_price_status || 0) == 1" class="margin-top-sm flex-row jc-sb align-c pr">
+                                        <view :class="propIsOpenGridBtnSet ? 'open-grid-btn' : ''">
+                                            <block v-if="(propPriceField || null) != null && item[propPriceField] != undefined">
+                                                <text v-if="propIsShowPriceIcon && (item.price_icon || null) != null" class="bg-red br-red cr-white text-size-xs padding-left-sm padding-right-sm round va-m margin-right-xs">{{ item.price_icon }}</text>
+                                                <text class="sales-price va-m text-size-xs va-m">{{ item.show_price_symbol }}</text>
+                                                <text class="sales-price va-m">{{ item[propPriceField] }}</text>
+                                                <text class="cr-grey text-size-xs va-m">{{ item.show_price_unit }}</text>
+                                            </block>
+                                        </view>
+                                        <block v-if="propIsOpenGridBtnSet">
+                                            <view class="pa bottom-0 right-0" :disabled="grid_btn_config.disabled" @tap="url_event" :style="[{ color: grid_btn_config.color }, { 'background-color': grid_btn_config.bg_color }, { padding: grid_btn_config.padding }, { 'border-radius': grid_btn_config.border_radius }, { 'font-size': grid_btn_config.font_size }]">
+                                                {{ grid_btn_config.name }}
+                                            </view>
+                                        </block>
+                                        <block v-else>
+                                            <block v-if="(item.is_error || 0) == 0 && is_show_cart">
+                                                <view v-if="propOpenCart" class="bg-white pr" :data-index="index" @tap.stop="goods_cart_event">
+                                                    <iconfont name="icon-cart-inc" size="48rpx" :color="theme_color"></iconfont>
+                                                    <view class="cart-badge-icon pa">
+                                                        <component-badge :propNumber="item.user_cart_count || 0"></component-badge>
+                                                    </view>
+                                                </view>
+                                            </block>
+                                        </block>
+                                    </view>
+                                </view>
+                            </view>
+                            <!-- 标签插件 -->
+                            <view v-if="(propLabel || null) != null && propLabel.data.length > 0" :class="'plugins-label oh pa plugins-label-' + ((propLabel.base.is_user_goods_label_icon || 0) == 0 ? 'text' : 'img') + ' plugins-label-' + (propLabel.base.user_goods_show_style || 'top-left')">
+                                <block v-for="(lv, li) in propLabel.data" :key="li">
+                                    <view v-if="(lv.goods_ids || null) != null && lv.goods_ids.indexOf(item.id) != -1" class="lv dis-inline-block va-m" :data-value="(propLabel.base.is_user_goods_label_url || 0) == 1 ? lv.url || '' : ''" @tap="url_event">
+                                        <view v-if="(propLabel.base.is_user_goods_label_icon || 0) == 0" class="round cr-white bg-main text-size-xs fl" :style="('background-color:'+(lv.bg_color || '#666'))+' !important;'+('color:'+(lv.text_color || '#fff'))+' !important;'">
+                                            {{ lv.name }}
+                                        </view>
+                                        <block v-else>
+                                            <image v-if="(lv.icon || null) != null" class="dis-block" :src="lv.icon" mode="scaleToFill"></image>
+                                        </block>
+                                    </view>
+                                </block>
+                            </view>
+                        </view>
+                    </view>
+                </block>
+                <!-- 滚动 -->
+                <view v-else-if="data.style_type == 2" class="rolling-horizontal border-radius-main oh">
+                    <view class="goods-data-rolling-list scroll-view-horizontal">
+                        <swiper class="swiper" :vertical="false" :autoplay="propIsAutoPlay" :circular="false" :display-multiple-items="(data.multiple_items || null) == null ? (data.goods_list.length < 3 ? data.goods_list.length : 3) : data.goods_list.length < data.multiple_items ? data.goods_list.length : data.multiple_items" interval="3000">
+                            <block v-for="(item, index) in data.goods_list" :key="index">
+                                <swiper-item>
+                                    <view class="item bg-white border-radius-main margin-right-main oh pr ht-auto pr">
+                                        <!-- 商品主体内容 -->
+                                        <view class="cp" :data-index="index" :data-value="item.goods_url" @tap="goods_event">
+                                            <image class="goods-img dis-block wh-auto" :src="item.images" mode="scaleToFill"></image>
+                                            <view class="padding-left-sm padding-right-sm margin-top-sm">
+                                                <view class="single-text text-size-xs">{{ item.title }}</view>
+                                                <view v-if="(item.show_field_price_status || 0) == 1" class="margin-top-xs flex-row align-c">
+                                                    <block v-if="(item.is_error || 0) == 0 && is_show_cart">
+                                                        <view v-if="propOpenCart" class="bg-white right-cart-icon pr" :data-index="index" @tap.stop="goods_cart_event">
+                                                            <iconfont name="icon-cart-inc" size="28rpx" :color="theme_color" propClass="pr top-xs margin-right-xs"></iconfont>
+                                                            <view class="cart-badge-icon pa">
+                                                                <component-badge :propNumber="item.user_cart_count || 0"></component-badge>
+                                                            </view>
+                                                        </view>
+                                                    </block>
+                                                    <block v-if="(propPriceField || null) != null && item[propPriceField] != undefined">
+                                                        <view class="flex-1 flex-width">
+                                                            <text v-if="propIsShowPriceIcon && (item.price_icon || null) != null" class="bg-red br-red cr-white text-size-xs padding-left-sm padding-right-sm round va-m margin-right-xs">{{ item.price_icon }}</text>
+                                                            <text class="sales-price va-m text-size-xs va-m">{{ item.show_price_symbol }}</text>
+                                                            <text class="sales-price va-m">{{ item[propPriceField] }}</text>
+                                                            <text class="cr-grey text-size-xs va-m">{{ item.show_price_unit }}</text>
+                                                        </view>
+                                                    </block>
+                                                </view>
+                                            </view>
+                                        </view>
+                                        <!-- 标签插件 -->
+                                        <view v-if="(propLabel || null) != null && propLabel.data.length > 0" :class="'plugins-label oh pa plugins-label-' + ((propLabel.base.is_user_goods_label_icon || 0) == 0 ? 'text' : 'img') + ' plugins-label-' + (propLabel.base.user_goods_show_style || 'top-left')">
+                                            <block v-for="(lv, li) in propLabel.data" :key="li">
+                                                <view v-if="(lv.goods_ids || null) != null && lv.goods_ids.indexOf(item.id) != -1" class="lv dis-inline-block va-m" :data-value="(propLabel.base.is_user_goods_label_url || 0) == 1 ? lv.url || '' : ''" @tap="url_event">
+                                                    <view v-if="(propLabel.base.is_user_goods_label_icon || 0) == 0" class="round cr-white bg-main text-size-xs fl" :style="('background-color:'+(lv.bg_color || '#666'))+' !important;'+('color:'+(lv.text_color || '#fff'))+' !important;'">
+                                                        {{ lv.name }}
+                                                    </view>
+                                                    <block v-else>
+                                                        <image v-if="(lv.icon || null) != null" class="dis-block" :src="lv.icon" mode="scaleToFill"></image>
+                                                    </block>
+                                                </view>
+                                            </block>
+                                        </view>
+                                    </view>
+                                </swiper-item>
+                            </block>
+                        </swiper>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <!-- 商品购买 -->
+        <component-goods-buy v-if="is_show_cart" ref="goods_buy" v-on:CartSuccessEvent="goods_cart_back_event"></component-goods-buy>
+
+        <!-- 购物车抛物线 -->
+        <component-cart-para-curve v-if="is_show_cart" ref="cart_para_curve"></component-cart-para-curve>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentBadge from '@/components/badge/badge';
+    import componentGoodsBuy from '@/components/goods-buy/goods-buy';
+    import componentCartParaCurve from '@/components/cart-para-curve/cart-para-curve';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data: null,
+                is_show_cart: false,
+                theme_color: app.globalData.get_theme_color(),
+                grid_btn_config: {
+                    bg_color: '#D8D8D8',
+                    color: '#fff',
+                    name: this.$t('goods-list.goods-list.nr77jf'),
+                    disabled: false,
+                    border_radius: '24rpx',
+                    padding: '6rpx 16rpx',
+                    font_size: '24rpx',
+                },
+            };
+        },
+        components: {
+            componentBadge,
+            componentGoodsBuy,
+            componentCartParaCurve,
+        },
+        props: {
+            // 价格符号
+            propCurrencySymbol: {
+                type: String,
+                default: app.globalData.currency_symbol(),
+            },
+            // 列表数据
+            propData: {
+                type: [Array, Object],
+                default: [],
+            },
+            // 模式2默认class
+            propStyleTypeTowClass: {
+                type: String,
+                default: 'bg-white border-radius-main padding-main spacing-mb',
+            },
+            // 更多url地址
+            propMoreUrlKey: {
+                type: String,
+                default: 'url',
+            },
+            // 关键字url地址
+            propKeywordsUrl: {
+                type: String,
+                default: '/pages/goods-search/goods-search?keywords=',
+            },
+            // 滚动自动播放
+            propIsAutoPlay: {
+                type: Boolean,
+                default: true,
+            },
+            // 标签数据
+            propLabel: {
+                type: [Array, Object, String],
+                default: null,
+            },
+            // 展示加购抛物线
+            propIsCartParaCurve: {
+                type: Boolean,
+                default: false,
+            },
+            // 展示价格icon图标
+            propIsShowPriceIcon: {
+                type: Boolean,
+                default: false,
+            },
+            // 展示价格字段
+            propPriceField: {
+                type: String,
+                default: 'min_price',
+            },
+            // 来源
+            propSource: {
+                type: String,
+                default: '',
+            },
+            // 当开启时以前的按钮将失效
+            propIsOpenGridBtnSet: {
+                type: Boolean,
+                default: false,
+            },
+            // 九宫格 按钮样式, ----- 需要和propIsOpenGridBtnSet一起使用
+            propGridBtnConfig: {
+                type: Object,
+                default: () => {
+                    return {};
+                },
+            },
+            // 是否开启购物车按钮  ------ 滚动使用
+            propOpenCart: {
+                type: Boolean,
+                default: true,
+            },
+            // 是否开启购物车数量同步到底部导航
+            propIsCartNumberTabBarBadgeSync: {
+                type: Boolean,
+                default: true,
+            },
+        },
+        // 属性值改变监听
+        watch: {
+            // 数据
+            propData(value, old_value) {
+                this.setData({
+                    data: value,
+                });
+            },
+            propIsOpenGridBtnSet(newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.setData({
+                        grid_btn_config: Object.assign({}, this.grid_btn_config, this.propGridBtnConfig),
+                    });
+                }
+            },
+        },
+        // 页面被展示
+        created: function () {
+            var is_app_mourning = app.globalData.is_app_mourning();
+            var is_show_cart = app.globalData.data.is_goods_list_show_cart_opt == 1 ? (is_app_mourning && this.propSource == 'index' ? false : true) : false;
+            this.setData({
+                data: this.propData,
+                is_show_cart: is_show_cart,
+                grid_btn_config: Object.assign({}, this.grid_btn_config, this.propGridBtnConfig),
+            });
+        },
+        methods: {
+            // 加入购物车
+            goods_cart_event(e) {
+                if ((this.$refs.goods_buy || null) != null) {
+                    var index = e.currentTarget.dataset.index || 0;
+                    var goods = this.propData.goods_list[index];
+                    // 开启购物车抛物线效果则展示提示操作
+                    var is_success_tips = this.propIsCartParaCurve ? 0 : 1;
+                    this.$refs.goods_buy.init(
+                        goods,
+                        {
+                            buy_event_type: 'cart',
+                            is_direct_cart: 1,
+                            is_success_tips: is_success_tips,
+                        },
+                        {
+                            index: index,
+                            pos: e,
+                        }
+                    );
+                }
+            },
+
+            // 加入购物车成功回调
+            goods_cart_back_event(e) {
+                // 增加数量
+                var back = e.back_data;
+                var new_data = this.data;
+                var goods = new_data['goods_list'][back.index];
+                goods['user_cart_count'] = parseInt(goods['user_cart_count'] || 0) + parseInt(e.stock);
+                if (goods['user_cart_count'] > 99) {
+                    goods['user_cart_count'] = '99+';
+                }
+                new_data['goods_list'][back.index] = goods;
+                this.setData({
+                    data: new_data,
+                });
+
+                // 抛物线
+                if (this.propIsCartParaCurve && (this.$refs.cart_para_curve || null) != null) {
+                    this.$refs.cart_para_curve.init(null, back.pos, goods.images);
+                }
+
+                // 购物车总数
+                var cart_total = e.cart_number || 0;
+
+                // 购物车导航角标
+                if (this.propIsCartNumberTabBarBadgeSync) {
+                    app.globalData.set_tab_bar_badge('cart', cart_total);
+                }
+
+                // 当前页面
+                var page = app.globalData.current_page().split('?');
+                switch (page[0]) {
+                    // 商品详情页面
+                    case 'pages/goods-detail/goods-detail':
+                    // 商品搜索
+                    case 'pages/goods-search/goods-search':
+                        var res = app.globalData.get_page_object(page[0]);
+                        if (res.length > 0) {
+                            for (var i in res) {
+                                res[i].$vm.goods_cart_count_handle(cart_total);
+                            }
+                        }
+                        break;
+                }
+                this.$emit('CartSuccessEvent', { ...e, ...{ goods_list: new_data.goods_list, goods: goods } });
+            },
+
+            // 商品事件
+            goods_event(e) {
+                // 商品数据缓存处理
+                var goods = this.data.goods_list[e.currentTarget.dataset.index];
+                app.globalData.goods_data_cache_handle(goods.id, goods);
+
+                // 调用公共打开url地址
+                app.globalData.url_event(e);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 购物车角标变化回调
+            goods_badge_change() {
+                this.$emit('goods_badge_change');
+            },
+        },
+    };
+</script>
+<style></style>
diff --git a/components/goods-spec-choice/goods-spec-choice.vue b/components/goods-spec-choice/goods-spec-choice.vue
new file mode 100644
index 0000000..55721e7
--- /dev/null
+++ b/components/goods-spec-choice/goods-spec-choice.vue
@@ -0,0 +1,362 @@
+<template>
+    <view :class="theme_view">
+        <component-popup :propShow="popup_status" propPosition="bottom" @onclose="popup_close_event" :propIndex="propIndex">
+            <view class="goods-spec-choice-container padding-main bg-white pr">
+                <view class="close fr oh">
+                    <view class="fr" @tap.stop="popup_close_event">
+                        <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                    </view>
+                </view>
+                <view class="goods-spec-choice-content">
+                    <!-- 商品规格 -->
+                    <view v-if="spec.length > 0" class="goods-spec-choose">
+                        <view v-for="(item, key) in spec" :key="key" class="item padding-top-xxl padding-bottom-xxl">
+                            <view class="text-size-sm">{{item.name}}</view>
+                            <view v-if="item.value.length > 0" class="spec margin-top-sm">
+                                <block v-for="(items, keys) in item.value" :key="keys">
+                                    <button @tap.stop="goods_spec_choice_event" :data-key="key" :data-keys="keys" type="default" size="mini" hover-class="none" :class="'round '+items.is_active + ' ' + items.is_dont + ' ' + items.is_disabled">
+                                        <image v-if="(items.images || null) != null" :src="items.images" mode="scaleToFill" class="va-m dis-inline-block round margin-right-sm"></image>
+                                        <text class="va-m">{{items.name}}</text>
+                                    </button>
+                                </block>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <button class="bg-main br-main cr-white text-size-sm round" type="default" @tap.stop="spec_confirm_event" hover-class="none">{{$t('index.index.7w75zb')}}</button>
+            </view>
+        </component-popup>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentPopup from "@/components/popup/popup";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                popup_status: false,
+                goods_id: 0,
+                spec: [],
+                buy_min_number: 1,
+                out_value: ''
+            };
+        },
+
+        components: {
+            componentPopup
+        },
+        props: {
+            propIndex: {
+                type: Number,
+                default: 100
+            }
+        },
+
+        created: function() {},
+
+        methods: {
+            // 获取数据
+            init(goods_id, spec, buy_min_number = 1, out_value = '') {
+                this.setData({
+                    popup_status: true,
+                    goods_id: goods_id,
+                    spec: spec || [],
+                    buy_min_number: buy_min_number || 1,
+                    out_value: out_value,
+                });
+                
+                // 不能选择规格处理
+                this.spec_handle_dont(0, 1);
+            },
+
+            // 购买弹层关闭
+            popup_close_event(e) {
+                this.setData({
+                    popup_status: false
+                });
+            },
+
+            // 规格事件
+            goods_spec_choice_event(e) {
+                var key = e.currentTarget.dataset.key || 0;
+                var keys = e.currentTarget.dataset.keys || 0;
+                this.goods_spec_choice_handle(key, keys);
+            },
+
+            // 规格选择处理
+            goods_spec_choice_handle(key, keys) {
+                var temp_spec = this.spec;
+                // 不能选择和禁止选择跳过
+                if ((temp_spec[key]['value'][keys]['is_dont'] || null) == null && (temp_spec[key]['value'][keys]['is_disabled'] || null) == null) {
+                    // 规格选择
+                    for (var i in temp_spec) {
+                        for (var k in temp_spec[i]['value']) {
+                            if ((temp_spec[i]['value'][k]['is_dont'] || null) == null && (temp_spec[i]['value'][k]['is_disabled'] || null) == null) {
+                                if (key == i) {
+                                    if (keys == k && (temp_spec[i]['value'][k]['is_active'] || null) == null) {
+                                        temp_spec[i]['value'][k]['is_active'] = 'cr-white bg-main br-main';
+                                    } else {
+                                        temp_spec[i]['value'][k]['is_active'] = '';
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    this.setData({
+                        spec: temp_spec
+                    });
+
+                    // 不能选择规格处理
+                    this.spec_handle_dont(key);
+
+                    // 获取下一个规格类型
+                    this.get_spec_type(key);
+
+                    // 获取规格详情
+                    this.get_spec_detail();
+                }
+            },
+            
+            // 获取下一个规格类型
+            get_spec_type(key) {
+                var temp_spec = this.spec;
+                var active_index = parseInt(key) + 1;
+                var sku_count = app.globalData.get_length(temp_spec);
+                if (active_index <= 0 || active_index >= sku_count) {
+                    return false;
+                }
+
+                // 获取规格值
+                var spec = [];
+                for (var i in temp_spec) {
+                    for (var k in temp_spec[i]['value']) {
+                        if ((temp_spec[i]['value'][k]['is_active'] || null) != null) {
+                            spec.push({
+                                type: temp_spec[i]['name'],
+                                value: temp_spec[i]['value'][k]['name']
+                            });
+                            break;
+                        }
+                    }
+                }
+                if (spec.length <= 0) {
+                    return false;
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('spectype', 'goods'),
+                    method: 'POST',
+                    data: {
+                        id: this.goods_id,
+                        spec: JSON.stringify(spec)
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            var spec_type = res.data.data.spec_type;
+                            var spec_count = spec.length;
+                            var index = spec_count > 0 ? spec_count : 0;
+                            if (index < sku_count) {
+                                for (var i in temp_spec) {
+                                    for (var k in temp_spec[i]['value']) {
+                                        if (index == i) {
+                                            temp_spec[i]['value'][k]['is_dont'] = '';
+                                            var temp_value = temp_spec[i]['value'][k]['name'];
+                                            var temp_status = false;
+                                            for (var t in spec_type) {
+                                                if (spec_type[t] == temp_value) {
+                                                    temp_status = true;
+                                                    break;
+                                                }
+                                            }
+                                            if (temp_status == true) {
+                                                temp_spec[i]['value'][k]['is_disabled'] = '';
+                                            } else {
+                                                temp_spec[i]['value'][k]['is_disabled'] = 'spec-items-disabled';
+                                            }
+                                        }
+                                    }
+                                }
+                                this.setData({
+                                    spec: temp_spec
+                                });
+                            }
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    }
+                });
+            },
+
+            // 获取规格详情
+            get_spec_detail() {
+                // 获取规格值
+                var spec = this.goods_selected_spec();
+
+                // 存在规格的时候是否已完全选择规格
+                var sku_count = this.spec.length;
+                var active_count = spec.length;
+                if (spec.length <= 0 || active_count < sku_count) {
+                    return false;
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('specdetail', 'goods'),
+                    method: 'POST',
+                    data: {
+                        id: this.goods_id,
+                        spec: JSON.stringify(spec),
+                        stock: this.buy_min_number
+                    },
+                    dataType: 'json',
+                    success: res => {
+                        if (res.data.code != 0) {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    }
+                });
+            },
+
+            // 已选的商品规格
+            goods_selected_spec() {
+                var spec = [];
+                var temp_spec = this.spec;
+                for (var i in temp_spec) {
+                    for (var k in temp_spec[i]['value']) {
+                        if ((temp_spec[i]['value'][k]['is_active'] || null) != null) {
+                            spec.push({
+                                type: temp_spec[i]['name'],
+                                value: temp_spec[i]['value'][k]['name']
+                            });
+                            break;
+                        }
+                    }
+                }
+                return spec;
+            },
+
+            // 不能选择规格处理
+            spec_handle_dont(key, is_init = 0) {
+                var temp_spec = this.spec || [];
+                if (temp_spec.length <= 0) {
+                    return false;
+                }
+
+                // 是否不能选择
+                key = parseInt(key);
+                for (var i in temp_spec) {
+                    for (var k in temp_spec[i]['value']) {
+                        if (i > key) {
+                            temp_spec[i]['value'][k]['is_dont'] = 'spec-dont-choose';
+                            temp_spec[i]['value'][k]['is_disabled'] = '';
+                            temp_spec[i]['value'][k]['is_active'] = '';
+                        } else {
+                            if(is_init == 1) {
+                                temp_spec[i]['value'][k]['is_active'] = '';
+                            }
+                        }
+
+                        // 当只有一个规格的时候
+                        if (key == 0 && temp_spec.length == 1) {
+                            temp_spec[i]['value'][k]['is_disabled'] = (temp_spec[i]['value'][k]['is_only_level_one'] || null) != null && (temp_spec[i]['value'][k]['inventory'] || 0) <= 0 ? 'spec-items-disabled' : '';
+                        }
+                    }
+                }
+
+                this.setData({
+                    spec: temp_spec
+                });
+            },
+
+            // 规格确认事件
+            spec_confirm_event(e) {
+                var temp_spec = this.spec;
+                var sku_count = temp_spec.length;
+                var active_count = 0;
+                var spec = [];
+                if (sku_count > 0) {
+                    for (var i in temp_spec) {
+                        for (var k in temp_spec[i]['value']) {
+                            if ((temp_spec[i]['value'][k]['is_active'] || null) != null) {
+                                active_count++;
+                                spec.push({
+                                    type: temp_spec[i]['name'],
+                                    value: temp_spec[i]['value'][k]['name']
+                                });
+                            }
+                        }
+                    }
+                    if (active_count < sku_count) {
+                        app.globalData.showToast(this.$t('goods-detail.goods-detail.6brk57'));
+                        return false;
+                    }
+                }
+
+                // 关闭弹窗
+                this.setData({
+                    popup_status: false
+                });
+
+                // 调用父级
+                this.$emit('specConfirmEvent', {
+                    goods_id: this.goods_id,
+                    spec: spec,
+                    stock: this.buy_min_number,
+                    out_value: this.out_value,
+                });
+            }
+        }
+    };
+</script>
+<style>
+    .goods-spec-choice-container .close {
+        position: absolute;
+        top: 20rpx;
+        right: 20rpx;
+        z-index: 2;
+    }
+    .goods-spec-choice-content {
+        max-height: 50vh;
+        overflow-y: scroll;
+        overflow-x: hidden;
+        margin-top: 20rpx;
+    }
+    .goods-spec-choice-container .item .spec button {
+        background-color: #f5f5f5;
+        color: #666;
+        border: 1px solid #ccc;
+    }
+    .goods-spec-choice-container .item .spec button:not(:last-child) {
+        margin-right: 25rpx;
+    }
+    .goods-spec-choice-container .item .spec button image {
+        width: 40rpx;
+        height: 40rpx !important;
+    }
+    .goods-spec-choice-container .spec-dont-choose {
+        color: #b4b3b3 !important;
+        background-color: #ffffff !important;
+        border: 1px solid #ebeaea !important;
+    }
+    .goods-spec-choice-container .spec-dont-choose image {
+        opacity: 0.5;
+    }
+    .goods-spec-choice-container .spec-items-disabled {
+        color: #d2cfcf !important;
+        background-color: #ffffff !important;
+        border: 1px dashed #d5d5d5 !important;
+    }
+    .goods-spec-choice-container .spec-items-disabled image {
+        opacity: 0.3;
+    }
+</style>
\ No newline at end of file
diff --git a/components/icon-nav/icon-nav.vue b/components/icon-nav/icon-nav.vue
new file mode 100644
index 0000000..61770c5
--- /dev/null
+++ b/components/icon-nav/icon-nav.vue
@@ -0,0 +1,140 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(propData || null) != null && (propData.data || null) != null && propData.data.length > 0 && swiper_data.length > 0" class="icon-nav-list" :class="propData.data.length > 5 ? 'swiper-height-max' : 'swiper-height-min'">
+            <uni-swiper-dot class="uni-swiper-dot-box" mode="default" :dots-styles="dots_styles" @clickItem="click_item" :info="swiper_data" :current="current">
+                <swiper class="swiper-box" :autoplay="autoplay" :duration="duration" @change="swiper_change" :current="swiper_dot_index">
+                    <swiper-item v-for="(swiper_item_data, i) in swiper_data" :key="i">
+                        <view class="swiper-item flex-row flex-wrap" :class="'swiper-item' + i">
+                            <view v-for="(item, j) in swiper_item_data" :key="j" class="swiper-item item">
+                                <view :class="'item-content ' + ((item.bg_color || null) == null ? 'item-exposed' : '')" :data-value="item.event_value" :data-type="item.event_type" @tap="navigation_event" :style="(item.bg_color || null) == null ? '' : 'background-color:' + item.bg_color + ';'">
+                                    <image class="image" :src="item.images_url" mode="aspectFit"></image>
+                                </view>
+                                <view class="title">{{ item.name }}</view>
+                            </view>
+                        </view>
+                    </swiper-item>
+                </swiper>
+            </uni-swiper-dot>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                swiper_data: [],
+                autoplay: false,
+                duration: 500,
+                styleIndex: -1,
+                current: 0,
+                swiper_dot_index: 0,
+                dots_styles: {
+                    backgroundColor: '#eee',
+                    bottom: '0',
+                    border: '0',
+                    color: '#fff',
+                    selectedBackgroundColor: app.globalData.get_theme_color(),
+                    selectedBorder: '0',
+                },
+            };
+        },
+        components: {},
+        props: {
+            propData: {
+                type: [Array, Object],
+                default: [],
+            },
+        },
+        // 属性值改变监听
+        watch: {
+            // 数据
+            propData(value, old_value) {
+                this.handle_data();
+            }
+        },
+        beforeMount() {
+            this.handle_data();
+        },
+        methods: {
+            navigation_event(e) {
+                app.globalData.operation_event(e);
+            },
+            // 数据处理
+            handle_data() {
+                if((this.propData || null) != null && (this.propData.data || null) != null && this.propData.data.length > 0) {
+                    this.swiper_data = app.globalData.group_arry(this.propData.data, 10);
+                }
+            },
+            swiper_change(e) {
+                this.current = e.detail.current;
+            },
+            click_item(e) {
+                this.swiper_dot_index = e;
+            },
+        },
+    };
+</script>
+<style scoped>
+    .icon-nav-list {
+        overflow: hidden;
+        padding: 20rpx;
+    }
+
+    .icon-nav-list .item {
+        width: 20%;
+        float: left;
+        padding: 16rpx 0;
+        /* #ifdef H5 */
+        cursor: pointer;
+        /* #endif */
+    }
+
+    .icon-nav-list .item .item-content {
+        border-radius: 50%;
+        padding: 20rpx;
+        text-align: center;
+        margin: 0 auto;
+        -webkit-box-shadow: 0 2px 12px rgb(226 226 226 / 95%);
+        box-shadow: 0 2px 12px rgb(226 226 226 / 95%);
+    }
+
+    .icon-nav-list .item .item-content,
+    .icon-nav-list .item .image {
+        width: 50rpx !important;
+        height: 50rpx !important;
+    }
+
+    .icon-nav-list .item .item-exposed {
+        padding: 0;
+        -webkit-box-shadow: none;
+        box-shadow: none;
+    }
+
+    .icon-nav-list .item .item-exposed,
+    .icon-nav-list .item .item-exposed .image {
+        width: 90rpx !important;
+        height: 90rpx !important;
+    }
+
+    .icon-nav-list .item .title {
+        margin-top: 12rpx;
+        font-size: 28rpx;
+        text-align: center;
+        -o-text-overflow: ellipsis;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+        max-width: 100%;
+        color: #666;
+    }
+
+    .swiper-height-min /deep/ .swiper-box {
+        height: 180rpx;
+    }
+
+    .swiper-height-max /deep/ .swiper-box {
+        height: 360rpx;
+    }
+</style>
diff --git a/components/iconfont/iconfont.vue b/components/iconfont/iconfont.vue
new file mode 100644
index 0000000..42b0cc9
--- /dev/null
+++ b/components/iconfont/iconfont.vue
@@ -0,0 +1,49 @@
+<template>
+    <view class="iconfont-container" :class="propClass" :style="'display:'+propContainerDisplay+';'">
+        <text class="iconfont" :class="name" :style="[{ color: color }, { 'font-size': size }]" @tap="$emit('click', $event)"></text>
+    </view>
+</template>
+
+<script>
+    export default {
+        props: {
+            name: {
+                type: String,
+                default: '',
+            },
+            color: {
+                type: String,
+                default: '',
+            },
+            size: {
+                type: String,
+                default: '28rpx',
+            },
+            propClass: {
+                type: String,
+                default: '',
+            },
+            propContainerDisplay: {
+                type: String,
+                default: 'inline-block',
+            }
+        },
+    };
+</script>
+
+<style scoped>
+    /* iconfont.css全局注册需要将src切换成绝对路径 */
+    /* @/static/icon/ */
+    @import url('@/static/icon/iconfont.css');
+    /* @import url('https://at.alicdn.com/t/c/font_4227145_kbr2f9jt68b.css'); */
+    .iconfont {
+        display: flex;
+        font-size: inherit;
+        overflow: hidden;
+        /* 因icon大小被设置为和字体大小一致，而span等标签的下边缘会和字体的基线对齐，故需设置一个往下的偏移比例，来纠正视觉上的未对齐效果 */
+        vertical-align: -0.15em;
+        outline: none;
+        /* 定义元素的颜色，currentColor是一个变量，这个变量的值就表示当前元素的color值，如果当前元素未设置color值，则从父元素继承 */
+        fill: currentcolor;
+    }
+</style>
diff --git a/components/layout/layout.vue b/components/layout/layout.vue
new file mode 100644
index 0000000..bf22616
--- /dev/null
+++ b/components/layout/layout.vue
@@ -0,0 +1,1359 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="(propData || null) != null && propData.length > 0">
+            <block v-for="(v, index) in propData" :key="index">
+                <view v-if="(v.value || null) != null && (v.children || null) != null && v.children.length > 0 && (v.value_arr || null) != null && v.value_arr.length > 0 && v.children.length == v.value_arr.length && (v.status || 0) == 1"
+                class="layout-view">
+                    <view
+                    :class="'layout-content-children ' + (((v.config || null) != null && (v.config.frontend_config || null) != null && (v.config.frontend_config.ent || null) != null) ? v.config.frontend_config.ent : '')"
+                    :style="(((v.config || null) != null && (v.config.frontend_config || null) != null && (v.config.frontend_config.style || null) != null) ? v.config.frontend_config.style : '')+(((v.config || null) != null && (v.config.style_background_images || null) != null) ? 'background-image:url('+v.config.style_background_images+');' : '')">
+                        <block v-for="(vs, indexchn) in v.children" :key="indexchn">
+                            <view :class="'layout-content-container ' + (((vs.config || null) != null && (vs.config.frontend_config || null) != null && (vs.config.frontend_config.ent || null) != null) ? vs.config.frontend_config.ent : '')"
+                            :style="(((vs.config || null) != null && (vs.config.frontend_config || null) != null && (vs.config.frontend_config.style || null) != null) ? vs.config.frontend_config.style : '')+(((vs.config || null) != null && (vs.config.style_background_images || null) != null) ? 'background-image:url('+vs.config.style_background_images+');' : '')">
+                                <block v-if="(vs.children || null) != null && vs.children.length > 0">
+                                    <view v-for="(vss, indexlay) in vs.children" :key="indexlay" class="layout-content">
+                                        <view v-if="(vss.config || null) != null && vss.config.length !== 0" class="module-content">
+                                            <view :class="'module-' + vss.value + '-container'" :style="((vss.config.frontend_config || null) != null && (vss.config.frontend_config.style || null) != null) ? vss.config.frontend_config.style : ''">
+                                                <!-- 单图 -->
+                                                <block v-if="vss.value == 'images'">
+                                                    <view
+                                                    :class="'module-images-content ' + vss.config.frontend_config.media_fixed.media_container_ent"
+                                                    :style="vss.config.frontend_config.media_fixed.media_container_style">
+                                                        <image @tap="layout_url_event" :data-value="vss.config.url || ''" :src="vss.config.images" mode="widthFix" :class="vss.config.frontend_config.media_fixed.media_ent" :style="vss.config.frontend_config.media_fixed.media_container_style" class="image"></image>
+                                                    </view>
+                                                </block>
+                                                <!-- 多图 -->
+                                                <block v-else-if="vss.value == 'many-images'">
+                                                    <block v-if="vss.config.view_list_show_style == 'rolling'">
+                                                        <!-- 滚动 -->
+                                                        <view class="module-list-rolling">
+                                                            <scroll-view scroll-x>
+                                                                <view v-for="(item, index2dtg) in vss.config.data_list" :key="index2dtg" class="item">
+                                                                    <view class="module-item" :style="'width:' + (((vss.config.view_list_show_style_value_arr || null) == null || (vss.config.view_list_show_style_value_arr.item_width || null) == null) ? 200 : vss.config.view_list_show_style_value_arr.item_width) + 'px;margin-left:' + (((vss.config.view_list_show_style_value_arr || null) == null || (vss.config.view_list_show_style_value_arr.item_margin || null) == null || index2dtg == 0) ? 0 : vss.config.view_list_show_style_value_arr.item_margin) + 'px;' + vss.config.frontend_config.item_style+vss.config.frontend_config.item_style" @tap="layout_url_event" :data-value="item.url || ''">
+                                                                        <view
+                                                                        :class="vss.config.frontend_config.media_fixed.media_container_ent"
+                                                                        :style="vss.config.frontend_config.media_fixed.media_container_style">
+                                                                            <image :src="item.images" mode="widthFix" :class="vss.config.frontend_config.media_fixed.media_ent" :style="vss.config.frontend_config.media_fixed.media_container_style" class="image"></image>
+                                                                        </view>
+                                                                    </view>
+                                                                </view>
+                                                            </scroll-view>
+                                                        </view>
+                                                    </block>
+                                                    <block v-else-if="vss.config.view_list_show_style == 'list'">
+                                                        <!-- 列表 -->
+                                                        <view :class="'module-list-content ' + vss.config.frontend_config.list_ent">
+                                                            <view v-for="(item, index2dtl) in vss.config.data_list" :key="index2dtl" class="item">
+                                                                <view class="module-item" :style="vss.config.frontend_config.item_style">
+                                                                    <view
+                                                                    :class="vss.config.frontend_config.media_fixed.media_container_ent"
+                                                                    :style="vss.config.frontend_config.media_fixed.media_container_style" @tap="layout_url_event" :data-value="item.url || ''">
+                                                                        <image :src="item.images" mode="widthFix" :class="vss.config.frontend_config.media_fixed.media_ent" :style="vss.config.frontend_config.media_fixed.media_container_style" class="image"></image>
+                                                                    </view>
+                                                                </view>
+                                                            </view>
+                                                        </view>
+                                                    </block>
+                                                    <block v-if="vss.config.view_list_show_style == 'routine'">
+                                                        <!-- 默认轮播 -->
+                                                        <swiper
+                                                        :indicator-dots="vss.config.data_list.length > 0"
+                                                        :indicator-color="indicator_color"
+                                                        :indicator-active-color="indicator_active_color"
+                                                        :autoplay="vss.config.data_list.length > 0"
+                                                        :circular="circular" :style="vss.config.frontend_config.media_fixed.media_container_style">
+                                                            <block v-for="(item, index2dtm) in vss.config.data_list" :key="index2dtm">
+                                                                <swiper-item :class="vss.config.frontend_config.media_fixed.media_container_ent">
+                                                                    <image :src="item.images" mode="aspectFill" :class="vss.config.frontend_config.media_fixed.media_ent" :style="vss.config.frontend_config.media_fixed.media_container_style"
+                                                                    @tap="layout_url_event" :data-value="item.url || ''" class="image"></image>
+                                                                </swiper-item>
+                                                            </block>
+                                                        </swiper>
+                                                    </block>
+                                                </block>
+                                                <!-- 图文 -->
+                                                <block v-else-if="vss.value == 'images-text'">
+                                                    <block v-if="vss.config.view_list_show_style == 'rolling'">
+                                                        <!-- 滚动 -->
+                                                        <view class="module-list-rolling">
+                                                            <scroll-view scroll-x>
+                                                                <view v-for="(item, index2twg) in vss.config.data_list" :key="index2twg" class="item">
+                                                                    <view class="module-item" :style="'width:' + (((vss.config.view_list_show_style_value_arr || null) == null || (vss.config.view_list_show_style_value_arr.item_width || null) == null) ? 200 : vss.config.view_list_show_style_value_arr.item_width) + 'px;margin-left:' + (((vss.config.view_list_show_style_value_arr || null) == null || (vss.config.view_list_show_style_value_arr.item_margin || null) == null || index2twg == 0) ? 0 : vss.config.view_list_show_style_value_arr.item_margin) + 'px;' + vss.config.frontend_config.item_style+vss.config.frontend_config.item_style" @tap="layout_url_event" :data-value="item.url || ''">
+                                                                        <view v-if="(item.images || null) != null"
+                                                                        :class="vss.config.frontend_config.media_fixed.media_container_ent"
+                                                                        :style="vss.config.frontend_config.media_fixed.media_container_style">
+                                                                            <image :src="item.images" mode="widthFix" :class="vss.config.frontend_config.media_fixed.media_ent" :style="vss.config.frontend_config.media_fixed.media_container_style" class="image"></image>
+                                                                        </view>
+                                                                        <view v-if="(item.title || null) != null" :style="((vss.config.frontend_config.item_field_style || null) != null && (vss.config.frontend_config.item_field_style[index2twg] || null) != null && (vss.config.frontend_config.item_field_style[index2twg]['title'] || null) != null) ? vss.config.frontend_config.item_field_style[index2twg]['title'] : ''">{{item.title}}</view>
+                                                                        <view v-if="(item.desc || null) != null" :style="((vss.config.frontend_config.item_field_style || null) != null && (vss.config.frontend_config.item_field_style[index2twg] || null) != null && (vss.config.frontend_config.item_field_style[index2twg]['desc'] || null) != null) ? vss.config.frontend_config.item_field_style[index2twg]['desc'] : ''">{{item.desc}}</view>
+                                                                    </view>
+                                                                </view>
+                                                            </scroll-view>
+                                                        </view>
+                                                    </block>
+                                                    <block v-if="vss.config.view_list_show_style == 'leftright'">
+                                                        <!-- 左图右文 -->
+                                                        <view :class="'module-list-content ' + vss.config.frontend_config.list_ent">
+                                                            <view v-for="(item, index2twzy) in vss.config.data_list" :key="index2twzy" class="item">
+                                                                <view class="module-item" :style="vss.config.frontend_config.item_style" @tap="layout_url_event" :data-value="item.url || ''">
+                                                                    <view v-if="(item.images || null) != null" class="fl">
+                                                                        <view
+                                                                        :class="vss.config.frontend_config.media_fixed.media_container_ent"
+                                                                        :style="vss.config.frontend_config.media_fixed.media_container_style">
+                                                                            <image :src="item.images" mode="widthFix" :class="vss.config.frontend_config.media_fixed.media_ent" :style="vss.config.frontend_config.media_fixed.media_container_style" class="image"></image>
+                                                                        </view>
+                                                                    </view>
+                                                                    <view class="fl" :style="vss.config.frontend_config.item_right_style">
+                                                                        <view v-if="(item.title || null) != null" :style="((vss.config.frontend_config.item_field_style || null) != null && (vss.config.frontend_config.item_field_style[index2twzy] || null) != null && (vss.config.frontend_config.item_field_style[index2twzy]['title'] || null) != null) ? vss.config.frontend_config.item_field_style[index2twzy]['title'] : ''">{{item.title}}</view>
+                                                                        <view v-if="(item.desc || null) != null" :style="((vss.config.frontend_config.item_field_style || null) != null && (vss.config.frontend_config.item_field_style[index2twzy] || null) != null && (vss.config.frontend_config.item_field_style[index2twzy]['desc'] || null) != null) ? vss.config.frontend_config.item_field_style[index2twzy]['desc'] : ''">{{item.desc}}</view>
+                                                                    </view>
+                                                                </view>
+                                                            </view>
+                                                        </view>
+                                                    </block>
+                                                    <block v-if="vss.config.view_list_show_style == 'updown'">
+                                                        <!-- 默认上图下文 -->
+                                                        <view :class="'module-list-content ' + vss.config.frontend_config.list_ent">
+                                                            <view v-for="(item, index2twsx) in vss.config.data_list" :key="index2twsx" class="item">
+                                                                <view class="module-item" :style="vss.config.frontend_config.item_style" @tap="layout_url_event" :data-value="item.url || ''">
+                                                                    <view v-if="(item.images || null) != null"
+                                                                    :class="vss.config.frontend_config.media_fixed.media_container_ent"
+                                                                    :style="vss.config.frontend_config.media_fixed.media_container_style">
+                                                                        <image :src="item.images" mode="widthFix" :class="vss.config.frontend_config.media_fixed.media_ent" :style="vss.config.frontend_config.media_fixed.media_container_style" class="image"></image>
+                                                                    </view>
+                                                                    <view v-if="(item.title || null) != null" :style="((vss.config.frontend_config.item_field_style || null) != null && (vss.config.frontend_config.item_field_style[index2twsx] || null) != null && (vss.config.frontend_config.item_field_style[index2twsx]['title'] || null) != null) ? vss.config.frontend_config.item_field_style[index2twsx]['title'] : ''">{{item.title}}</view>
+                                                                    <view v-if="(item.desc || null) != null" :style="((vss.config.frontend_config.item_field_style || null) != null && (vss.config.frontend_config.item_field_style[index2twsx] || null) != null && (vss.config.frontend_config.item_field_style[index2twsx]['desc'] || null) != null) ? vss.config.frontend_config.item_field_style[index2twsx]['desc'] : ''">{{item.desc}}</view>
+                                                                </view>
+                                                            </view>
+                                                        </view>
+                                                    </block>
+                                                </block>
+                                                <!-- 图片魔方 -->
+                                                <block v-else-if="vss.value == 'images-magic-cube'">
+                                                    <view :class="'oh layout-module-images-magic-cube layout-module-images-magic-cube-'+vss.config.view_list_show_style+' '+(vss.config.frontend_config.list_ent || '')">
+                                                        <block v-if="vss.config.view_list_show_style == 'g1'">
+                                                            <view class="item-module-magic-cube" :style="vss.config.frontend_config.item_style[0] || ''">
+                                                                <view :data-value="vss['config']['data_list'][0]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][0]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                        </block>
+                                                        <block v-if="vss.config.view_list_show_style == 'v2'">
+                                                            <view class="fl" :style="vss.config.frontend_config.item_style[0] || ''">
+                                                                <view :data-value="vss['config']['data_list'][0]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][0]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="fr" :style="vss.config.frontend_config.item_style[1] || ''">
+                                                                <view :data-value="vss['config']['data_list'][1]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][1]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                        </block>
+                                                        <block v-if="vss.config.view_list_show_style == 'v3'">
+                                                            <view class="fl" :style="vss.config.frontend_config.item_style[0] || ''">
+                                                                <view :data-value="vss['config']['data_list'][0]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][0]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="fl" :style="vss.config.frontend_config.item_style[1] || ''">
+                                                                <view :data-value="vss['config']['data_list'][1]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][1]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="fr" :style="vss.config.frontend_config.item_style[2] || ''">
+                                                                <view :data-value="vss['config']['data_list'][2]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][2]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                        </block>
+                                                        <block v-if="vss.config.view_list_show_style == 'v4'">
+                                                            <view class="fl" :style="vss.config.frontend_config.item_style[0] || ''">
+                                                                <view :data-value="vss['config']['data_list'][0]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][0]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="fl" :style="vss.config.frontend_config.item_style[1] || ''">
+                                                                <view :data-value="vss['config']['data_list'][1]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][1]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="fl" :style="vss.config.frontend_config.item_style[2] || ''">
+                                                                <view :data-value="vss['config']['data_list'][2]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][2]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="fr" :style="vss.config.frontend_config.item_style[3] || ''">
+                                                                <view :data-value="vss['config']['data_list'][3]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][3]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                        </block>
+                                                        <block v-if="vss.config.view_list_show_style == 'h2'">
+                                                            <view class="item-module-magic-cube" :style="vss.config.frontend_config.item_style[0] || ''">
+                                                                <view :data-value="vss['config']['data_list'][0]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][0]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="item-module-magic-cube" :style="vss.config.frontend_config.item_style[1] || ''">
+                                                                <view :data-value="vss['config']['data_list'][1]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][1]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                        </block>
+                                                        <block v-if="vss.config.view_list_show_style == 'h3'">
+                                                            <view class="item-module-magic-cube" :style="vss.config.frontend_config.item_style[0] || ''">
+                                                                <view :data-value="vss['config']['data_list'][0]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][0]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="item-module-magic-cube" :style="vss.config.frontend_config.item_style[1] || ''">
+                                                                <view :data-value="vss['config']['data_list'][1]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][1]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="item-module-magic-cube" :style="vss.config.frontend_config.item_style[2] || ''">
+                                                                <view :data-value="vss['config']['data_list'][2]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][2]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                        </block>
+                                                        <block v-if="vss.config.view_list_show_style == 'h4'">
+                                                            <view class="item-module-magic-cube" :style="vss.config.frontend_config.item_style[0] || ''">
+                                                                <view :data-value="vss['config']['data_list'][0]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][0]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="item-module-magic-cube" :style="vss.config.frontend_config.item_style[1] || ''">
+                                                                <view :data-value="vss['config']['data_list'][1]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][1]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="item-module-magic-cube" :style="vss.config.frontend_config.item_style[2] || ''">
+                                                                <view :data-value="vss['config']['data_list'][2]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][2]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="item-module-magic-cube" :style="vss.config.frontend_config.item_style[3] || ''">
+                                                                <view :data-value="vss['config']['data_list'][3]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][3]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                        </block>
+                                                        <block v-if="vss.config.view_list_show_style == 'lr12'">
+                                                            <view class="fl" :style="vss.config.frontend_config.item_style[0] || ''">
+                                                                <view :data-value="vss['config']['data_list'][0]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][0]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="fr" :style="vss.config.frontend_config.item_style[1] || ''">
+                                                                <view :data-value="vss['config']['data_list'][1]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][1]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                                <view :data-value="vss['config']['data_list'][2]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][2]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                        </block>
+                                                        <block v-if="vss.config.view_list_show_style == 'lr13'">
+                                                            <view class="fl" :style="vss.config.frontend_config.item_style[0] || ''">
+                                                                <view :data-value="vss['config']['data_list'][0]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][0]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="fr" :style="vss.config.frontend_config.item_style[1] || ''">
+                                                                <view :data-value="vss['config']['data_list'][1]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][1]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                                <view :data-value="vss['config']['data_list'][2]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][2]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                                <view :data-value="vss['config']['data_list'][3]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][3]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                        </block>
+                                                        <block v-if="vss.config.view_list_show_style == 'lr21'">
+                                                            <view class="fl" :style="vss.config.frontend_config.item_style[0] || ''">
+                                                                <view :data-value="vss['config']['data_list'][0]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][0]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                                <view :data-value="vss['config']['data_list'][1]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][1]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="fr" :style="vss.config.frontend_config.item_style[1] || ''">
+                                                                <view :data-value="vss['config']['data_list'][2]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][2]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                        </block>
+                                                        <block v-if="vss.config.view_list_show_style == 'lr31'">
+                                                            <view class="fl" :style="vss.config.frontend_config.item_style[0] || ''">
+                                                                <view :data-value="vss['config']['data_list'][0]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][0]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                                <view :data-value="vss['config']['data_list'][1]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][1]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                                <view :data-value="vss['config']['data_list'][2]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][2]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="fr" :style="vss.config.frontend_config.item_style[1] || ''">
+                                                                <view :data-value="vss['config']['data_list'][3]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][3]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                        </block>
+                                                        <block v-if="vss.config.view_list_show_style == 'tb12'">
+                                                            <view class="item-module-magic-cube" :style="vss.config.frontend_config.item_style[0] || ''">
+                                                                <view :data-value="vss['config']['data_list'][0]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][0]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="oh">
+                                                                <view class="fl" :style="vss.config.frontend_config.item_style[1] || ''">
+                                                                    <view :data-value="vss['config']['data_list'][1]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                        <image :src="vss['config']['data_list'][1]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                    </view>
+                                                                </view>
+                                                                <view class="fr" :style="vss.config.frontend_config.item_style[2] || ''">
+                                                                    <view :data-value="vss['config']['data_list'][2]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                        <image :src="vss['config']['data_list'][2]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                    </view>
+                                                                </view>
+                                                            </view>
+                                                        </block>
+                                                        <block v-if="vss.config.view_list_show_style == 'tb13'">
+                                                            <view class="item-module-magic-cube" :style="vss.config.frontend_config.item_style[0] || ''">
+                                                                <view :data-value="vss['config']['data_list'][0]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][0]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="oh">
+                                                                <view class="fl" :style="vss.config.frontend_config.item_style[1] || ''">
+                                                                    <view :data-value="vss['config']['data_list'][1]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                        <image :src="vss['config']['data_list'][1]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                    </view>
+                                                                </view>
+                                                                <view class="fl" :style="vss.config.frontend_config.item_style[2] || ''">
+                                                                    <view :data-value="vss['config']['data_list'][2]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                        <image :src="vss['config']['data_list'][2]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                    </view>
+                                                                </view>
+                                                                <view class="fr" :style="vss.config.frontend_config.item_style[3] || ''">
+                                                                    <view :data-value="vss['config']['data_list'][3]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                        <image :src="vss['config']['data_list'][3]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                    </view>
+                                                                </view>
+                                                            </view>
+                                                        </block>
+                                                        <block v-if="vss.config.view_list_show_style == 'tb21'">
+                                                            <view class="oh">
+                                                                <view class="fl" :style="vss.config.frontend_config.item_style[0] || ''">
+                                                                    <view :data-value="vss['config']['data_list'][0]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                        <image :src="vss['config']['data_list'][0]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                    </view>
+                                                                </view>
+                                                                <view class="fr" :style="vss.config.frontend_config.item_style[1] || ''">
+                                                                    <view :data-value="vss['config']['data_list'][1]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                        <image :src="vss['config']['data_list'][1]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                    </view>
+                                                                </view>
+                                                            </view>
+                                                            <view class="item-module-magic-cube" :style="vss.config.frontend_config.item_style[2] || ''">
+                                                                <view :data-value="vss['config']['data_list'][2]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][2]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                        </block>
+                                                        <block v-if="vss.config.view_list_show_style == 'tb31'">
+                                                            <view class="oh">
+                                                                <view class="fl" :style="vss.config.frontend_config.item_style[0] || ''">
+                                                                    <view :data-value="vss['config']['data_list'][0]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                        <image :src="vss['config']['data_list'][0]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                    </view>
+                                                                </view>
+                                                                <view class="fl" :style="vss.config.frontend_config.item_style[1] || ''">
+                                                                    <view :data-value="vss['config']['data_list'][1]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                        <image :src="vss['config']['data_list'][1]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                    </view>
+                                                                </view>
+                                                                <view class="fr" :style="vss.config.frontend_config.item_style[2] || ''">
+                                                                    <view :data-value="vss['config']['data_list'][2]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                        <image :src="vss['config']['data_list'][2]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                    </view>
+                                                                </view>
+                                                            </view>
+                                                            <view class="item-module-magic-cube" :style="vss.config.frontend_config.item_style[3] || ''">
+                                                                <view :data-value="vss['config']['data_list'][3]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][3]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                        </block>
+                                                        <block v-if="vss.config.view_list_show_style == 'lrv2h2'">
+                                                            <view class="fl" :style="vss.config.frontend_config.item_style[0] || ''">
+                                                                <view :data-value="vss['config']['data_list'][0]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][0]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="fl" :style="vss.config.frontend_config.item_style[1] || ''">
+                                                                <view :data-value="vss['config']['data_list'][1]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][1]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="fr" :style="vss.config.frontend_config.item_style[2] || ''">
+                                                                <view :data-value="vss['config']['data_list'][2]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][2]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                                <view :data-value="vss['config']['data_list'][3]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][3]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                        </block>
+                                                        <block v-if="vss.config.view_list_show_style == 'lrh2v2'">
+                                                            <view class="fl" :style="vss.config.frontend_config.item_style[0] || ''">
+                                                                <view :data-value="vss['config']['data_list'][0]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][0]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                                <view :data-value="vss['config']['data_list'][1]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][1]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="fl" :style="vss.config.frontend_config.item_style[1] || ''">
+                                                                <view :data-value="vss['config']['data_list'][2]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][2]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                            <view class="fr" :style="vss.config.frontend_config.item_style[2] || ''">
+                                                                <view :data-value="vss['config']['data_list'][3]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                    <image :src="vss['config']['data_list'][3]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                </view>
+                                                            </view>
+                                                        </block>
+                                                        <block v-if="vss.config.view_list_show_style == 'g4'">
+                                                            <view class="oh">
+                                                                <view class="fl" :style="vss.config.frontend_config.item_style[0] || ''">
+                                                                    <view :data-value="vss['config']['data_list'][0]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                        <image :src="vss['config']['data_list'][0]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                    </view>
+                                                                </view>
+                                                                <view class="fr" :style="vss.config.frontend_config.item_style[1] || ''">
+                                                                    <view :data-value="vss['config']['data_list'][1]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                        <image :src="vss['config']['data_list'][1]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                    </view>
+                                                                </view>
+                                                            </view>
+                                                            <view class="oh">
+                                                                <view class="fl" :style="vss.config.frontend_config.item_style[2] || ''">
+                                                                    <view :data-value="vss['config']['data_list'][2]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                        <image :src="vss['config']['data_list'][2]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                    </view>
+                                                                </view>
+                                                                <view class="fr" :style="vss.config.frontend_config.item_style[3] || ''">
+                                                                    <view :data-value="vss['config']['data_list'][3]['url'] || ''" @tap="layout_url_event" class="dis-block oh" :style="vss.config.frontend_config.images_style || ''">
+                                                                        <image :src="vss['config']['data_list'][3]['images']" mode="widthFix" class="dis-block wh-auto image"></image>
+                                                                    </view>
+                                                                </view>
+                                                            </view>
+                                                        </block>
+                                                    </view>
+                                                </block>
+                                                <!-- 视频 -->
+                                                <block v-else-if="vss.value == 'video'">
+                                                    <view
+                                                    :class="'module-video-content ' + vss.config.frontend_config.media_fixed.media_container_ent"
+                                                    :style="vss.config.frontend_config.media_fixed.media_container_style">
+                                                        <video
+                                                        class="video"
+                                                        :src="vss.config.video"
+                                                        :autoplay="false"
+                                                        :show-center-play-btn="true"
+                                                        :controls="true"
+                                                        :show-play-btn="true"
+                                                        :enable-progress-gesture="false"
+                                                        :show-fullscreen-btn="true"
+                                                        :show-mute-btn="true"
+                                                        :poster="(vss.config.content_images || null) != null ? vss.config.content_images : ''"
+                                                        :class="vss.config.frontend_config.media_fixed.media_ent"
+                                                        :style="vss.config.frontend_config.media_fixed.media_container_style">
+                                                        </video>
+                                                    </view>
+                                                </block>
+                                                <!-- 商品 -->
+                                                <block v-else-if="vss.value == 'goods'">
+                                                    <block v-if="(vss.config.data_list || null) != null && vss.config.data_list.length > 0">
+                                                        <block v-if="vss.config.view_list_show_style == 'rolling'">
+                                                            <!-- 滚动 -->
+                                                            <view class="module-goods-content module-list-rolling">
+                                                                <scroll-view scroll-x>
+                                                                    <view v-for="(item, index2spg) in vss.config.data_list" :key="index2spg" class="item">
+                                                                        <view class="module-item" :style="'width:' + (((vss.config.view_list_show_style_value_arr || null) == null || (vss.config.view_list_show_style_value_arr.item_width || null) == null) ? 200 : vss.config.view_list_show_style_value_arr.item_width) + 'px;margin-left:' + (((vss.config.view_list_show_style_value_arr || null) == null || (vss.config.view_list_show_style_value_arr.item_margin || null) == null || index2spg == 0) ? 0 : vss.config.view_list_show_style_value_arr.item_margin) + 'px;' + vss.config.frontend_config.item_style+vss.config.frontend_config.item_style" @tap="layout_url_event" :data-value="item.goods_url || ''">
+                                                                            <view
+                                                                            :class="vss.config.frontend_config.media_fixed.media_container_ent"
+                                                                            :style="vss.config.frontend_config.media_fixed.media_container_style">
+                                                                                <image :src="item.images" mode="widthFix" :class="vss.config.frontend_config.media_fixed.media_ent" :style="vss.config.frontend_config.media_fixed.media_container_style" class="image"></image>
+                                                                            </view>
+                                                                            <view class="item-bottom">
+                                                                                <view class="module-title">
+                                                                                    {{item.title}}
+                                                                                </view>
+                                                                                <view class="module-price">
+                                                                                    {{currency_symbol}}{{item.price}}
+                                                                                </view>
+                                                                            </view>
+                                                                        </view>
+                                                                    </view>
+                                                                </scroll-view>
+                                                            </view>
+                                                        </block>
+                                                        <block v-else-if="vss.config.view_list_show_style == 'leftright'">
+                                                            <!-- 左图右文 -->
+                                                            <view :class="'module-goods-content module-list-content ' + vss.config.frontend_config.list_ent">
+                                                                <view v-for="(item, index2stwzy) in vss.config.data_list" :key="index2stwzy" class="item">
+                                                                    <view class="module-item" :style="vss.config.frontend_config.item_style" @tap="layout_url_event" :data-value="item.goods_url || ''">
+                                                                        <view class="fl">
+                                                                            <view
+                                                                            :class="vss.config.frontend_config.media_fixed.media_container_ent"
+                                                                            :style="vss.config.frontend_config.media_fixed.media_container_style">
+                                                                                <image :src="item.images" mode="widthFix" :class="vss.config.frontend_config.media_fixed.media_ent" :style="vss.config.frontend_config.media_fixed.media_container_style" class="image"></image>
+                                                                            </view>
+                                                                        </view>
+                                                                        <view class="fl" :style="vss.config.frontend_config.item_right_style">
+                                                                            <view class="module-title">
+                                                                                {{item.title}}
+                                                                            </view>
+                                                                            <view class="module-price">
+                                                                                {{currency_symbol}}{{item.price}}
+                                                                            </view>
+                                                                        </view>
+                                                                    </view>
+                                                                </view>
+                                                            </view>
+                                                        </block>
+                                                        <block v-else>
+                                                            <!-- 默认列表 -->
+                                                            <view :class="'module-goods-content module-list-content ' + vss.config.frontend_config.list_ent">
+                                                                <view v-for="(item, index2spm) in vss.config.data_list" :key="index2spm" class="item">
+                                                                    <view class="module-item" :style="vss.config.frontend_config.item_style">
+                                                                        <view
+                                                                        :class="vss.config.frontend_config.media_fixed.media_container_ent"
+                                                                        :style="vss.config.frontend_config.media_fixed.media_container_style" @tap="layout_url_event"
+                                                                        :data-value="item.goods_url || ''">
+                                                                            <image :src="item.images" mode="widthFix" :class="vss.config.frontend_config.media_fixed.media_ent" :style="vss.config.frontend_config.media_fixed.media_container_style" class="image"></image>
+                                                                            <view class="item-bottom">
+                                                                                <view class="module-title">
+                                                                                    {{item.title}}
+                                                                                </view>
+                                                                                <view class="module-price">
+                                                                                    {{currency_symbol}}{{item.price}}
+                                                                                </view>
+                                                                            </view>
+                                                                        </view>
+                                                                    </view>
+                                                                </view>
+                                                            </view>
+                                                        </block>
+                                                    </block>
+                                                </block>
+                                                <!-- 标题 -->
+                                                <block v-else-if="vss.value == 'title'">
+                                                    <view class="module-title-content">
+                                                        <text class="title-main" :style="vss.config.frontend_config.style_title_main">
+                                                            {{vss.config.title}}
+                                                        </text>
+                                                        <text v-if="(vss.config.title_vice || null) != null" class="title-vice"
+                                                        :style="vss.config.frontend_config.style_title_vice">
+                                                            {{vss.config.title_vice}}
+                                                        </text>
+                                                        <view v-if="(vss.config.title_more || null) != null" class="more-content">
+                                                            <view
+                                                            :style="vss.config.frontend_config.style_title_more" @tap="layout_url_event"
+                                                            :data-value="vss.config.title_more_url || ''">
+                                                                {{vss.config.title_more}} >
+                                                            </view>
+                                                        </view>
+                                                    </view>
+                                                </block>
+                                                <!-- 自定义html -->
+                                                <block v-else-if="vss.value == 'custom' && (vss.config.custom || null) != null">
+                                                    <mp-html :content="vss.config.custom" />
+                                                </block>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </block>
+                            </view>
+                        </block>
+                    </view>
+                </view>
+            </block>
+        </block>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                // 基础配置
+                is_first: 1,
+                currency_symbol: app.globalData.currency_symbol(),
+                // 轮播基础配置
+                indicator_color: 'rgba(0, 0, 0, .2)',
+                indicator_active_color: '#666',
+                circular: true
+            };
+        },
+
+        components: {},
+        props: {
+            propData: Array
+        },
+        // 在组件实例进入页面节点树时执行
+        beforeMount: function() {
+            this.init_config();
+        },
+        // 页面被展示
+        onPageShow: function() {
+            this.init_config();
+            
+            // 非首次进入则重新初始化配置接口
+            if (this.is_first == 0) {
+                app.globalData.init_config();
+            }
+
+            this.setData({
+                is_first: 0
+            });
+        },
+        methods: {
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    this.setData({
+                        currency_symbol: app.globalData.get_config('currency_symbol') || app.globalData.data.currency_symbol
+                    });
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 链接地址事件
+            layout_url_event(e) {
+                app.globalData.url_event(e);
+            }
+        }
+    };
+</script>
+<style>
+    /**
+     * 布局基础
+     */
+    .layout-content-children,.layout-content-container{overflow:hidden;width:100%;}
+    
+    /**
+     * 模块类型样式 - 数据列表
+     */
+    .module-list-content .item{float:left}
+    .module-list-content-avg-1{width:calc(100% + 1px);margin-left:-1px;margin-top:-1px;}
+    .module-list-content-avg-2{width:calc(100% + 2px);margin-left:-2px;margin-top:-2px;}
+    .module-list-content-avg-3{width:calc(100% + 3px);margin-left:-3px;margin-top:-3px;}
+    .module-list-content-avg-4{width:calc(100% + 4px);margin-left:-4px;margin-top:-4px;}
+    .module-list-content-avg-5{width:calc(100% + 5px);margin-left:-5px;margin-top:-5px;}
+    .module-list-content-avg-6{width:calc(100% + 6px);margin-left:-6px;margin-top:-6px;}
+    .module-list-content-avg-7{width:calc(100% + 7px);margin-left:-7px;margin-top:-7px;}
+    .module-list-content-avg-8{width:calc(100% + 8px);margin-left:-8px;margin-top:-8px;}
+    .module-list-content-avg-9{width:calc(100% + 9px);margin-left:-9px;margin-top:-9px;}
+    .module-list-content-avg-10{width:calc(100% + 10px);margin-left:-10px;margin-top:-10px;}
+    .module-list-content-avg-11{width:calc(100% + 11px);margin-left:-11px;margin-top:-11px;}
+    .module-list-content-avg-12{width:calc(100% + 12px);margin-left:-12px;margin-top:-12px;}
+    .module-list-content-avg-13{width:calc(100% + 13px);margin-left:-13px;margin-top:-13px;}
+    .module-list-content-avg-14{width:calc(100% + 14px);margin-left:-14px;margin-top:-14px;}
+    .module-list-content-avg-15{width:calc(100% + 15px);margin-left:-15px;margin-top:-15px;}
+    .module-list-content-avg-16{width:calc(100% + 16px);margin-left:-16px;margin-top:-16px;}
+    .module-list-content-avg-17{width:calc(100% + 17px);margin-left:-17px;margin-top:-17px;}
+    .module-list-content-avg-18{width:calc(100% + 18px);margin-left:-18px;margin-top:-18px;}
+    .module-list-content-avg-19{width:calc(100% + 19px);margin-left:-19px;margin-top:-19px;}
+    .module-list-content-avg-20{width:calc(100% + 20px);margin-left:-20px;margin-top:-20px;}
+    .module-list-content-avg-21{width:calc(100% + 21px);margin-left:-21px;margin-top:-21px;}
+    .module-list-content-avg-22{width:calc(100% + 22px);margin-left:-22px;margin-top:-22px;}
+    .module-list-content-avg-23{width:calc(100% + 23px);margin-left:-23px;margin-top:-23px;}
+    .module-list-content-avg-24{width:calc(100% + 24px);margin-left:-24px;margin-top:-24px;}
+    .module-list-content-avg-25{width:calc(100% + 25px);margin-left:-25px;margin-top:-25px;}
+    .module-list-content-avg-26{width:calc(100% + 26px);margin-left:-26px;margin-top:-26px;}
+    .module-list-content-avg-27{width:calc(100% + 27px);margin-left:-27px;margin-top:-27px;}
+    .module-list-content-avg-28{width:calc(100% + 28px);margin-left:-28px;margin-top:-28px;}
+    .module-list-content-avg-29{width:calc(100% + 29px);margin-left:-29px;margin-top:-29px;}
+    .module-list-content-avg-30{width:calc(100% + 30px);margin-left:-30px;margin-top:-30px;}
+    .module-list-sm-1 .item{width:100%;}
+    .module-list-sm-2 .item{width:50%;}
+    .module-list-sm-3 .item{width:33.33%;}
+    .module-list-sm-4 .item{width:25%;}
+    .module-list-sm-5 .item{width:20%;}
+    .module-list-sm-6 .item{width:16.66%;}
+    .module-list-sm-7 .item{width:14.28%;}
+    .module-list-sm-8 .item{width:12.5%;}
+    .module-list-sm-9 .item{width:11.11%;}
+    .module-list-sm-10 .item{width:10%;}
+    .module-list-sm-11 .item{width:9.09%;}
+    .module-list-sm-12 .item{width:8.33%;}
+    
+    /**
+     * 商品列表
+     */
+    .module-goods-content .module-item{background:#fff}
+    .module-goods-content .module-item .item-bottom{margin-top:5px}
+    .module-goods-content .module-item .module-title{margin-bottom:5px;max-width:100%;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;min-height:40px;line-height:20px;font-size:12px;white-space:initial}
+    .module-goods-content .module-item .module-price{color:#f40;font-weight:bold;word-wrap:normal;text-overflow:ellipsis;white-space:nowrap;font-size:14px;}
+     
+     
+    /**
+     * 布局圆角
+     */
+    .layout-sm-border-radius-1{border-radius:1px;}
+    .layout-sm-border-radius-2{border-radius:2px;}
+    .layout-sm-border-radius-3{border-radius:3px;}
+    .layout-sm-border-radius-4{border-radius:4px;}
+    .layout-sm-border-radius-5{border-radius:5px;}
+    .layout-sm-border-radius-6{border-radius:6px;}
+    .layout-sm-border-radius-7{border-radius:7px;}
+    .layout-sm-border-radius-8{border-radius:8px;}
+    .layout-sm-border-radius-9{border-radius:9px;}
+    .layout-sm-border-radius-10{border-radius:10px;}
+    .layout-sm-border-radius-11{border-radius:11px;}
+    .layout-sm-border-radius-12{border-radius:12px;}
+    .layout-sm-border-radius-13{border-radius:13px;}
+    .layout-sm-border-radius-14{border-radius:14px;}
+    .layout-sm-border-radius-15{border-radius:15px;}
+    .layout-sm-border-radius-16{border-radius:16px;}
+    .layout-sm-border-radius-17{border-radius:17px;}
+    .layout-sm-border-radius-18{border-radius:18px;}
+    .layout-sm-border-radius-19{border-radius:19px;}
+    .layout-sm-border-radius-20{border-radius:20px;}
+    .layout-sm-border-radius-21{border-radius:21px;}
+    .layout-sm-border-radius-22{border-radius:22px;}
+    .layout-sm-border-radius-23{border-radius:23px;}
+    .layout-sm-border-radius-24{border-radius:24px;}
+    .layout-sm-border-radius-25{border-radius:25px;}
+    .layout-sm-border-radius-26{border-radius:26px;}
+    .layout-sm-border-radius-27{border-radius:27px;}
+    .layout-sm-border-radius-28{border-radius:28px;}
+    .layout-sm-border-radius-29{border-radius:29px;}
+    .layout-sm-border-radius-30{border-radius:30px;}
+     
+    /**
+     * 布局样式 - 边线大小
+     */
+    .layout-sm-border-top-1{border-top:1px;}
+    .layout-sm-border-top-2{border-top:2px;}
+    .layout-sm-border-top-3{border-top:3px;}
+    .layout-sm-border-top-4{border-top:4px;}
+    .layout-sm-border-top-5{border-top:5px;}
+    .layout-sm-border-top-6{border-top:6px;}
+    .layout-sm-border-top-7{border-top:7px;}
+    .layout-sm-border-top-8{border-top:8px;}
+    .layout-sm-border-top-9{border-top:9px;}
+    .layout-sm-border-top-10{border-top:10px;}
+    
+    .layout-sm-border-right-1{border-right:1px;}
+    .layout-sm-border-right-2{border-right:2px;}
+    .layout-sm-border-right-3{border-right:3px;}
+    .layout-sm-border-right-4{border-right:4px;}
+    .layout-sm-border-right-5{border-right:5px;}
+    .layout-sm-border-right-6{border-right:6px;}
+    .layout-sm-border-right-7{border-right:7px;}
+    .layout-sm-border-right-8{border-right:8px;}
+    .layout-sm-border-right-9{border-right:9px;}
+    .layout-sm-border-right-10{border-right:10px;}
+    
+    .layout-sm-border-bottom-1{border-bottom:1px;}
+    .layout-sm-border-bottom-2{border-bottom:2px;}
+    .layout-sm-border-bottom-3{border-bottom:3px;}
+    .layout-sm-border-bottom-4{border-bottom:4px;}
+    .layout-sm-border-bottom-5{border-bottom:5px;}
+    .layout-sm-border-bottom-6{border-bottom:6px;}
+    .layout-sm-border-bottom-7{border-bottom:7px;}
+    .layout-sm-border-bottom-8{border-bottom:8px;}
+    .layout-sm-border-bottom-9{border-bottom:9px;}
+    .layout-sm-border-bottom-10{border-bottom:10px;}
+    
+    .layout-sm-border-left-1{border-left:1px;}
+    .layout-sm-border-left-2{border-left:2px;}
+    .layout-sm-border-left-3{border-left:3px;}
+    .layout-sm-border-left-4{border-left:4px;}
+    .layout-sm-border-left-5{border-left:5px;}
+    .layout-sm-border-left-6{border-left:6px;}
+    .layout-sm-border-left-7{border-left:7px;}
+    .layout-sm-border-left-8{border-left:8px;}
+    .layout-sm-border-left-9{border-left:9px;}
+    .layout-sm-border-left-10{border-left:10px;}
+     
+    /**
+     * 布局边线 - 边线类型
+     */
+    .layout-sm-border-top-solid{border-top-style:solid;}
+    .layout-sm-border-top-dashed{border-top-style:dashed;}
+    .layout-sm-border-top-dotted{border-top-style:dotted;}
+    .layout-sm-border-top-double{border-top-style:double;}
+    
+    .layout-sm-border-right-solid{border-right-style:solid;}
+    .layout-sm-border-right-dashed{border-right-style:dashed;}
+    .layout-sm-border-right-dotted{border-right-style:dotted;}
+    .layout-sm-border-right-double{border-right-style:double;}
+    
+    .layout-sm-border-bottom-solid{border-bottom-style:solid;}
+    .layout-sm-border-bottom-dashed{border-bottom-style:dashed;}
+    .layout-sm-border-bottom-dotted{border-bottom-style:dotted;}
+    .layout-sm-border-bottom-double{border-bottom-style:double;}
+    
+    .layout-sm-border-left-solid{border-left-style:solid;}
+    .layout-sm-border-left-dashed{border-left-style:dashed;}
+    .layout-sm-border-left-dotted{border-left-style:dotted;}
+    .layout-sm-border-left-double{border-left-style:double;}
+     
+    /**
+     * 布局外边距
+     */
+    .layout-sm-margin-top-1{margin-top:1px;}
+    .layout-sm-margin-top-2{margin-top:2px;}
+    .layout-sm-margin-top-3{margin-top:3px;}
+    .layout-sm-margin-top-4{margin-top:4px;}
+    .layout-sm-margin-top-5{margin-top:5px;}
+    .layout-sm-margin-top-6{margin-top:6px;}
+    .layout-sm-margin-top-7{margin-top:7px;}
+    .layout-sm-margin-top-8{margin-top:8px;}
+    .layout-sm-margin-top-9{margin-top:9px;}
+    .layout-sm-margin-top-10{margin-top:10px;}
+    .layout-sm-margin-top-11{margin-top:11px;}
+    .layout-sm-margin-top-12{margin-top:12px;}
+    .layout-sm-margin-top-13{margin-top:13px;}
+    .layout-sm-margin-top-14{margin-top:14px;}
+    .layout-sm-margin-top-15{margin-top:15px;}
+    .layout-sm-margin-top-16{margin-top:16px;}
+    .layout-sm-margin-top-17{margin-top:17px;}
+    .layout-sm-margin-top-18{margin-top:18px;}
+    .layout-sm-margin-top-19{margin-top:19px;}
+    .layout-sm-margin-top-20{margin-top:20px;}
+    .layout-sm-margin-top-21{margin-top:21px;}
+    .layout-sm-margin-top-22{margin-top:22px;}
+    .layout-sm-margin-top-23{margin-top:23px;}
+    .layout-sm-margin-top-24{margin-top:24px;}
+    .layout-sm-margin-top-25{margin-top:25px;}
+    .layout-sm-margin-top-26{margin-top:26px;}
+    .layout-sm-margin-top-27{margin-top:27px;}
+    .layout-sm-margin-top-28{margin-top:28px;}
+    .layout-sm-margin-top-29{margin-top:29px;}
+    .layout-sm-margin-top-30{margin-top:30px;}
+    .layout-sm-margin-top-31{margin-top:31px;}
+    .layout-sm-margin-top-32{margin-top:32px;}
+    .layout-sm-margin-top-33{margin-top:33px;}
+    .layout-sm-margin-top-34{margin-top:34px;}
+    .layout-sm-margin-top-35{margin-top:35px;}
+    .layout-sm-margin-top-36{margin-top:36px;}
+    .layout-sm-margin-top-37{margin-top:37px;}
+    .layout-sm-margin-top-38{margin-top:38px;}
+    .layout-sm-margin-top-39{margin-top:39px;}
+    .layout-sm-margin-top-40{margin-top:40px;}
+    .layout-sm-margin-top-41{margin-top:41px;}
+    .layout-sm-margin-top-42{margin-top:42px;}
+    .layout-sm-margin-top-43{margin-top:43px;}
+    .layout-sm-margin-top-44{margin-top:44px;}
+    .layout-sm-margin-top-45{margin-top:45px;}
+    .layout-sm-margin-top-46{margin-top:46px;}
+    .layout-sm-margin-top-47{margin-top:47px;}
+    .layout-sm-margin-top-48{margin-top:48px;}
+    .layout-sm-margin-top-49{margin-top:49px;}
+    .layout-sm-margin-top-50{margin-top:50px;}
+    .layout-sm-margin-top-51{margin-top:51px;}
+    .layout-sm-margin-top-52{margin-top:52px;}
+    .layout-sm-margin-top-53{margin-top:53px;}
+    .layout-sm-margin-top-54{margin-top:54px;}
+    .layout-sm-margin-top-55{margin-top:55px;}
+    .layout-sm-margin-top-56{margin-top:56px;}
+    .layout-sm-margin-top-57{margin-top:57px;}
+    .layout-sm-margin-top-58{margin-top:58px;}
+    .layout-sm-margin-top-59{margin-top:59px;}
+    .layout-sm-margin-top-60{margin-top:60px;}
+    
+    .layout-sm-margin-right-1{margin-right:1px;}
+    .layout-sm-margin-right-2{margin-right:2px;}
+    .layout-sm-margin-right-3{margin-right:3px;}
+    .layout-sm-margin-right-4{margin-right:4px;}
+    .layout-sm-margin-right-5{margin-right:5px;}
+    .layout-sm-margin-right-6{margin-right:6px;}
+    .layout-sm-margin-right-7{margin-right:7px;}
+    .layout-sm-margin-right-8{margin-right:8px;}
+    .layout-sm-margin-right-9{margin-right:9px;}
+    .layout-sm-margin-right-10{margin-right:10px;}
+    .layout-sm-margin-right-11{margin-right:11px;}
+    .layout-sm-margin-right-12{margin-right:12px;}
+    .layout-sm-margin-right-13{margin-right:13px;}
+    .layout-sm-margin-right-14{margin-right:14px;}
+    .layout-sm-margin-right-15{margin-right:15px;}
+    .layout-sm-margin-right-16{margin-right:16px;}
+    .layout-sm-margin-right-17{margin-right:17px;}
+    .layout-sm-margin-right-18{margin-right:18px;}
+    .layout-sm-margin-right-19{margin-right:19px;}
+    .layout-sm-margin-right-20{margin-right:20px;}
+    .layout-sm-margin-right-21{margin-right:21px;}
+    .layout-sm-margin-right-22{margin-right:22px;}
+    .layout-sm-margin-right-23{margin-right:23px;}
+    .layout-sm-margin-right-24{margin-right:24px;}
+    .layout-sm-margin-right-25{margin-right:25px;}
+    .layout-sm-margin-right-26{margin-right:26px;}
+    .layout-sm-margin-right-27{margin-right:27px;}
+    .layout-sm-margin-right-28{margin-right:28px;}
+    .layout-sm-margin-right-29{margin-right:29px;}
+    .layout-sm-margin-right-30{margin-right:30px;}
+    .layout-sm-margin-right-31{margin-right:31px;}
+    .layout-sm-margin-right-32{margin-right:32px;}
+    .layout-sm-margin-right-33{margin-right:33px;}
+    .layout-sm-margin-right-34{margin-right:34px;}
+    .layout-sm-margin-right-35{margin-right:35px;}
+    .layout-sm-margin-right-36{margin-right:36px;}
+    .layout-sm-margin-right-37{margin-right:37px;}
+    .layout-sm-margin-right-38{margin-right:38px;}
+    .layout-sm-margin-right-39{margin-right:39px;}
+    .layout-sm-margin-right-40{margin-right:40px;}
+    .layout-sm-margin-right-41{margin-right:41px;}
+    .layout-sm-margin-right-42{margin-right:42px;}
+    .layout-sm-margin-right-43{margin-right:43px;}
+    .layout-sm-margin-right-44{margin-right:44px;}
+    .layout-sm-margin-right-45{margin-right:45px;}
+    .layout-sm-margin-right-46{margin-right:46px;}
+    .layout-sm-margin-right-47{margin-right:47px;}
+    .layout-sm-margin-right-48{margin-right:48px;}
+    .layout-sm-margin-right-49{margin-right:49px;}
+    .layout-sm-margin-right-50{margin-right:50px;}
+    .layout-sm-margin-right-51{margin-right:51px;}
+    .layout-sm-margin-right-52{margin-right:52px;}
+    .layout-sm-margin-right-53{margin-right:53px;}
+    .layout-sm-margin-right-54{margin-right:54px;}
+    .layout-sm-margin-right-55{margin-right:55px;}
+    .layout-sm-margin-right-56{margin-right:56px;}
+    .layout-sm-margin-right-57{margin-right:57px;}
+    .layout-sm-margin-right-58{margin-right:58px;}
+    .layout-sm-margin-right-59{margin-right:59px;}
+    .layout-sm-margin-right-60{margin-right:60px;}
+    
+    .layout-sm-margin-bottom-1{margin-bottom:1px;}
+    .layout-sm-margin-bottom-2{margin-bottom:2px;}
+    .layout-sm-margin-bottom-3{margin-bottom:3px;}
+    .layout-sm-margin-bottom-4{margin-bottom:4px;}
+    .layout-sm-margin-bottom-5{margin-bottom:5px;}
+    .layout-sm-margin-bottom-6{margin-bottom:6px;}
+    .layout-sm-margin-bottom-7{margin-bottom:7px;}
+    .layout-sm-margin-bottom-8{margin-bottom:8px;}
+    .layout-sm-margin-bottom-9{margin-bottom:9px;}
+    .layout-sm-margin-bottom-10{margin-bottom:10px;}
+    .layout-sm-margin-bottom-11{margin-bottom:11px;}
+    .layout-sm-margin-bottom-12{margin-bottom:12px;}
+    .layout-sm-margin-bottom-13{margin-bottom:13px;}
+    .layout-sm-margin-bottom-14{margin-bottom:14px;}
+    .layout-sm-margin-bottom-15{margin-bottom:15px;}
+    .layout-sm-margin-bottom-16{margin-bottom:16px;}
+    .layout-sm-margin-bottom-17{margin-bottom:17px;}
+    .layout-sm-margin-bottom-18{margin-bottom:18px;}
+    .layout-sm-margin-bottom-19{margin-bottom:19px;}
+    .layout-sm-margin-bottom-20{margin-bottom:20px;}
+    .layout-sm-margin-bottom-21{margin-bottom:21px;}
+    .layout-sm-margin-bottom-22{margin-bottom:22px;}
+    .layout-sm-margin-bottom-23{margin-bottom:23px;}
+    .layout-sm-margin-bottom-24{margin-bottom:24px;}
+    .layout-sm-margin-bottom-25{margin-bottom:25px;}
+    .layout-sm-margin-bottom-26{margin-bottom:26px;}
+    .layout-sm-margin-bottom-27{margin-bottom:27px;}
+    .layout-sm-margin-bottom-28{margin-bottom:28px;}
+    .layout-sm-margin-bottom-29{margin-bottom:29px;}
+    .layout-sm-margin-bottom-30{margin-bottom:30px;}
+    .layout-sm-margin-bottom-31{margin-bottom:31px;}
+    .layout-sm-margin-bottom-32{margin-bottom:32px;}
+    .layout-sm-margin-bottom-33{margin-bottom:33px;}
+    .layout-sm-margin-bottom-34{margin-bottom:34px;}
+    .layout-sm-margin-bottom-35{margin-bottom:35px;}
+    .layout-sm-margin-bottom-36{margin-bottom:36px;}
+    .layout-sm-margin-bottom-37{margin-bottom:37px;}
+    .layout-sm-margin-bottom-38{margin-bottom:38px;}
+    .layout-sm-margin-bottom-39{margin-bottom:39px;}
+    .layout-sm-margin-bottom-40{margin-bottom:40px;}
+    .layout-sm-margin-bottom-41{margin-bottom:41px;}
+    .layout-sm-margin-bottom-42{margin-bottom:42px;}
+    .layout-sm-margin-bottom-43{margin-bottom:43px;}
+    .layout-sm-margin-bottom-44{margin-bottom:44px;}
+    .layout-sm-margin-bottom-45{margin-bottom:45px;}
+    .layout-sm-margin-bottom-46{margin-bottom:46px;}
+    .layout-sm-margin-bottom-47{margin-bottom:47px;}
+    .layout-sm-margin-bottom-48{margin-bottom:48px;}
+    .layout-sm-margin-bottom-49{margin-bottom:49px;}
+    .layout-sm-margin-bottom-50{margin-bottom:50px;}
+    .layout-sm-margin-bottom-51{margin-bottom:51px;}
+    .layout-sm-margin-bottom-52{margin-bottom:52px;}
+    .layout-sm-margin-bottom-53{margin-bottom:53px;}
+    .layout-sm-margin-bottom-54{margin-bottom:54px;}
+    .layout-sm-margin-bottom-55{margin-bottom:55px;}
+    .layout-sm-margin-bottom-56{margin-bottom:56px;}
+    .layout-sm-margin-bottom-57{margin-bottom:57px;}
+    .layout-sm-margin-bottom-58{margin-bottom:58px;}
+    .layout-sm-margin-bottom-59{margin-bottom:59px;}
+    .layout-sm-margin-bottom-60{margin-bottom:60px;}
+    
+    .layout-sm-margin-left-1{margin-left:1px;}
+    .layout-sm-margin-left-2{margin-left:2px;}
+    .layout-sm-margin-left-3{margin-left:3px;}
+    .layout-sm-margin-left-4{margin-left:4px;}
+    .layout-sm-margin-left-5{margin-left:5px;}
+    .layout-sm-margin-left-6{margin-left:6px;}
+    .layout-sm-margin-left-7{margin-left:7px;}
+    .layout-sm-margin-left-8{margin-left:8px;}
+    .layout-sm-margin-left-9{margin-left:9px;}
+    .layout-sm-margin-left-10{margin-left:10px;}
+    .layout-sm-margin-left-11{margin-left:11px;}
+    .layout-sm-margin-left-12{margin-left:12px;}
+    .layout-sm-margin-left-13{margin-left:13px;}
+    .layout-sm-margin-left-14{margin-left:14px;}
+    .layout-sm-margin-left-15{margin-left:15px;}
+    .layout-sm-margin-left-16{margin-left:16px;}
+    .layout-sm-margin-left-17{margin-left:17px;}
+    .layout-sm-margin-left-18{margin-left:18px;}
+    .layout-sm-margin-left-19{margin-left:19px;}
+    .layout-sm-margin-left-20{margin-left:20px;}
+    .layout-sm-margin-left-21{margin-left:21px;}
+    .layout-sm-margin-left-22{margin-left:22px;}
+    .layout-sm-margin-left-23{margin-left:23px;}
+    .layout-sm-margin-left-24{margin-left:24px;}
+    .layout-sm-margin-left-25{margin-left:25px;}
+    .layout-sm-margin-left-26{margin-left:26px;}
+    .layout-sm-margin-left-27{margin-left:27px;}
+    .layout-sm-margin-left-28{margin-left:28px;}
+    .layout-sm-margin-left-29{margin-left:29px;}
+    .layout-sm-margin-left-30{margin-left:30px;}
+    .layout-sm-margin-left-31{margin-left:31px;}
+    .layout-sm-margin-left-32{margin-left:32px;}
+    .layout-sm-margin-left-33{margin-left:33px;}
+    .layout-sm-margin-left-34{margin-left:34px;}
+    .layout-sm-margin-left-35{margin-left:35px;}
+    .layout-sm-margin-left-36{margin-left:36px;}
+    .layout-sm-margin-left-37{margin-left:37px;}
+    .layout-sm-margin-left-38{margin-left:38px;}
+    .layout-sm-margin-left-39{margin-left:39px;}
+    .layout-sm-margin-left-40{margin-left:40px;}
+    .layout-sm-margin-left-41{margin-left:41px;}
+    .layout-sm-margin-left-42{margin-left:42px;}
+    .layout-sm-margin-left-43{margin-left:43px;}
+    .layout-sm-margin-left-44{margin-left:44px;}
+    .layout-sm-margin-left-45{margin-left:45px;}
+    .layout-sm-margin-left-46{margin-left:46px;}
+    .layout-sm-margin-left-47{margin-left:47px;}
+    .layout-sm-margin-left-48{margin-left:48px;}
+    .layout-sm-margin-left-49{margin-left:49px;}
+    .layout-sm-margin-left-50{margin-left:50px;}
+    .layout-sm-margin-left-51{margin-left:51px;}
+    .layout-sm-margin-left-52{margin-left:52px;}
+    .layout-sm-margin-left-53{margin-left:53px;}
+    .layout-sm-margin-left-54{margin-left:54px;}
+    .layout-sm-margin-left-55{margin-left:55px;}
+    .layout-sm-margin-left-56{margin-left:56px;}
+    .layout-sm-margin-left-57{margin-left:57px;}
+    .layout-sm-margin-left-58{margin-left:58px;}
+    .layout-sm-margin-left-59{margin-left:59px;}
+    .layout-sm-margin-left-60{margin-left:60px;}
+     
+    /**
+     * 布局内边距
+     */
+    .layout-sm-padding-top-1{padding-top:1px;}
+    .layout-sm-padding-top-2{padding-top:2px;}
+    .layout-sm-padding-top-3{padding-top:3px;}
+    .layout-sm-padding-top-4{padding-top:4px;}
+    .layout-sm-padding-top-5{padding-top:5px;}
+    .layout-sm-padding-top-6{padding-top:6px;}
+    .layout-sm-padding-top-7{padding-top:7px;}
+    .layout-sm-padding-top-8{padding-top:8px;}
+    .layout-sm-padding-top-9{padding-top:9px;}
+    .layout-sm-padding-top-10{padding-top:10px;}
+    .layout-sm-padding-top-11{padding-top:11px;}
+    .layout-sm-padding-top-12{padding-top:12px;}
+    .layout-sm-padding-top-13{padding-top:13px;}
+    .layout-sm-padding-top-14{padding-top:14px;}
+    .layout-sm-padding-top-15{padding-top:15px;}
+    .layout-sm-padding-top-16{padding-top:16px;}
+    .layout-sm-padding-top-17{padding-top:17px;}
+    .layout-sm-padding-top-18{padding-top:18px;}
+    .layout-sm-padding-top-19{padding-top:19px;}
+    .layout-sm-padding-top-20{padding-top:20px;}
+    .layout-sm-padding-top-21{padding-top:21px;}
+    .layout-sm-padding-top-22{padding-top:22px;}
+    .layout-sm-padding-top-23{padding-top:23px;}
+    .layout-sm-padding-top-24{padding-top:24px;}
+    .layout-sm-padding-top-25{padding-top:25px;}
+    .layout-sm-padding-top-26{padding-top:26px;}
+    .layout-sm-padding-top-27{padding-top:27px;}
+    .layout-sm-padding-top-28{padding-top:28px;}
+    .layout-sm-padding-top-29{padding-top:29px;}
+    .layout-sm-padding-top-30{padding-top:30px;}
+    .layout-sm-padding-top-31{padding-top:31px;}
+    .layout-sm-padding-top-32{padding-top:32px;}
+    .layout-sm-padding-top-33{padding-top:33px;}
+    .layout-sm-padding-top-34{padding-top:34px;}
+    .layout-sm-padding-top-35{padding-top:35px;}
+    .layout-sm-padding-top-36{padding-top:36px;}
+    .layout-sm-padding-top-37{padding-top:37px;}
+    .layout-sm-padding-top-38{padding-top:38px;}
+    .layout-sm-padding-top-39{padding-top:39px;}
+    .layout-sm-padding-top-40{padding-top:40px;}
+    .layout-sm-padding-top-41{padding-top:41px;}
+    .layout-sm-padding-top-42{padding-top:42px;}
+    .layout-sm-padding-top-43{padding-top:43px;}
+    .layout-sm-padding-top-44{padding-top:44px;}
+    .layout-sm-padding-top-45{padding-top:45px;}
+    .layout-sm-padding-top-46{padding-top:46px;}
+    .layout-sm-padding-top-47{padding-top:47px;}
+    .layout-sm-padding-top-48{padding-top:48px;}
+    .layout-sm-padding-top-49{padding-top:49px;}
+    .layout-sm-padding-top-50{padding-top:50px;}
+    .layout-sm-padding-top-51{padding-top:51px;}
+    .layout-sm-padding-top-52{padding-top:52px;}
+    .layout-sm-padding-top-53{padding-top:53px;}
+    .layout-sm-padding-top-54{padding-top:54px;}
+    .layout-sm-padding-top-55{padding-top:55px;}
+    .layout-sm-padding-top-56{padding-top:56px;}
+    .layout-sm-padding-top-57{padding-top:57px;}
+    .layout-sm-padding-top-58{padding-top:58px;}
+    .layout-sm-padding-top-59{padding-top:59px;}
+    .layout-sm-padding-top-60{padding-top:60px;}
+    
+    .layout-sm-padding-right-1{padding-right:1px;}
+    .layout-sm-padding-right-2{padding-right:2px;}
+    .layout-sm-padding-right-3{padding-right:3px;}
+    .layout-sm-padding-right-4{padding-right:4px;}
+    .layout-sm-padding-right-5{padding-right:5px;}
+    .layout-sm-padding-right-6{padding-right:6px;}
+    .layout-sm-padding-right-7{padding-right:7px;}
+    .layout-sm-padding-right-8{padding-right:8px;}
+    .layout-sm-padding-right-9{padding-right:9px;}
+    .layout-sm-padding-right-10{padding-right:10px;}
+    .layout-sm-padding-right-11{padding-right:11px;}
+    .layout-sm-padding-right-12{padding-right:12px;}
+    .layout-sm-padding-right-13{padding-right:13px;}
+    .layout-sm-padding-right-14{padding-right:14px;}
+    .layout-sm-padding-right-15{padding-right:15px;}
+    .layout-sm-padding-right-16{padding-right:16px;}
+    .layout-sm-padding-right-17{padding-right:17px;}
+    .layout-sm-padding-right-18{padding-right:18px;}
+    .layout-sm-padding-right-19{padding-right:19px;}
+    .layout-sm-padding-right-20{padding-right:20px;}
+    .layout-sm-padding-right-21{padding-right:21px;}
+    .layout-sm-padding-right-22{padding-right:22px;}
+    .layout-sm-padding-right-23{padding-right:23px;}
+    .layout-sm-padding-right-24{padding-right:24px;}
+    .layout-sm-padding-right-25{padding-right:25px;}
+    .layout-sm-padding-right-26{padding-right:26px;}
+    .layout-sm-padding-right-27{padding-right:27px;}
+    .layout-sm-padding-right-28{padding-right:28px;}
+    .layout-sm-padding-right-29{padding-right:29px;}
+    .layout-sm-padding-right-30{padding-right:30px;}
+    .layout-sm-padding-right-31{padding-right:31px;}
+    .layout-sm-padding-right-32{padding-right:32px;}
+    .layout-sm-padding-right-33{padding-right:33px;}
+    .layout-sm-padding-right-34{padding-right:34px;}
+    .layout-sm-padding-right-35{padding-right:35px;}
+    .layout-sm-padding-right-36{padding-right:36px;}
+    .layout-sm-padding-right-37{padding-right:37px;}
+    .layout-sm-padding-right-38{padding-right:38px;}
+    .layout-sm-padding-right-39{padding-right:39px;}
+    .layout-sm-padding-right-40{padding-right:40px;}
+    .layout-sm-padding-right-41{padding-right:41px;}
+    .layout-sm-padding-right-42{padding-right:42px;}
+    .layout-sm-padding-right-43{padding-right:43px;}
+    .layout-sm-padding-right-44{padding-right:44px;}
+    .layout-sm-padding-right-45{padding-right:45px;}
+    .layout-sm-padding-right-46{padding-right:46px;}
+    .layout-sm-padding-right-47{padding-right:47px;}
+    .layout-sm-padding-right-48{padding-right:48px;}
+    .layout-sm-padding-right-49{padding-right:49px;}
+    .layout-sm-padding-right-50{padding-right:50px;}
+    .layout-sm-padding-right-51{padding-right:51px;}
+    .layout-sm-padding-right-52{padding-right:52px;}
+    .layout-sm-padding-right-53{padding-right:53px;}
+    .layout-sm-padding-right-54{padding-right:54px;}
+    .layout-sm-padding-right-55{padding-right:55px;}
+    .layout-sm-padding-right-56{padding-right:56px;}
+    .layout-sm-padding-right-57{padding-right:57px;}
+    .layout-sm-padding-right-58{padding-right:58px;}
+    .layout-sm-padding-right-59{padding-right:59px;}
+    .layout-sm-padding-right-60{padding-right:60px;}
+    
+    .layout-sm-padding-bottom-1{padding-bottom:1px;}
+    .layout-sm-padding-bottom-2{padding-bottom:2px;}
+    .layout-sm-padding-bottom-3{padding-bottom:3px;}
+    .layout-sm-padding-bottom-4{padding-bottom:4px;}
+    .layout-sm-padding-bottom-5{padding-bottom:5px;}
+    .layout-sm-padding-bottom-6{padding-bottom:6px;}
+    .layout-sm-padding-bottom-7{padding-bottom:7px;}
+    .layout-sm-padding-bottom-8{padding-bottom:8px;}
+    .layout-sm-padding-bottom-9{padding-bottom:9px;}
+    .layout-sm-padding-bottom-10{padding-bottom:10px;}
+    .layout-sm-padding-bottom-11{padding-bottom:11px;}
+    .layout-sm-padding-bottom-12{padding-bottom:12px;}
+    .layout-sm-padding-bottom-13{padding-bottom:13px;}
+    .layout-sm-padding-bottom-14{padding-bottom:14px;}
+    .layout-sm-padding-bottom-15{padding-bottom:15px;}
+    .layout-sm-padding-bottom-16{padding-bottom:16px;}
+    .layout-sm-padding-bottom-17{padding-bottom:17px;}
+    .layout-sm-padding-bottom-18{padding-bottom:18px;}
+    .layout-sm-padding-bottom-19{padding-bottom:19px;}
+    .layout-sm-padding-bottom-20{padding-bottom:20px;}
+    .layout-sm-padding-bottom-21{padding-bottom:21px;}
+    .layout-sm-padding-bottom-22{padding-bottom:22px;}
+    .layout-sm-padding-bottom-23{padding-bottom:23px;}
+    .layout-sm-padding-bottom-24{padding-bottom:24px;}
+    .layout-sm-padding-bottom-25{padding-bottom:25px;}
+    .layout-sm-padding-bottom-26{padding-bottom:26px;}
+    .layout-sm-padding-bottom-27{padding-bottom:27px;}
+    .layout-sm-padding-bottom-28{padding-bottom:28px;}
+    .layout-sm-padding-bottom-29{padding-bottom:29px;}
+    .layout-sm-padding-bottom-30{padding-bottom:30px;}
+    .layout-sm-padding-bottom-31{padding-bottom:31px;}
+    .layout-sm-padding-bottom-32{padding-bottom:32px;}
+    .layout-sm-padding-bottom-33{padding-bottom:33px;}
+    .layout-sm-padding-bottom-34{padding-bottom:34px;}
+    .layout-sm-padding-bottom-35{padding-bottom:35px;}
+    .layout-sm-padding-bottom-36{padding-bottom:36px;}
+    .layout-sm-padding-bottom-37{padding-bottom:37px;}
+    .layout-sm-padding-bottom-38{padding-bottom:38px;}
+    .layout-sm-padding-bottom-39{padding-bottom:39px;}
+    .layout-sm-padding-bottom-40{padding-bottom:40px;}
+    .layout-sm-padding-bottom-41{padding-bottom:41px;}
+    .layout-sm-padding-bottom-42{padding-bottom:42px;}
+    .layout-sm-padding-bottom-43{padding-bottom:43px;}
+    .layout-sm-padding-bottom-44{padding-bottom:44px;}
+    .layout-sm-padding-bottom-45{padding-bottom:45px;}
+    .layout-sm-padding-bottom-46{padding-bottom:46px;}
+    .layout-sm-padding-bottom-47{padding-bottom:47px;}
+    .layout-sm-padding-bottom-48{padding-bottom:48px;}
+    .layout-sm-padding-bottom-49{padding-bottom:49px;}
+    .layout-sm-padding-bottom-50{padding-bottom:50px;}
+    .layout-sm-padding-bottom-51{padding-bottom:51px;}
+    .layout-sm-padding-bottom-52{padding-bottom:52px;}
+    .layout-sm-padding-bottom-53{padding-bottom:53px;}
+    .layout-sm-padding-bottom-54{padding-bottom:54px;}
+    .layout-sm-padding-bottom-55{padding-bottom:55px;}
+    .layout-sm-padding-bottom-56{padding-bottom:56px;}
+    .layout-sm-padding-bottom-57{padding-bottom:57px;}
+    .layout-sm-padding-bottom-58{padding-bottom:58px;}
+    .layout-sm-padding-bottom-59{padding-bottom:59px;}
+    .layout-sm-padding-bottom-60{padding-bottom:60px;}
+    
+    .layout-sm-padding-left-1{padding-left:1px;}
+    .layout-sm-padding-left-2{padding-left:2px;}
+    .layout-sm-padding-left-3{padding-left:3px;}
+    .layout-sm-padding-left-4{padding-left:4px;}
+    .layout-sm-padding-left-5{padding-left:5px;}
+    .layout-sm-padding-left-6{padding-left:6px;}
+    .layout-sm-padding-left-7{padding-left:7px;}
+    .layout-sm-padding-left-8{padding-left:8px;}
+    .layout-sm-padding-left-9{padding-left:9px;}
+    .layout-sm-padding-left-10{padding-left:10px;}
+    .layout-sm-padding-left-11{padding-left:11px;}
+    .layout-sm-padding-left-12{padding-left:12px;}
+    .layout-sm-padding-left-13{padding-left:13px;}
+    .layout-sm-padding-left-14{padding-left:14px;}
+    .layout-sm-padding-left-15{padding-left:15px;}
+    .layout-sm-padding-left-16{padding-left:16px;}
+    .layout-sm-padding-left-17{padding-left:17px;}
+    .layout-sm-padding-left-18{padding-left:18px;}
+    .layout-sm-padding-left-19{padding-left:19px;}
+    .layout-sm-padding-left-20{padding-left:20px;}
+    .layout-sm-padding-left-21{padding-left:21px;}
+    .layout-sm-padding-left-22{padding-left:22px;}
+    .layout-sm-padding-left-23{padding-left:23px;}
+    .layout-sm-padding-left-24{padding-left:24px;}
+    .layout-sm-padding-left-25{padding-left:25px;}
+    .layout-sm-padding-left-26{padding-left:26px;}
+    .layout-sm-padding-left-27{padding-left:27px;}
+    .layout-sm-padding-left-28{padding-left:28px;}
+    .layout-sm-padding-left-29{padding-left:29px;}
+    .layout-sm-padding-left-30{padding-left:30px;}
+    .layout-sm-padding-left-31{padding-left:31px;}
+    .layout-sm-padding-left-32{padding-left:32px;}
+    .layout-sm-padding-left-33{padding-left:33px;}
+    .layout-sm-padding-left-34{padding-left:34px;}
+    .layout-sm-padding-left-35{padding-left:35px;}
+    .layout-sm-padding-left-36{padding-left:36px;}
+    .layout-sm-padding-left-37{padding-left:37px;}
+    .layout-sm-padding-left-38{padding-left:38px;}
+    .layout-sm-padding-left-39{padding-left:39px;}
+    .layout-sm-padding-left-40{padding-left:40px;}
+    .layout-sm-padding-left-41{padding-left:41px;}
+    .layout-sm-padding-left-42{padding-left:42px;}
+    .layout-sm-padding-left-43{padding-left:43px;}
+    .layout-sm-padding-left-44{padding-left:44px;}
+    .layout-sm-padding-left-45{padding-left:45px;}
+    .layout-sm-padding-left-46{padding-left:46px;}
+    .layout-sm-padding-left-47{padding-left:47px;}
+    .layout-sm-padding-left-48{padding-left:48px;}
+    .layout-sm-padding-left-49{padding-left:49px;}
+    .layout-sm-padding-left-50{padding-left:50px;}
+    .layout-sm-padding-left-51{padding-left:51px;}
+    .layout-sm-padding-left-52{padding-left:52px;}
+    .layout-sm-padding-left-53{padding-left:53px;}
+    .layout-sm-padding-left-54{padding-left:54px;}
+    .layout-sm-padding-left-55{padding-left:55px;}
+    .layout-sm-padding-left-56{padding-left:56px;}
+    .layout-sm-padding-left-57{padding-left:57px;}
+    .layout-sm-padding-left-58{padding-left:58px;}
+    .layout-sm-padding-left-59{padding-left:59px;}
+    .layout-sm-padding-left-60{padding-left:60px;}
+     
+     
+    /**
+     * 模块基础样式
+     */
+    .module-content,
+    .module-images-container,
+    .module-slider-container,
+    .module-video-container,
+    .module-title-container,
+    .module-goods-container,
+    .module-list-content,
+    .module-list-content .item .module-item,
+    .module-list-content .item .module-item .module-title,
+    .module-list-content .item .module-item .module-price {overflow: hidden;}
+     
+    /**
+     * 模块类型样式 - 标题
+     */
+    .module-title-container .module-title-content{position:relative}
+    .module-title-container .title-main{font-size:16px;font-weight:600;color:#666}
+    .module-title-container .title-vice{color:#999;font-size:12px;margin-left:10px}
+    .module-title-container .more-content{position:absolute;top:calc(50% - 8px);right:0;font-size:12px;}
+     
+    /**
+     * 模块内容基础样式
+     */
+    .layout-content .image,
+    .layout-content .video{display:block;max-width:100%;max-height:100%}
+     
+    /**
+     * 不展示滚动导航点
+     */
+    .layout-content .slides-rolling-not-dot{margin-bottom:0px}
+     
+    /**
+     * 媒体文件固定大小
+     */
+    .module-fixed-doc{display:block;overflow:hidden;}
+    .module-fixed-doc-ent-width{width:100% !important;}
+    .module-fixed-doc-ent-height{height:100% !important;}
+    .module-fixed-doc-ent-auto{margin:0 auto !important;}
+    .module-fixed-doc-ent-cover{object-fit:cover !important;}
+    
+    /**
+     * 滚动列表
+     */
+    .module-list-rolling{width:100%;white-space:nowrap;box-sizing:border-box}
+    .module-list-rolling .item{display:inline-block;position:relative}
+</style>
\ No newline at end of file
diff --git a/components/magic-list/magic-list.vue b/components/magic-list/magic-list.vue
new file mode 100644
index 0000000..be53e13
--- /dev/null
+++ b/components/magic-list/magic-list.vue
@@ -0,0 +1,246 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data_goods_list || null) != null && data_goods_list.length > 0">
+            <view v-for="(item, index) in data_goods_list" :key="index" class="plugins-magic-content border-radius-main oh spacing-mb">
+                <view v-if="(item.data || null) != null && item.data.length > 0" :style="(item.bg_images || null) !== null ? 'background-image: url(' + item.bg_images + ');background-size: auto 100%;' : (((item.is_text_white || 0) == 1) ? 'background: linear-gradient(180deg, '+theme_color+' 0%, '+theme_color_light+' 80%);' : 'background: #fff;')">
+                    <!-- 上下滚动 -->
+                    <view v-if="item.show_style == 0" :class="'hot-list flex-row flex-wrap padding-vertical-main '+(((item.is_text_white || 0) == 1) ? 'is-text-white' : '')">
+                        <block v-for="(items, indexs) in item.data" :key="indexs">
+                            <block v-if="(items.data || null) != null && items.data.length > 0">
+                                <view :class="'group-item '+(item.data.length%2 != 0 && item.data.length-1 === indexs ? 'wh-auto' : 'flex-width-half')">
+                                    <view class="padding-horizontal-main">
+                                        <view class="flex-row align-c" :data-value="items.url" @tap="url_event">
+                                            <text :class="'text-size fw-b single-text cr-'+(((item.is_text_white || 0) == 1) ? 'white' : 'black')">{{ items.title }}</text>
+                                            <view class="hot-go margin-left-sm">
+                                                <block v-if="(items.icon || null) !== null">
+                                                    <image :src="items.icon" mode="heightFix" class="ht-auto"></image>
+                                                </block>
+                                            </view>
+                                        </view>
+                                        <view :class="'single-text text-size-xs margin-top-xs cr-'+(((item.is_text_white || 0) == 1) ? 'white' : 'grey-9')">{{ items.describe }}</view>
+                                        <swiper class="swiper-list border-radius-main oh" circular :autoplay="(items.rolling_time || null) !== null ? true : false" :vertical="propVertical" :interval="(items.rolling_time || null) !== null ? Number(items.rolling_time) * 1000 : '6000'" :duration="propDuration">
+                                            <swiper-item v-for="(itemss, indexss) in items.data" :key="indexss">
+                                                <view class="swiper-item">
+                                                    <view :class="'flex-row gap-10 goods-item-number-'+itemss.length">
+                                                        <view v-for="(gv, gi) in itemss" :key="gi" :class="'bg-white border-radius-main oh flex-width-half '+(itemss.length % 2 != 0 && itemss.length-1 == gi ? 'wh-auto' : '')">
+                                                            <view class="tc" :data-index="index" :data-indexs="indexs" :data-indexss="indexss" :data-gi="gi" :data-value="(gv.goods_url || null) !== null ? gv.goods_url : ''" @tap="goods_event">
+                                                                <image :src="(gv.images || null) !== null ? gv.images : ''" :mode="itemss.length % 2 != 0 && itemss.length-1 == gi ? 'aspectFit' : 'scaleToFill'" :class="'swiper-img wh-auto dis-block '+(((item.is_text_white || 0) == 1) ? '' : 'border-radius-main')"> </image>
+                                                                <view v-if="(gv.show_field_price_status || 0) == 1" :class="'price tc single-text text-line-1 '+(((item.is_text_white || 0) == 1) ? 'padding-horizontal-xs padding-bottom-xs' : '')">
+                                                                    <text class="sales-price va-m text-size-xss va-b">{{ gv.show_price_symbol }}</text>
+                                                                    <text class="sales-price va-m text-size-xs">{{ gv.min_price }}</text>
+                                                                    <text class="va-m text-size-xss cr-grey">{{ gv.show_price_unit }}</text>
+                                                                </view>
+                                                            </view>
+                                                        </view>
+                                                    </view>
+                                                </view>
+                                            </swiper-item>
+                                        </swiper>
+                                    </view>
+                                </view>
+                            </block>
+                        </block>
+                    </view>
+
+                    <!-- 1切换滚动、2切换九宫格、3切换滚动 -->
+                    <view v-else-if="item.show_style == 1 || item.show_style == 2 || item.show_style == 3" class="switch-tabs-item-list pr padding-top-main">
+                        <view class="scroll-view-horizontal padding-left-main">
+                            <scroll-view :scroll-x="true" :show-scrollbar="false" :scroll-with-animation="true" :scroll-into-view="'switch-tabs-item-' + (show_style1_active_index[index] || 0)">
+                                <block v-for="(items, indexs) in item.data" :key="indexs">
+                                    <view :class="'tc cp dis-inline-block '+(indexs > 0 ? 'margin-left-xxl' : '')" :id="'switch-tabs-item-' + indexs" :data-index="index" :data-indexs="indexs" @tap="switch_tabs_event">
+                                        <image v-if="(items.icon || null) != null" :src="items.icon" class="switch-tabs-item-icon va-m margin-right-xs" mode="aspectFit"></image>
+                                        <text :class="'text-size va-m cr-'+(((item.is_text_white || 0) == 1) ? 'white' : 'black')+' '+((show_style1_active_index[index] || 0) == indexs ? 'fw-b cr-'+(((item.is_text_white || 0) == 1) ? 'white' : 'main') : '')">{{ items.title }} </text>
+                                        <view class="lh-xs">
+                                            <iconfont name="icon-down-mark" size="36rpx" :color="(show_style1_active_index[index] || 0) == indexs ? (((item.is_text_white || 0) == 1) ? '#fff' : theme_color) : 'transparent'" propClass="lh-xs"></iconfont>
+                                        </view>
+                                    </view>
+                                </block>
+                            </scroll-view>
+                        </view>
+                        <block v-for="(items, indexs) in item.data" :key="indexs">
+                            <view v-if="(show_style1_active_index[index] || 0) == indexs">
+                                <view v-if="(items.url || null) != null" :data-value="items.url" @tap="url_event" class="padding-right cp pa top-xxxxxl right-0">
+                                    <text :class="'text-size-xs va-m cr-'+(((item.is_text_white || 0) == 1) ? 'white' : 'grey')">{{ $t('common.more') }}</text>
+                                    <view class="dis-inline-block va-m lh-xs">
+                                        <iconfont name="icon-arrow-right" size="24rpx" :color="((item.is_text_white || 0) == 1) ? '#f5f5f5' : '#999'"></iconfont>
+                                    </view>
+                                </view>
+                                <view v-if="(items.describe || null) != null" :class="'text-size-xs single-text padding-vertical-sm padding-horizontal-main cr-'+(((item.is_text_white || 0) == 1) ? 'white' : 'grey')">{{items.describe}}</view>
+                                <view :class="(item.show_style == 1 || item.show_style == 2) ? 'padding-horizontal-main padding-top-sm' : (item.show_style == 3 ? 'padding-top-xs padding-bottom-main' : '')">
+                                    <component-goods-list :propData="{ style_type: parseInt(item.show_style)-1, goods_list: items.goods_list }" :propLabel="propLabel" :propCurrencySymbol="propCurrencySymbol" :propIsAutoPlay="(items.rolling_time || null) != null" :propIsCartParaCurve="true" propSource="index" propStyleTypeTowClass="border-radius-main padding-horizontal-main padding-top-xs"></component-goods-list>
+                                </view>
+                            </view>
+                        </block>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import componentGoodsList from '@/components/goods-list/goods-list';
+    export default {
+        name: 'recommend-hot',
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: app.globalData.get_theme_color(),
+                theme_color_light: app.globalData.get_theme_color(null, true),
+                data_goods_list: [],
+                show_style1_active_index: {},
+            };
+        },
+        props: {
+            propCurrencySymbol: {
+                type: String,
+                default: app.globalData.currency_symbol(),
+            },
+            propData: {
+                type: Object,
+                default: () => {
+                    return {};
+                },
+            },
+            propVertical: {
+                type: Boolean,
+                default: true,
+            },
+            propDuration: {
+                type: Number,
+                default: 1000,
+            },
+            // 标签数据
+            propLabel: {
+                type: [Array, Object, String],
+                default: null,
+            }
+        },
+        components: {
+            componentGoodsList
+        },
+        // 属性值改变监听
+        watch: {
+            // 数据
+            propData(value, old_value) {
+                this.set_data(value);
+            }
+        },
+        mounted() {
+            this.set_data(this.propData);
+        },
+        methods: {
+            // 商品事件
+            goods_event(e) {
+                // 商品数据缓存处理
+                var index = e.currentTarget.dataset.index;
+                var indexs = e.currentTarget.dataset.indexs;
+                var indexss = e.currentTarget.dataset.indexss;
+                var gi = e.currentTarget.dataset.gi;
+                var goods = this.data_goods_list[index]['data'][indexs]['data'][indexss][gi];
+                app.globalData.goods_data_cache_handle(goods.id, goods);
+
+                // 调用公共打开url地址
+                app.globalData.url_event(e);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // tabs切换
+            switch_tabs_event(e) {
+                var temp = this.show_style1_active_index || {};
+                temp[e.currentTarget.dataset.index] = e.currentTarget.dataset.indexs;
+                this.setData({
+                    show_style1_active_index: temp
+                });
+            },
+
+            // 轮播数据处理
+            set_data(data) {
+                let goods = data.goods;
+                goods.forEach((item) => {
+                    switch(parseInt(item.show_style || 0)) {
+                        // 上下滚动数据处理
+                        case 0 :
+                            item.data.forEach((items, indexs) => {
+                                let swiper_data = [];
+                                if (item.data.length % 2 == 0) {
+                                    // 偶数
+                                    swiper_data = app.globalData.group_arry(items.goods_list, 2);
+                                } else {
+                                    // 奇数
+                                    if (item.data.length === indexs + 1) {
+                                        swiper_data = app.globalData.group_arry(items.goods_list, 4);
+                                    } else {
+                                        swiper_data = app.globalData.group_arry(items.goods_list, 2);
+                                    }
+                                }
+                                items.data = swiper_data;
+                            });
+                            break;
+                    }
+                });
+                this.setData({
+                    data_goods_list: goods,
+                });
+            },
+        },
+    };
+</script>
+
+<style scoped>
+    .plugins-magic-content .hot-list {
+        gap: 10rpx 0;
+    }
+    .plugins-magic-content .hot-list > .flex-width-half {
+        margin-bottom: 0;
+    }
+    .plugins-magic-content .hot-list > .flex-width-half:nth-last-of-type(1),
+    .plugins-magic-content .hot-list > .flex-width-half:nth-last-of-type(2) {
+        margin-bottom: 0;
+    }
+    .plugins-magic-content .hot-list > .flex-width-half:nth-child(even) {
+        position: relative;
+    }
+    .plugins-magic-content .hot-list > .flex-width-half:nth-child(even)::before {
+        content: '';
+        height: 80%;
+        width: 2rpx;
+        border-left: 2rpx solid rgb(232 232 232 / 28%);
+        position: absolute;
+        left: 0;
+        top: 50%;
+        transform: translateY(-50%);
+    }
+    .plugins-magic-content .hot-list.is-text-white > .flex-width-half:nth-child(even)::before {
+        border-left: 2rpx solid rgb(255 245 245 / 9%);
+    }
+    .plugins-magic-content .hot-list .swiper-list {
+        height: 216rpx;
+    }
+    .plugins-magic-content .hot-list .swiper-list .swiper-item {
+        margin-top: 16rpx;
+    }
+    .plugins-magic-content .hot-list .swiper-list .swiper-img {
+        height: 140rpx !important;
+    }
+    .plugins-magic-content .hot-go {
+        height: 34rpx;
+        line-height: 34rpx;
+    }
+
+    /**
+     * 切换滚动、切换九宫格、切换滚动
+     */
+    .plugins-magic-content .switch-tabs-item-list > .scroll-view-horizontal {
+        padding-right: 140rpx;
+    }
+    .plugins-magic-content .switch-tabs-item-list .switch-tabs-item-icon {
+        width: 32rpx !important;
+        height: 32rpx !important;
+    }
+</style>
diff --git a/components/nav-back/nav-back.vue b/components/nav-back/nav-back.vue
new file mode 100644
index 0000000..0f4f23a
--- /dev/null
+++ b/components/nav-back/nav-back.vue
@@ -0,0 +1,107 @@
+<template>
+    <view :class="theme_view">
+        <view class="pa-w" :class="(propFixed ? 'pf z-i left-0 top-0 right-0' : '') + ' ' + propClass" :style="'padding-top:' + (status_bar_height > 0 ? status_bar_height + 5 : 0) + 'px;background-color:rgba(255,255,255,' + opacity + ');' + propStyle">
+            <view v-if="(propName || null) != null || propIsRightSlot || is_show_back" class="nav-back padding-horizontal-main round va-m flex-row align-c" :class="(opacity > 0.3 ? 'cr-black ' : 'cr-white ') + (status_bar_height > 0 ? '' : 'padding-vertical-main')">
+                <view v-if="(propName || null) != null" :class="'text-size-md tc pa left-0 right-0 padding-top-xs ' + propNameClass" :style="propNameOpacity ? (opacity ? 'color:rgba(51,51,51,' + opacity + ')' : '') : ''">{{ propName }}</view>
+                <view v-if="is_show_back" @tap="top_nav_left_back_event" class="dis-inline-block">
+                    <iconfont name="icon-arrow-left" size="40rpx" propClass="pr top-xs z-i" :color="(client_value == 'alipay' || client_value == 'baidu') ? 'transparent' : propColor"></iconfont>
+                </view>
+                <slot v-if="propIsRightSlot" name="right"></slot>
+            </view>
+            <slot name="content"></slot>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    export default {
+        name: 'back',
+        props: {
+            // 是否显示返回按钮
+            propIsShowBack: {
+                type: Boolean,
+                default: true,
+            },
+            // 最外层class
+            propClass: {
+                type: String,
+                default: '',
+            },
+            // 最外层style
+            propStyle: {
+                type: String,
+                default: '',
+            },
+            // 是否需要定位
+            propFixed: {
+                type: Boolean,
+                default: true,
+            },
+            // 箭头颜色
+            propColor: {
+                type: String,
+                default: '',
+            },
+            // 标题名称
+            propName: {
+                type: String,
+                default: '',
+            },
+            // 标题名称class
+            propNameClass: {
+                type: String,
+                default: '',
+            },
+            // 标题是否需要透明
+            propNameOpacity: {
+                type: Boolean,
+                default: false,
+            },
+            // 是否有左侧卡槽内容
+            propIsRightSlot: {
+                type: Boolean,
+                default: true,
+            },
+        },
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                client_value: app.globalData.application_client_type(),
+                status_bar_height: 0,
+                // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || MP-ALIPAY || H5 || APP
+                status_bar_height: parseInt(app.globalData.get_system_info('statusBarHeight', 0, true)),
+                // #endif
+                // 顶部返回导航背景透明度
+                opacity: 0,
+            };
+        },
+        // 页面被展示
+        created: function () {
+            this.setData({
+                is_show_back: this.propIsShowBack && !app.globalData.is_tabbar_pages()
+            });
+        },
+        mounted() {
+            var self = this;
+            uni.$on('onPageScroll', function (e) {
+                var top = e.scrollTop > 47 ? 1 : e.scrollTop / 47;
+                self.setData({
+                    opacity: top,
+                });
+            });
+        },
+        methods: {
+            top_nav_left_back_event() {
+                app.globalData.page_back_prev_event();
+            },
+        },
+    };
+</script>
+
+<style scoped>
+    .nav-back {
+        height: 30px;
+        padding-bottom: 10px !important;
+    }
+</style>
diff --git a/components/nav-more/nav-more.vue b/components/nav-more/nav-more.vue
new file mode 100644
index 0000000..562036b
--- /dev/null
+++ b/components/nav-more/nav-more.vue
@@ -0,0 +1,101 @@
+<template>
+    <view :class="theme_view">
+        <view class="more cr-black padding-top-main padding-bottom-sm flex-row flex-wrap align-c" :class="propClass" @tap="open_popup">
+            <text v-if="isMoreText">{{ $t('common.more_null') }}</text>
+            <iconfont name="icon-category-more"></iconfont>
+        </view>
+        <!-- 弹窗 -->
+        <component-popup :propShow="popup_status" :propIsBar="propIsBar" propPosition="top" :propMask="true" :propTop="propTop" @onclose="quick_close_event">
+            <view class="padding-top-lg">
+                <view class="padding-left-main padding-bottom-main">{{ $t('recommend-form.recommend-form.7gc30l') }}</view>
+                <view class="divider-b">
+                    <slot></slot>
+                </view>
+                <view class="tc padding-vertical-lg" @tap="quick_close_event">
+                    <text class="padding-right-sm">{{ $t('nav-more.nav-more.h9g4b1') }}</text>
+                    <iconfont name="icon-arrow-top" color="#ccc"></iconfont>
+                </view>
+            </view>
+        </component-popup>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import componentPopup from '@/components/popup/popup';
+    export default {
+        name: 'more',
+        components: {
+            componentPopup,
+        },
+        props: {
+            propData: {
+                type: Array,
+                default: () => {
+                    return [];
+                },
+            },
+            // 顶部定位的距离
+            propTop: {
+                type: String,
+                default: '',
+            },
+            propStatus: {
+                type: Boolean,
+                default: false,
+            },
+            propClass: {
+                type: String,
+                default: '',
+            },
+            themeBtn: {
+                type: String,
+                default: '1',
+            },
+            isMoreText: {
+                type: Boolean,
+                default: true,
+            },
+        },
+        watch: {
+            propStatus(newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.setData({
+                        popup_status: newVal,
+                    });
+                }
+            },
+        },
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                popup_status: false,
+                propIsBar: false,
+            };
+        },
+        methods: {
+            // 打开弹窗
+            open_popup() {
+                this.$emit('open-popup', true);
+            },
+            // 关闭弹窗
+            quick_close_event(e) {
+                this.$emit('open-popup', false);
+            },
+        },
+    };
+</script>
+
+<style scoped>
+    .more {
+        width: 30rpx;
+        padding: 15rpx 20rpx;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        right: 0;
+        z-index: 101;
+        white-space: normal;
+        word-break: break-all;
+    }
+</style>
diff --git a/components/no-data/no-data.vue b/components/no-data/no-data.vue
new file mode 100644
index 0000000..d541904
--- /dev/null
+++ b/components/no-data/no-data.vue
@@ -0,0 +1,329 @@
+<template>
+    <view :class="theme_view">
+        <!-- 是否有网络 -->
+        <view v-if="network_type_value == 'none' && not_network_await_status == 0" class="network-type-tips wh-auto tc bs-bb padding-horizontal-main">
+            <view class="cr-base text-size">{{$t('no-data.no-data.1u202v')}}</view>
+            <view class="cr-grey margin-top-sm">{{$t('no-data.no-data.imw8f1')}}{{title}}{{$t('no-data.no-data.q87572')}}</view>
+            <view class="margin-top-lg tc">
+                <button type="default" class="br-main bg-main cr-white round padding-horizontal-xxl" size="mini" @tap="open_setting_event">{{ $t('setup.setup.377uwg') }}</button>
+            </view>
+        </view>
+        <view v-else>
+            <!-- 1 加载中(0loog, 1名称) -->
+            <view v-if="propStatus == 1 && network_type_value != 'none'" :class="'no-data-box tc no-data-loading '+(is_loading_use_skeleton == 1 && (propPage || null) != null ? 'skeleton' : '')">
+                <block v-if="is_loading_use_skeleton == 1 && (propPage || null) != null">
+                    <!-- 是否展示头站位 -->
+                    <view v-if="propIsHeader" class="skeleton-header"></view>
+                    <!-- 首页 -->
+                    <block v-if="propPage == 'home'">
+                        <x-skeleton propType="banner"></x-skeleton>
+                        <x-skeleton propType="menu"></x-skeleton>
+                        <x-skeleton propType="waterfall"></x-skeleton>
+                        <x-skeleton propType="list" propRowNumber="4"></x-skeleton>
+                    </block>
+                    <!-- 商品分类-整体内容 -->
+                    <block v-else-if="propPage == 'goods-category'">
+                        <x-skeleton propType="menu" propRowNumber="1"></x-skeleton>
+                        <view class="goods-category-content flex-row jc-sb">
+                            <view class="left">
+                                <x-skeleton :propConfig="skeleton_goods_category_left_config"></x-skeleton>
+                            </view>
+                            <view class="right">
+                                <x-skeleton propType="list" propRowNumber="7"></x-skeleton>
+                            </view>
+                        </view>
+                    </block>
+                    <!-- 商品分类-内容项 -->
+                    <block v-else-if="propPage == 'goods-category-item'">
+                        <x-skeleton propType="list" propRowNumber="6"></x-skeleton>
+                    </block>
+                    <!-- 购物车 -->
+                    <block v-else-if="propPage == 'cart'">
+                        <x-skeleton propType="list" propRowNumber="3"></x-skeleton>
+                        <x-skeleton propType="waterfall" propRowNumber="4"></x-skeleton>
+                    </block>
+                    <!-- 商品详情 -->
+                    <block v-else-if="propPage == 'goods'">
+                        <x-skeleton propType="banner" propHeightNumber="600"></x-skeleton>
+                        <x-skeleton propType="text"></x-skeleton>
+                        <x-skeleton propType="info"></x-skeleton>
+                        <x-skeleton propType="waterfall" propRowNumber="4"></x-skeleton>
+                    </block>
+                </block>
+                <block v-else>
+                    <view v-if="loading_content_type == 1" class="loading-title-animation">
+                        <text class="title">{{title}}</text>
+                    </view>
+                    <view v-else class="loading-logo-content" :style="'margin-top: '+propLoadingLogoTop+';'">
+                        <view class="loading-logo" :style="'background-image: url('+loading_logo+')'"></view>
+                        <view class="loading-border" :style="'background-image: url('+loading_logo_border+')'"></view>
+                    </view>
+                </block>
+            </view>
+
+            <!-- 2 处理错误 -->
+            <view v-else-if="propStatus == 2" class="no-data-box tc">
+                <image class="image" :src="static_dir + 'error.png'" mode="widthFix"></image>
+                <view class="no-data-tips">{{propMsg || $t('form.form.bniyyt')}}</view>
+                <view v-if="propBackBtn" class="margin-top-xxxl tc">
+                    <button type="default" size="mini" class="bg-grey-e br-grey cr-base round" @tap="back_event">{{$t('common.return')}}</button>
+                </view>
+            </view>
+
+            <!-- 0 默认没有数据 -->
+            <view v-else-if="propStatus == 0" class="no-data-box tc">
+                <image class="image" :src="propUrl ? propUrl : static_dir + 'empty.png'" mode="widthFix"></image>
+                <view class="no-data-tips">{{propMsg || $t('common.no_relevant_data_tips')}}</view>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                static_dir: '/static/images/common/',
+                is_loading_use_skeleton: app.globalData.data.is_loading_use_skeleton,
+                loading_logo_border: app.globalData.data.static_url+'static/common/svg/loading-border.svg',
+                loading_logo: app.globalData.get_application_logo_square() || app.globalData.data.static_url+'favicon.ico',
+                loading_content_type: app.globalData.data.loading_content_type,
+                title: app.globalData.get_application_title(),
+                network_type_value: '',
+                not_network_await_status: 0,
+
+                // 骨架屏配置
+                // 商品分类内容-左侧
+                skeleton_goods_category_left_config: {
+                	padding: '30rpx',
+                	gridRows: 19,
+                	gridColumns: 1,
+                	gridRowsGap: '30rpx',
+                	headShow: true,
+                	headWidth: '200rpx',
+                	headHeight: '60rpx',
+                	headBorderRadius: '16rpx',
+                	textShow: false,
+                },
+            };
+        },
+        components: {},
+        props: {
+            propStatus: {
+                type: [Number, String],
+                default: 0,
+            },
+            propMsg: {
+                type: String,
+                default: '',
+            },
+            propUrl: {
+                type: String,
+                default: '',
+            },
+            propBackBtn: {
+                type: Boolean,
+                default: true,
+            },
+            propNetworkTimeNum: {
+                type: Number,
+                default: 40,
+            },
+            propPage: {
+                type: String,
+                default: '',
+            },
+            propIsHeader: {
+                type: Boolean,
+                default: false,
+            },
+            propLoadingLogoTop: {
+                type: String,
+                default: '50%',
+            }
+        },
+        // 页面被展示
+        created: function () {
+            self = this;
+            uni.getNetworkType({
+                success: function (res) {
+                    // 当前网络
+                    self.network_type_value = res.networkType;
+                    // 无网络进入等待网络中
+                    if(self.network_type_value == 'none') {
+                        self.not_network_await_status = 1;
+                    }
+
+                    // 定时处理
+                    self.countdown(self);
+                }
+            });
+        },
+        // #ifndef VUE2
+        destroyed() {
+            clearInterval(this.timer);
+        },
+        // #endif
+        // #ifdef VUE3
+        unmounted() {
+            clearInterval(this.timer);
+        },
+        // #endif
+        methods: {
+            // 定时任务
+            countdown(self) {
+                // 销毁之前的任务
+                clearInterval(self.timer);
+
+                // 没有网络则启动定时任务
+                if(self.network_type_value == 'none') {
+                    var temp_num = self.propNetworkTimeNum;
+                    self.timer = setInterval(function () {
+                        // 读取网络状态
+                        uni.getNetworkType({
+                            success: function (res) {
+                                self.network_type_value = res.networkType;
+                                // 已经有网络了则结束定时任务、并正常继续等待走加载过程
+                                if(self.network_type_value != 'none') {
+                                    clearInterval(self.timer);
+                                }
+                            }
+                        });
+
+                        // 每次减1
+                        temp_num--;
+
+                        // 0则结束
+                        if(temp_num <= 0) {
+                            // 销毁任务
+                            clearInterval(self.timer);
+                            // 无需等待网络
+                            self.not_network_await_status = 0;
+                        }
+                    }, 500);
+                }
+            },
+
+            // 返回事件
+            back_event(e) {
+                app.globalData.page_back_prev_event();
+            },
+
+            // 打开权限管理中心
+            open_setting_event() {
+                app.globalData.open_setting_event();
+            },
+        },
+    };
+</script>
+<style scoped>
+    .no-data-box {
+        padding: 15% 0;
+    }
+    .no-data-box .image {
+        width: 160rpx;
+        margin-bottom: 30rpx;
+    }
+    .no-data-box .no-data-tips {
+        font-size: 24rpx;
+        color: #999;
+    }
+    .no-data-loading .title {
+        color: #999;
+    }
+
+    /**
+     * 名称加载
+     */
+    .loading-title-animation,
+    .network-type-tips {
+        padding-top: 25%;
+    }
+    .loading-title-animation {
+        background: #e7e7e7 -webkit-linear-gradient(left, #c6c6c6 0%, #c6c6c6 90%) no-repeat 0 0;
+        background-size: 20% 100%;
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
+        font-size: 60rpx;
+        font-weight: bold;
+        -webkit-animation: loading-text-animation 2s linear infinite;
+        animation: loading-text-animation 2s linear infinite;
+    }
+    @-webkit-keyframes loading-text-animation {
+        0% {
+            background-position: 0 0;
+        }
+        100% {
+            background-position: 100% 100%;
+        }
+    }
+    @keyframes loading-text-animation {
+        0% {
+            background-position: 0 0;
+        }
+        100% {
+            background-position: 100% 100%;
+        }
+    }
+
+    /**
+     * logo加载
+     */
+    .loading-logo-content {
+        position: absolute;
+        width: 140rpx;
+        height: 140rpx;
+        left: calc(50% - 70rpx);
+        top: 0;
+        border-radius: 50%;
+        overflow: hidden;
+        background: #fff;
+        margin-top: 50%;
+    }
+    .loading-logo-content .loading-logo {
+        content: '';
+        display: block;
+        position: absolute;
+        left: 30rpx;
+        top: 30rpx;
+        width: 80rpx;
+        height: 80rpx;
+        opacity: 0.8;
+        background-size: contain;
+        background-position: center center;
+        background-repeat: no-repeat;
+    }
+    .loading-logo-content .loading-border {
+        content: '';
+        display: block;
+        position: absolute;
+        width: 168rpx;
+        height: 168rpx;
+        left: -14rpx;
+        top: -14rpx;
+        opacity: 0.8;
+        background-size: contain;
+        background-position: center center;
+        background-repeat: no-repeat;
+    }
+    
+    /**
+     * 骨架屏
+     */
+    .skeleton-header {
+        /* #ifndef H5 || APP */
+        padding-top: var(--status-bar-height);
+        padding-bottom: 55px;
+        /* #endif */
+    }
+    .no-data-box.skeleton {
+        padding: 0;
+    }
+    .no-data-loading .goods-category-content > .left {
+        width: 30%;
+    }
+    .no-data-loading .goods-category-content > .right {
+        width: 70%;
+    }
+</style>
diff --git a/components/online-service/online-service.vue b/components/online-service/online-service.vue
new file mode 100644
index 0000000..e806654
--- /dev/null
+++ b/components/online-service/online-service.vue
@@ -0,0 +1,444 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="online_service_status == 1">
+            <!-- 是否商品页样式 -->
+            <view v-if="propIsGoods == true" class="goods-chat-container fl cp">
+                <block v-if="is_chat == 1">
+                    <view @tap="chat_event">
+                        <image class="icon" :src="chat_icon" mode="scaleToFill"></image>
+                        <text class="text dis-block text-size-xs cr-grey">{{$t('online-service.online-service.4l6k22')}}</text>
+                    </view>
+                </block>
+                <block v-else>
+                    <!-- #ifdef MP-WEIXIN || MP-TOUTIAO || MP-BAIDU || MP-KUAISHOU -->
+                    <button class="chat-btn" open-type="contact" :show-message-card="propCard" :send-message-title="propTitle" :send-message-path="propPath" :send-message-img="propImg">
+                        <image class="icon" :src="chat_icon" mode="scaleToFill"></image>
+                        <text class="text dis-block text-size-xs cr-grey">{{$t('online-service.online-service.4l6k22')}}</text>
+                    </button>
+                    <!-- #endif -->
+                    <!-- #ifdef MP-ALIPAY -->
+                    <button class="chat-btn alipay-contact" open-type="contact">
+                        <contact-button class="alipay-chat-btn" :tnt-inst-id="mini_alipay_tnt_inst_id" :scene="mini_alipay_scene" :alipay-card-no="mini_alipay_openid || ''" :icon="chat_icon" size="40rpx*40rpx" />
+                        <text class="text dis-block text-size-xs cr-grey">{{$t('online-service.online-service.4l6k22')}}</text>
+                    </button>
+                    <!-- #endif -->
+                    <!-- #ifdef H5 || APP -->
+                    <button class="chat-btn" type="default" @tap="call_event">
+                        <image class="icon" :src="chat_icon" mode="scaleToFill"></image>
+                        <text class="text dis-block text-size-xs cr-grey">{{$t('online-service.online-service.4l6k22')}}</text>
+                    </button>
+                    <!-- #endif -->
+                </block>
+            </view>
+            <!-- 默认浮动展示-可拖拽位置 -->
+            <view v-else>
+                <block v-if="is_online_service_fixed == 1">
+                    <block v-if="propIsMovable">
+                        <movable-area class="online-service-movable-container" :style="'height: calc(100% - '+height_dec+'rpx);top:'+top+'rpx;'">
+                            <movable-view direction="all" :x="x" :y="y" :animation="false" :class="'online-service-event-submit '+(propIsSpread ? ' spread' : '')">
+                                <block v-if="propIsSpread">
+                                    <view class="ring"></view>
+                                    <view class="ring"></view>
+                                </block>
+                                <block v-if="is_chat == 1">
+                                    <button class="chat-btn" type="default" :class="common_ent" @tap="chat_event">
+                                        <image class="icon dis-block" :src="chat_image"></image>
+                                    </button>
+                                </block>
+                                <block v-else>
+                                    <!-- #ifdef MP-WEIXIN || MP-TOUTIAO || MP-BAIDU -->
+                                    <button class="chat-btn" open-type="contact" :class="common_ent" :show-message-card="propCard" :send-message-title="propTitle" :send-message-path="propPath" :send-message-img="propImg">
+                                        <image class="icon dis-block" :src="chat_image"></image>
+                                    </button>
+                                    <!-- #endif -->
+                                    <!-- #ifdef MP-ALIPAY -->
+                                    <button class="chat-btn" open-type="contact" :class="'alipay-contact '+common_ent">
+                                        <contact-button class="alipay-chat-btn" :tnt-inst-id="mini_alipay_tnt_inst_id" :scene="mini_alipay_scene" :alipay-card-no="mini_alipay_openid || ''" :icon="chat_image" size="40rpx*40rpx" />
+                                    </button>
+                                    <!-- #endif -->
+                                    <!-- #ifdef H5 || APP -->
+                                    <button class="chat-btn" type="default" :class="common_ent" @tap="call_event">
+                                        <image class="icon dis-block" :src="chat_image"></image>
+                                    </button>
+                                    <!-- #endif -->
+                                </block>
+                            </movable-view>
+                        </movable-area>
+                    </block>
+                    <block v-else>
+                        <view class="online-service-movable-container" :style="'height: calc(100% - '+height_dec+'rpx);top:'+top+'rpx;'">
+                            <view :class="'online-service-event-submit '+(propIsSpread ? ' spread' : '')">
+                                <block v-if="propIsSpread">
+                                    <view class="ring"></view>
+                                    <view class="ring"></view>
+                                </block>
+                                <block v-if="is_chat == 1">
+                                    <button class="chat-btn" type="default" :class="common_ent" @tap="chat_event">
+                                        <image class="icon dis-block" :src="chat_image"></image>
+                                    </button>
+                                </block>
+                                <block v-else>
+                                    <!-- #ifdef MP-WEIXIN || MP-TOUTIAO || MP-BAIDU -->
+                                    <button class="chat-btn" open-type="contact" :class="common_ent" :show-message-card="propCard" :send-message-title="propTitle" :send-message-path="propPath" :send-message-img="propImg">
+                                        <image class="icon dis-block" :src="chat_image"></image>
+                                    </button>
+                                    <!-- #endif -->
+                                    <!-- #ifdef MP-ALIPAY -->
+                                    <button class="chat-btn alipay-contact" :class="common_ent" open-type="contact">
+                                        <contact-button class="alipay-chat-btn" :tnt-inst-id="mini_alipay_tnt_inst_id" :scene="mini_alipay_scene" :alipay-card-no="mini_alipay_openid || ''" :icon="chat_image" size="40rpx*40rpx" />
+                                    </button>
+                                    <!-- #endif -->
+                                    <!-- #ifdef H5 || APP -->
+                                    <button class="chat-btn" type="default" :class="common_ent" @tap="call_event">
+                                        <image class="icon dis-block" :src="chat_image"></image>
+                                    </button>
+                                    <!-- #endif -->
+                                </block>
+                            </view>
+                        </view>
+                    </block>
+                </block>
+            </view>
+        </block>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: app.globalData.get_static_url('common'),
+                client_value: app.globalData.application_client_type(),
+                is_chat: 0,
+                chat_url: null,
+                chat_icon: '',
+                chat_image: '',
+                common_app_customer_service_tel: null,
+                common_app_customer_service_custom: null,
+                common_app_customer_service_company_weixin_corpid: null,
+                common_app_customer_service_company_weixin_url: null,
+                online_service_status: 0,
+                is_online_service_fixed: app.globalData.data.is_online_service_fixed,
+                mini_alipay_tnt_inst_id: null,
+                mini_alipay_scene: null,
+                mini_alipay_openid: null,
+                system: null,
+                x: 0,
+                y: 0,
+                top: 0,
+                height_dec: 0,
+                is_first: 1,
+                common_ent: ''
+            };
+        },
+        components: {},
+        props: {
+            propIsGoods: {
+            	type: Boolean,
+            	default: false
+            },
+            propIsBar: {
+            	type: Boolean,
+            	default: false
+            },
+            propIsNav: {
+            	type: Boolean,
+            	default: false
+            },
+            propCard: {
+            	type: Boolean,
+            	default: false
+            },
+            propTitle: {
+            	type: String,
+            	default: ''
+            },
+            propImg: {
+            	type: String,
+            	default: ''
+            },
+            propPath: {
+            	type: String,
+            	default: ''
+            },
+            propIsGrayscale: {
+            	type: Boolean,
+            	default: false
+            },
+            propIsChat: {
+            	type: Number,
+            	default: 0
+            },
+            propChatUrl: {
+            	type: String,
+            	default: ''
+            },
+            propChatIcon: {
+            	type: String,
+            	default: ''
+            },
+            propChatImage: {
+            	type: String,
+            	default: ''
+            },
+            propIsSpread: {
+            	type: Boolean,
+            	default: true
+            },
+            propIsMovable: {
+            	type: Boolean,
+            	default: true
+            },
+        },
+        // 属性值改变监听
+        watch: {
+            // 是否灰度
+        	propIsGrayscale(value, old_value) {
+                this.common_ent = value ? 'grayscale' : '';
+        	}
+        },
+        // 页面被展示
+        created: function(e) {
+            this.init_config();
+
+            // 非首次进入则重新初始化配置接口
+            if (this.is_first == 0) {
+                app.globalData.init_config();
+            }
+
+            // 数据设置
+            var system = app.globalData.get_system_info(null, null, true);
+            var width = app.globalData.window_width_handle(system.windowWidth);
+            var height = app.globalData.window_height_handle(system);
+            
+            // 页面是否定义导航
+            var top_h = this.propIsNav ? 130 : 0;
+            this.setData({
+                is_first: 0,
+                system: system,
+                chat_icon: this.propChatIcon || this.common_static_url+'chat-icon.png',
+                chat_image: this.propChatImage || this.common_static_url+'online-service-icon.png',
+                // 位置坐标
+                x: width - 65,
+                y: height - 380,
+                // 展示位置处理
+                top: top_h,
+                height_dec: top_h,
+                // #ifdef H5 || APP
+                top: 210,
+                height_dec: this.propIsBar ? 310 : 210,
+                // #endif
+                // 是否灰度
+                common_ent: this.propIsGrayscale ? 'grayscale' : ''
+            });
+        },
+        methods: {
+            // 初始化配置
+            init_config(status) {
+                // 客服优先级顺序( 客服系统 -> 自定义客服 -> 企业微信客服(仅app+h5+微信小程序生效) -> 各端平台客服 -> 电话客服 )
+                if ((status || false) == true) {
+                    // 是否使用客服系统
+                    var is_chat = app.globalData.get_config('plugins_base.chat.data.is_mobile_chat', 0);
+                    var chat_url = app.globalData.get_config('plugins_base.chat.data.chat_url');
+                    var is_online_service = app.globalData.get_config('config.common_app_is_online_service', 0);
+                    if(is_chat == 1 && (chat_url != null || (this.propChatUrl || null) != null)) {
+                        this.setData({
+                            is_chat: is_chat,
+                            chat_url: this.propChatUrl || chat_url,
+                            online_service_status: is_online_service,
+                        });
+                    } else {
+                        var online_service_url = app.globalData.get_config('config.common_app_customer_service_custom', null);
+                        this.setData({
+                            common_app_customer_service_tel: app.globalData.get_config('config.common_app_customer_service_tel', null),
+                            common_app_customer_service_custom: (online_service_url == null || (online_service_url[this.client_value] || null) == null) ? null : online_service_url[this.client_value],
+                            common_app_customer_service_company_weixin_corpid: app.globalData.get_config('config.common_app_customer_service_company_weixin_corpid', null),
+                            common_app_customer_service_company_weixin_url: app.globalData.get_config('config.common_app_customer_service_company_weixin_url', null),
+                            online_service_status: is_online_service,
+                        });
+
+                        // 存在自定义客服和微信企业客服则走客服模式
+                        if((this.common_app_customer_service_custom || null) != null || ((this.common_app_customer_service_company_weixin_corpid || null) != null && (this.common_app_customer_service_company_weixin_url || null) != null)) {
+                            this.setData({
+                                is_chat: 1
+                            });
+                        }
+
+                        // 对应平台没有提供客服的、[电话，自定义客服，企业微信客服]必须存在一个，则关闭在线客服
+                        if(['qq', 'h5', 'ios', 'android'].indexOf(this.client_value) != -1 && (this.common_app_customer_service_tel || null) == null && (this.common_app_customer_service_custom || null) == null) {
+                            var temp_service_status = this.online_service_status;
+                            if(this.client_value == 'qq') {
+                                temp_service_status = 0;
+                            } else {
+                                // h5,app是否配置企业微信客服
+                                if((this.common_app_customer_service_company_weixin_corpid || null) == null && (this.common_app_customer_service_company_weixin_url || null) == null) {
+                                    temp_service_status = 0;
+                                }
+                            }
+                            this.setData({
+                                online_service_status: temp_service_status
+                            });
+                        }
+
+                        // #ifdef MP-ALIPAY
+                        // 在线客服开启，获取用户openid
+                        if(this.online_service_status == 1)
+                        {
+                            this.setData({
+                                mini_alipay_tnt_inst_id: app.globalData.get_config('config.common_app_mini_alipay_tnt_inst_id'),
+                                mini_alipay_scene: app.globalData.get_config('config.common_app_mini_alipay_scene'),
+                                mini_alipay_openid: app.globalData.get_user_cache_info('alipay_openid')
+                            });
+                        }
+                        // #endif
+                    }
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 客服事件
+            chat_event() {
+                // 在线客服系统
+                if((this.chat_url || null) != null) {
+                    app.globalData.chat_entry_handle(this.chat_url);
+                } else {
+                    // 自定义客服
+                    if((this.common_app_customer_service_custom || null) != null) {
+                        app.globalData.url_open(this.common_app_customer_service_custom);
+                    } else {
+                        // 企业微信客服
+                        if((this.common_app_customer_service_company_weixin_corpid || null) != null && (this.common_app_customer_service_company_weixin_url || null) != null) {
+                            // #ifdef APP
+                            // app打开企业微信客服
+                            plus.share.getServices(res => {
+                                var wechat = res.find(i => i.id === 'weixin')
+                                if(wechat) {
+                                    wechat.openCustomerServiceChat({
+                                        corpid: this.common_app_customer_service_company_weixin_corpid,
+                                        url: this.common_app_customer_service_company_weixin_url,
+                                    });
+                                }
+                            });
+                            // #endif
+
+                            // #ifdef MP-WEIXIN
+                            // 微信小程序打开企业微信客服
+                            uni.openCustomerServiceChat({
+                                extInfo: {url: this.common_app_customer_service_company_weixin_url},
+                                corpId: this.common_app_customer_service_company_weixin_corpid,
+                                showMessageCard: this.propCard,
+                                sendMessageTitle: this.propTitle,
+                                sendMessagePath: this.propPath,
+                                sendMessageImg: this.propImg,
+                            });
+                            // #endif
+                            // #ifdef H5
+                            app.globalData.url_open(this.common_app_customer_service_company_weixin_url);
+                            // #endif
+                        } else {
+                            // 电话客服
+                            this.call_event();
+                        }
+                    }
+                }
+            },
+
+            // 客服电话
+            call_event() {
+                app.globalData.call_tel(this.common_app_customer_service_tel);
+            }
+        }
+    };
+</script>
+<style scoped>
+    .online-service-movable-container {
+        position: fixed;
+        width: 100%;
+        height: 100%;
+        top: 0;
+        left: 0;
+        background: transparent;
+        pointer-events: none;
+        z-index: 2;
+    }
+    .online-service-event-submit {
+        pointer-events: auto;
+    }
+    .online-service-event-submit,
+    .online-service-event-submit .chat-btn {
+        width: 50px;
+        height: 50px;
+        border-radius: 50%;
+    }
+    .online-service-event-submit .chat-btn {
+        border: 0;
+        padding: 0;
+    }
+    .online-service-event-submit .icon {
+        width: 50px !important;
+        height: 50px !important;
+        position: relative;
+    }
+    .goods-chat-container .chat-btn {
+        padding: 0;
+        border: 0;
+        line-height: initial;
+        font-size: 24rpx;
+        background: transparent;
+    }
+    .goods-chat-container .icon {
+        width: 40rpx;
+        height: 40rpx;
+        margin: 10rpx 0 5rpx 0;
+    }
+    .goods-chat-container .text {
+        margin-top: -10rpx;
+    }
+    /* #ifdef MP-ALIPAY */
+    .goods-chat-container .alipay-contact {
+        margin-top: 10rpx;
+    }
+    .goods-chat-container .alipay-contact .text {
+        margin-top: -5rpx;
+    }
+    .online-service-event-submit .alipay-chat-btn {
+        line-height: initial;
+        display: block;
+    }
+    /* #endif */
+    
+    /**
+     * 呼吸灯
+     */
+     .spread {
+        background-color: rgba(238, 73, 70,0.4);
+        border-radius: 100%;
+        width: 50px;
+        height: 50px;
+        position: relative;
+        z-index: 1;
+    }
+    .spread .ring {
+        /* 速度为1.5 * 层数 = 实际运行速度，速度修改则 animation-delay 属性也修改相同速度 */
+        animation: pulsing 1.5s ease-out infinite;
+    }
+    /* 速度为1*层数 */
+    .spread .ring:nth-of-type(1) {
+        -webkit-animation-delay: -1.5s;
+        animation-delay: -1.5s;
+    }
+
+    /* 速度为1*层数 */
+    .spread .ring:nth-of-type(2) {
+        -webkit-animation-delay: -2s;
+        animation-delay: -2s;
+    }
+    @keyframes pulsing {
+        100% {
+            transform: scale(1.35);
+            opacity: 0
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/components/panel-content/panel-content.vue b/components/panel-content/panel-content.vue
new file mode 100644
index 0000000..e25c203
--- /dev/null
+++ b/components/panel-content/panel-content.vue
@@ -0,0 +1,173 @@
+<template>
+    <view :class="theme_view">
+        <!-- 简洁的数据，一般列表展示使用 -->
+        <view v-if="propIsTerse" class="content margin-top cp">
+            <block v-if="data != null && data_field.length > 0">
+                <block v-for="(item, index) in data_field" :key="index">
+                    <view v-if="(item.is_hide || 0) == 0" class="single-text margin-top-xs">
+                        <text class="cr-grey margin-right-xl">{{ item.name }}</text>
+                        <text class="cr-base">
+                            <block v-if="item.type == 'images'">
+                                <image :src="data[item.field]" mode="aspectFit" class="radius panel-item-images"></image>
+                            </block>
+                            <text v-else>{{ data[item.field] }}</text>
+                        </text>
+                        <view v-if="(item.is_copy || 0) == 1" class="dis-inline-block margin-left" data-event="copy" :data-value="data[item.field]" @tap.stop="text_event_handle">
+                            <iconfont name="icon-copy" size="28rpx" class="cr-grey"></iconfont>
+                        </view>
+                    </view>
+                </block>
+                <view v-if="propIsItemShowMax > 0 && propIsItemShowMax < data_field.length" @tap.stop="item_more_event" class="margin-top-sm tc">
+                    <text class="cr-grey-c margin-right-sm">{{ $t('common.view_more') }}</text>
+                    <iconfont :name="'icon-arrow-' + (more_status ? 'top' : 'bottom')" size="28rpx" color="#ccc"></iconfont>
+                </view>
+            </block>
+            <slot></slot>
+        </view>
+        <!-- 详情面板数据 -->
+        <view v-else class="padding-horizontal-main padding-top-main">
+            <view class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                <view v-if="(propTitle || null) != null" class="br-b padding-bottom-main fw-b text-size">{{ propTitle }}</view>
+                <view class="panel-content oh">
+                    <block v-if="data != null && data_field.length > 0">
+                        <block v-for="(item, index) in data_field" :key="index">
+                            <view v-if="(item.is_hide || 0) == 0" class="item br-b-f5 oh padding-vertical-main">
+                                <view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
+                                <view class="content fl br-l padding-left-main">
+                                    <block v-if="item.type == 'images'">
+                                        <image :src="data[item.field]" mode="aspectFit" class="panel-item-images"></image>
+                                    </block>
+                                    <text v-else>{{ data[item.field] }}</text>
+                                    <view v-if="(item.is_copy || 0) == 1" class="dis-inline-block margin-left" data-event="copy" :data-value="data[item.field]" @tap.stop="text_event_handle">
+                                        <iconfont name="icon-copy" size="28rpx" class="cr-grey lh-il"></iconfont>
+                                    </view>
+                                </view>
+                            </view>
+                        </block>
+                        <view v-if="propIsItemShowMax > 0 && propIsItemShowMax < data_field.length" @tap="item_more_event" class="margin-top-sm tc">
+                            <text class="cr-grey-c margin-right-sm">{{ $t('common.view_more') }}</text>
+                            <iconfont :name="'icon-arrow-' + (more_status ? 'top' : 'bottom')" size="28rpx" color="#ccc"></iconfont>
+                        </view>
+                    </block>
+                    <slot></slot>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentNoData from '@/components/no-data/no-data';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data: null,
+                data_field: [],
+                more_status: false,
+            };
+        },
+        components: {
+            componentNoData,
+        },
+        props: {
+            // 标题
+            propTitle: {
+                type: String,
+                default: '',
+            },
+            // 数据
+            propData: {
+                type: [Object, String],
+                default: '',
+            },
+            // 数据字段
+            propDataField: {
+                type: Array,
+                default: [],
+            },
+            // 数据项最大展示数量（0则显示全部）
+            propIsItemShowMax: {
+                type: Number,
+                default: 0,
+            },
+            // 指定字段
+            propAppointField: {
+                type: String,
+                default: '',
+            },
+            // 排除字段
+            propExcludeField: {
+                type: String,
+                default: '',
+            },
+            // 无数据提示状态
+            propNoDataStatus: {
+                type: [Number, String],
+                default: 3,
+            },
+            // 无数据提示内容
+            propNoDataMsg: {
+                type: [String],
+                default: '',
+            },
+            // 是否简洁的模式展示
+            propIsTerse: {
+                type: Boolean,
+                default: false,
+            },
+        },
+        // 属性值改变监听
+        watch: {
+            // 数据改变
+            propData(value, old_value) {
+                this.data = value;
+            },
+        },
+        // 页面被展示
+        created: function (e) {
+            this.setData({
+                data: this.propData,
+            });
+            this.data_field_handle(this.propDataField);
+        },
+        methods: {
+            // 数据字段处理
+            data_field_handle(data) {
+                var appoint = (this.propAppointField || null) == null ? [] : this.propAppointField.split(',');
+                var exclude = (this.propExcludeField || null) == null ? [] : this.propExcludeField.split(',');
+                var temp_data = [];
+                var index = 0;
+                for (var i in data) {
+                    if ((exclude.length == 0 && appoint.length > 0 && appoint.indexOf(data[i]['field']) != -1) || (appoint.length == 0 && (exclude.length == 0 || exclude.indexOf(data[i]['field']) == -1))) {
+                        data[i]['is_hide'] = (data[i]['is_hide'] || 0) == 0 ? (index >= this.propIsItemShowMax && this.propIsItemShowMax > 0 ? 1 : 0) : 0;
+                        temp_data.push(data[i]);
+                        index++;
+                    }
+                }
+                this.setData({
+                    data_field: temp_data,
+                });
+            },
+
+            // 文本事件
+            text_event_handle(e) {
+                app.globalData.text_event_handle(e);
+            },
+
+            // 数据项更多事件
+            item_more_event(e) {
+                this.data_field_handle(this.data_field);
+                this.setData({
+                    more_status: !this.more_status,
+                });
+            },
+        },
+    };
+</script>
+<style scoped>
+    .panel-item-images {
+        width: 40rpx;
+        height: 40rpx;
+    }
+</style>
diff --git a/components/payment/payment.vue b/components/payment/payment.vue
new file mode 100644
index 0000000..0e29fbd
--- /dev/null
+++ b/components/payment/payment.vue
@@ -0,0 +1,922 @@
+<template>
+    <view :class="theme_view">
+        <!-- 支付二维码展示 -->
+        <component-popup :propShow="popup_view_pay_qrcode_is_show" propPosition="bottom" @onclose="popup_view_pay_qrcode_event_close">
+            <view class="padding-top-xxxl padding-bottom-xxxl padding-left-xxxl padding-right-xxxl tc">
+                <block v-if="(popup_view_pay_data || null) == null || (popup_view_pay_data.qrcode_url || null) == null || (popup_view_pay_data.name || null) == null || (popup_view_pay_data.order_no || null) == null">
+                    <text class="cr-grey">{{$t('payment.payment.973g2e')}}</text>
+                </block>
+                <block v-else>
+                    <view class="fw-b text-size cr-base margin-bottom-sm">{{ popup_view_pay_data.name }}</view>
+                    <image :src="popup_view_pay_data.qrcode_url" mode="aspectFit" class="dis-block auto max-w"></image>
+                    <view v-if="(popup_view_pay_data.msg || null) != null" class="cr-yellow margin-top-sm">{{ popup_view_pay_data.msg }}</view>
+                    <!-- #ifdef H5 -->
+                    <view v-if="popup_view_pay_data.pay_url != null" class="margin-top-xl">
+                        <a :href="popup_view_pay_data.pay_url" target="_blank" class="dis-inline-block cr-green">{{$t('payment.payment.z3y296')}}</a>
+                    </view>
+                    <!-- #endif -->
+                </block>
+            </view>
+        </component-popup>
+        <!-- 支付方式 popup -->
+        <component-popup :propShow="is_show_payment_popup" propPosition="bottom" @onclose="payment_popup_event_close">
+            <view class="poupon-title padding-main tc text-size-md pr">{{$t('payment.payment.iu792d')}}<iconfont name="icon-close-o" propClass="pa right-0 margin-right-main margin-top-xs" size="30rpx" color="#999" @tap="payment_popup_event_close"></iconfont>
+            </view>
+            <view class="payment-price tc padding-top-sm padding-bottom-sm br-b">
+                <text class="text-size-md">{{ propCurrencySymbol }}</text>
+                {{ propPayPrice }}
+            </view>
+            <view v-if="payment_list.length > 0" class="oh">
+                <view class="payment-list">
+                    <scroll-view scroll-y="true" class="scroll-y wh-auto">
+                        <view v-for="(item, index) in payment_list" :key="index" class="item br-b flex-row jc-sb align-c" :data-value="item.id" @tap="checked_payment">
+                            <view class="flex-1">
+                                <image v-if="(item.logo || null) != null" class="icon va-m margin-right-sm" :src="item.logo" mode="widthFix"></image>
+                                <text class="va-m">{{ item.name }}</text>
+                                <text v-if="(item.tips || null) !== null" class="va-m cr-red">（{{ item.tips }}）</text>
+                            </view>
+                            <iconfont :name="payment_id == item.id ? 'icon-zhifu-yixuan' : 'icon-zhifu-weixuan'" size="44rpx" :color="payment_id == item.id ? '#E22C08' : '#ccc'"></iconfont>
+                        </view>
+                    </scroll-view>
+                </view>
+                <view class="payment-submit">
+                    <view class="bottom-line-exclude">
+                        <button class="bg-main br-main cr-white round text-size" type="default" hover-class="none" @tap="popup_payment_event" :disabled="submit_disabled_status">{{$t('payment.payment.25r53g')}}</button>
+                    </view>
+                </view>
+            </view>
+            <view v-else class="padding-top-xxxl padding-bottom-xxxl oh bg-white tc cr-grey">{{$t('payment.payment.058a46')}}</view>
+        </component-popup>
+
+        <!-- 支付html展示 -->
+        <component-popup :propShow="popup_view_pay_html_is_show" propPosition="bottom" @onclose="popup_view_pay_html_event_close">
+            <view class="popup-pay-html-content padding-top-xxxl padding-bottom-xxxl padding-left-xxxl padding-right-xxxl tc">
+                <block v-if="(popup_view_pay_data || null) == null">
+                    <text class="cr-grey">{{$t('payment.payment.973g2e')}}</text>
+                </block>
+                <block v-else>
+                    <mp-html :content="popup_view_pay_data" />
+                </block>
+            </view>
+        </component-popup>
+
+        <!-- 支付中提示弹窗 -->
+        <view v-if="payment_confirm_modal_status" class="payment-confirm-modal">
+            <view class="content padding-xl margin-xxl tc bg-white border-radius-main">
+                <view class="padding-vertical-xxxxl">{{$t('common.payment_in_text')}}</view>
+                <view class="margin-top-lg">
+                    <button type="default" size="mini" class="bg-white br-black cr-black text-size-sm round margin-right-xxxxl" data-type="0" @tap="payment_confirm_event">{{$t('common.not_have_name')}}</button>
+                    <button type="default" size="mini" class="bg-main br-main cr-white text-size-sm round margin-left-xxxxl" data-type="1" @tap="payment_confirm_event">{{$t('order.order.s8g966')}}</button>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import base64 from '@/common/js/lib/base64.js';
+    import componentPopup from '@/components/popup/popup';
+    export default {
+        name: 'pay',
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                // 支付方式列表
+                payment_list: [],
+                // 弹窗开关
+                is_show_payment_popup: false,
+                popup_view_pay_qrcode_is_show: false,
+                // 支付弹窗展示数据
+                popup_view_pay_data: null,
+                // 定时器
+                pay_statuc_check_timer: null,
+                // 支付id
+                payment_id: 0,
+                submit_disabled_status: true,
+                order_id: 0,
+                popup_view_pay_html_is_show: false,
+                // 打开url地址定时任务和状态
+                open_pay_url_timer: null,
+                open_pay_url_status: true,
+                // 支付返回数据
+                pay_response_data: {},
+                // 支付确认弹窗
+                payment_confirm_modal_status: false,
+            };
+        },
+        props: {
+            propCurrencySymbol: {
+                type: String,
+                default: app.globalData.currency_symbol(),
+            },
+            propPayUrl: {
+                type: String,
+                default: '',
+            },
+            propQrcodeUrl: {
+                type: String,
+                default: '',
+            },
+            propPaymentList: {
+                type: Array,
+                default: () => {
+                    return [];
+                },
+            },
+            propIsShowPayment: {
+                type: Boolean,
+                default: false,
+            },
+            // 订单id
+            propTempPayValue: {
+                type: [String, Number],
+                default: '',
+            },
+            // 订单id参数名，默认为id
+            propPayDataKey: {
+                type: String,
+                default: 'id',
+            },
+            // 订单下标  ---- 用于处理支付成功后前端修改成功状态
+            propTempPayIndex: {
+                type: [Number, String],
+                default: 0,
+            },
+            // 支付id 值为0表示没有配置支付方式
+            propPaymentId: {
+                type: [Number, String],
+                default: 0,
+            },
+            // 默认支付id 值为0表示没有默认
+            propDefaultPaymentId: {
+                type: [Number, String],
+                default: 0,
+            },
+            // 付款金额
+            propPayPrice: {
+                type: [Number, String],
+                default: 0,
+            },
+            // 支付跳转页面------跳转成功页面---后返回的页面
+            propToPageBack: {
+                type: Object,
+                default: () => {
+                    return {};
+                },
+            },
+            // 指定所有页面跳转到指定页面------除现金支付外
+            propToPage: {
+                type: String,
+                default: '',
+            },
+            // 现金支付-指定跳转页面----不进入充值成功页面：不配置则表示不跳转
+            propToAppointPage: {
+                type: String,
+                default: '',
+            },
+            // 支付失败跳转页面------不传则停留在当前页面
+            propToFailPage: {
+                type: String,
+                default: '',
+            },
+            //是否需要关闭页面进行跳转
+            propIsRedirectTo: {
+                type: Boolean,
+                default: false,
+            },
+            // 判断错误时是否需要弹窗提示
+            propIsFailAlert: {
+                type: Boolean,
+                default: true,
+            },
+        },
+        components: {
+            componentPopup,
+        },
+        watch: {
+            // 支付方式是否改变
+            propPaymentList(value, old_value) {
+                this.setData({
+                    payment_list: value,
+                });
+            },
+            // 是否显示支付方式
+            propIsShowPayment(new_val, old_val) {
+                if (new_val !== old_val) {
+                    let bool = true;
+                    if (this.payment_list.length == 1) {
+                        bool = false;
+                        this.setData({
+                            payment_id: this.payment_list[0].id,
+                        });
+                    } else {
+                        let self = this;
+                        self.payment_list.forEach((item) => {
+                            let new_payment_id = Number(self.propPaymentId) == 0 ? self.propDefaultPaymentId : Number(self.propPaymentId);
+                            if (item.id == new_payment_id) {
+                                bool = false;
+                            }
+                        });
+                        this.setData({
+                            payment_id: Number(this.propPaymentId) == 0 ? this.propDefaultPaymentId : Number(this.propPaymentId),
+                        });
+                    }
+                    
+                    this.setData({
+                        is_show_payment_popup: new_val,
+                        submit_disabled_status: bool,
+                    });
+                }
+            }
+        },
+        // 页面被展示
+        created: function () {
+            this.setData({
+                payment_list: this.propPaymentList,
+                payment_id: Number(this.propPaymentId) == 0 ? this.propDefaultPaymentId : Number(this.propPaymentId),
+            });
+        },
+        methods: {
+            // 支付弹窗关闭
+            payment_popup_event_close(e) {
+                this.setData({
+                    is_show_payment_popup: false,
+                });
+                this.$emit('close-payment-popup', false);
+            },
+            // 支付二维码展示窗口事件
+            popup_view_pay_qrcode_event_close(e) {
+                // 关闭弹窗
+                this.setData({
+                    popup_view_pay_qrcode_is_show: false,
+                });
+                // 清除定时和支付数据
+                clearInterval(this.pay_statuc_check_timer);
+            },
+
+            // 选择支付方式
+            checked_payment(e) {
+                this.setData({
+                    payment_id: e.currentTarget.dataset.value,
+                    submit_disabled_status: false,
+                });
+            },
+
+            // 支付弹窗发起支付
+            popup_payment_event() {
+                if (this.submit_disabled_status) {
+                    app.globalData.showToast(this.$t('payment.payment.x6d585'));
+                    return false;
+                }
+                this.setData({
+                    is_show_payment_popup: false,
+                });
+                this.pay_handle(this.propTempPayValue, this.payment_id);
+                this.$emit('close-payment-popup', false);
+            },
+
+            // 支付方法
+            pay_handle(order_id, payment_id = 0, payment_list = []) {
+                // 没有指定支付方式则使用属性传过来的值
+                if((payment_list || null) != null && payment_list.length > 0) {
+                    this.setData({
+                        payment_list: payment_list
+                    });
+                }
+                // 没有支付方式
+                if((payment_id || 0) == 0) {
+                    this.pay_handle_event(order_id, payment_id);
+                } else {
+                    // 循环匹配支付方式
+                    this.payment_list.forEach((item) => {
+                        if (item.id == payment_id) {
+                            if (item.payment == 'WalletPay') {
+                                var self = this;
+                                uni.showModal({
+                                    title: self.$t('common.warm_tips'),
+                                    content: self.$t('payment.payment.011cj4'),
+                                    confirmText: self.$t('common.confirm'),
+                                    cancelText: self.$t('common.not_yet'),
+                                    success(res) {
+                                        if (res.confirm) {
+                                            self.pay_handle_event(order_id, payment_id);
+                                        } else {
+                                            self.order_item_pay_fail_handle(null, order_id, self.$t('paytips.paytips.6mpsl7'));
+                                        }
+                                    },
+                                });
+                            } else {
+                                this.pay_handle_event(order_id, payment_id);
+                            }
+                        }
+                    });
+                }
+            },
+
+            // 支付处理
+            pay_handle_event(order_id, payment_id = 0) {
+                // 没有指定支付方式则不匹配支付标识
+                var payment = null;
+                if((payment_id || 0) != 0) {
+                    // #ifdef H5
+                    // 微信环境判断是否已有web_openid、不存在则不继续执行跳转到插件进行授权
+                    if (!app.globalData.is_user_weixin_web_openid(order_id, payment_id || this.payment_id, this.propToAppointPage)) {
+                        return false;
+                    }
+                    // #endif
+                    // 支付方式
+                    for (var i in this.payment_list) {
+                        if (this.payment_list[i]['id'] == (payment_id || this.payment_id)) {
+                            payment = this.payment_list[i];
+                        }
+                    }
+                    if (payment == null) {
+                        app.globalData.showToast(this.$t('payment.payment.7ihx9u'));
+                        return false;
+                    }
+                }
+
+                // 请求数据
+                var post_data = {
+                    [this.propPayDataKey]: order_id,
+                    payment_id: payment_id || this.payment_id,
+                };
+                // h5自定义重定向地址
+                // #ifdef H5
+                var redirect_url = app.globalData.page_url_protocol(this.propToAppointPage || app.globalData.get_page_url(false));
+                post_data['redirect_url'] = encodeURIComponent(base64.encode(redirect_url));
+                // 存在支付标识、指定支付方式使用respond_url返回地址、移除重定向地址
+                if(payment != null) {
+                    var respond_arr = ['PayPal', 'UniPayment'];
+                    if (respond_arr.indexOf(payment.payment) != -1) {
+                        post_data['respond_url'] = post_data['redirect_url'];
+                        delete post_data['redirect_url'];
+                    }
+                }
+                // #endif
+                // 请求支付接口
+                uni.showLoading({
+                    title: this.$t('payment.payment.e1f54e'),
+                    mask: true
+                });
+                if (this.propPayUrl) {
+                    uni.request({
+                        url: this.propPayUrl,
+                        method: 'POST',
+                        data: post_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            var data = res.data.data;
+                            this.setData({
+                                pay_response_data: data || {}
+                            });
+                            if (res.data.code == 0) {
+                                // 是否直接支付成功
+                                if ((data.is_success || 0) == 1) {
+                                    // 数据设置
+                                    this.order_item_pay_success_handle(data, order_id, false);
+                                    app.globalData.showToast(this.$t('paytips.paytips.679rxu'), 'success');
+                                    setTimeout(() => {
+                                        this.to_success_page_event();
+                                    }, 2000);
+                                } else {
+                                    // 支付方式类型
+                                    let payment_type = Number(data.is_payment_type || 0);
+                                    switch (payment_type) {
+                                        // 正常线上支付
+                                        case 0:
+                                            // #ifdef APP
+                                            this.app_pay_handle(this, data, order_id);
+                                            // #endif
+                                            // #ifdef MP-TOUTIAO
+                                            // 头条是否非普通版本支持
+                                            if(parseInt(data.data.pay_type || 0) == 1) {
+                                                this.toutiao_transaction_pay_handle(this, data, order_id);
+                                            } else {
+                                                this.mp_pay_handle(this, data, order_id);
+                                            }
+                                            // #endif
+                                            // #ifdef MP-WEIXIN || MP-ALIPAY || MP-BAIDU
+                                            this.mp_pay_handle(this, data, order_id);
+                                            // #endif
+                                            // #ifdef MP-KUAISHOU
+                                            this.kuaishou_pay_handle(this, data, order_id);
+                                            // #endif
+                                            // #ifdef MP-QQ
+                                            this.qq_pay_handle(this, data, order_id);
+                                            // #endif
+                                            // #ifdef H5
+                                            this.h5_pay_handle(this, data, order_id);
+                                            // #endif
+                                            break;
+                                        // 线下支付
+                                        case 1:
+                                            // 现金支付
+                                            let self = this;
+                                            uni.showModal({
+                                                content: res.data.msg,
+                                                showCancel: false,
+                                                confirmText: self.$t('common.confirm'),
+                                                success(res) {
+                                                    if (res.confirm) {
+                                                        self.to_other(order_id);
+                                                    } else {
+                                                        self.order_item_pay_fail_handle(data, order_id, self.$t('paytips.paytips.6mpsl7'));
+                                                    }
+                                                },
+                                            });
+                                            break;
+                                        // 钱包支付
+                                        case 2:
+                                            this.order_item_pay_success_handle(data, order_id);
+                                            break;
+                                        // 默认
+                                        default:
+                                            app.globalData.showToast(this.$t('payment.payment.vhx5dv'));
+                                    }
+                                }
+                            } else {
+                                // 是否返回html代码展示、则提示错误
+                                if (res.data.code == -6666 && (data || null) != null) {
+                                    this.setData({
+                                        popup_view_pay_data: data,
+                                        popup_view_pay_html_is_show: true,
+                                    });
+                                } else {
+                                    this.order_item_pay_fail_handle(data, order_id, res.data.msg);
+                                }
+                            }
+                        },
+                        fail: (res) => {
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                } else {
+                    app.globalData.showToast(this.$t('payment.payment.597s8b'));
+                }
+            },
+            // APP支付
+            app_pay_handle(self, data, order_id) {
+                var arr = {
+                    Alipay: 'alipay',
+                    Weixin: 'wxpay',
+                    PayPal: 'paypal'
+                }
+                var pay_value = arr[data.payment.payment] || null;
+                if(pay_value != null) {
+                    uni.getProvider({
+                        service: 'payment',
+                        success: function (res) {
+                            if(~res.provider.indexOf(pay_value)) {
+                                var pay_data = ((data.data.pay_data || null) == null) ? data.data : data.data.pay_data;
+                                uni.requestPayment({
+                                    provider: pay_value,
+                                    orderInfo: pay_data,
+                                    success: function (res) {
+                                        // 是否需要回调捕获
+                                        var call_back_url = data.data.call_back_url || null;
+                                        if(call_back_url != null) {
+                                            uni.request({url: call_back_url, method: 'GET'});
+                                        }
+                    
+                                        // 成功处理数据
+                                        self.order_item_pay_success_handle(data, order_id);
+                                    },
+                                    fail: function (err) {
+                                        self.order_item_pay_fail_handle(data, order_id, self.$t('paytips.paytips.6y488i'));
+                                    }
+                                });
+                            } else {
+                                app.globalData.showToast(data.payment.payment+self.$t('payment.payment.bv637f'));
+                            }
+                        }
+                    });
+                } else {
+                    // 先清除定时任务
+                    if(self.open_pay_url_timer != null) {
+                        clearTimeout(self.open_pay_url_timer);
+                    }
+                    // 显示加载层
+                    uni.showLoading({
+                        title: self.$t('common.loading_in_text'),
+                        mask: true
+                    });
+                    // 设置打开url状态
+                    self.setData({
+                        open_pay_url_status: true
+                    });
+                    // 打开url
+                    plus.runtime.openURL(data.data, function(error) {
+                        uni.hideLoading();
+                        // 打开url失败、并进入提示失败环节
+                        self.setData({
+                            open_pay_url_status: false
+                        });
+                        self.order_item_pay_fail_handle(data, order_id, error.message+'('+error.code+')');
+                    });
+                    // 定时3秒后提示用户确认支付状态
+                    self.open_pay_url_timer = setTimeout(function() {
+                        if(self.open_pay_url_status) {
+                            uni.hideLoading();
+                            uni.showModal({
+                                content: self.$t('payment.payment.sdfs31'),
+                                showCancel: true,
+                                cancelText: self.$t('common.not_have_name'),
+                                confirmText: self.$t('order.order.s8g966'),
+                                success(res) {
+                                    if (res.confirm) {
+                                        self.order_item_pay_success_handle(data, order_id);
+                                    } else {
+                                        self.order_item_pay_fail_handle(data, order_id, self.$t('paytips.paytips.6y488i'));
+                                    }
+                                },
+                            });
+                        }
+                    }, 3000);
+                }
+            },
+            // 快手小程序
+            kuaishou_pay_handle(self, data, order_id) {
+                uni.pay({
+                    orderInfo: data.data,
+                    serviceId: '1',
+                    success: (res) => {
+                        // 数据设置
+                        self.order_item_pay_success_handle(data, order_id);
+                    },
+                    fail: (res) => {
+                        self.order_item_pay_fail_handle(data, order_id, self.$t('paytips.paytips.6y488i'));
+                    },
+                });
+            },
+            // 头条小程序非普通交易支付处理
+            toutiao_transaction_pay_handle(self, data, order_id) {
+                if(!uni.canIUse('requestOrder') || !uni.canIUse('getOrderPayment')) {
+                    app.globalData.showToast(self.$t('payment.payment.4dszme'));
+                    return false;
+                }
+                uni.requestOrder({
+                    data: data.data.data,
+                    byteAuthorization: data.data.auth,
+                    success: (res) => {
+                        uni.getOrderPayment({
+                            orderId: res.orderId,
+                            success: (res) => {
+                                // 数据设置
+                                self.order_item_pay_success_handle(data, order_id);
+                            },
+                            fail: (res) => {
+                                self.order_item_pay_fail_handle(data, order_id, self.$t('paytips.paytips.6y488i'));
+                            }
+                        });
+                    },
+                    fail: (res) => {
+                        app.globalData.showToast(res.errMsg+'('+res.errNo+')');
+                    }
+                });
+            },
+            // 小程序: 微信、支付宝、百度、头条、QQ
+            mp_pay_handle(self, data, order_id) {
+                // 是否打开另一个小程序
+                if (typeof data.data != 'string' && (data.data.appid || null) != null && (data.data.path || null) != null && (data.data.order_no || null) != null) {
+                    uni.navigateToMiniProgram({
+                        appId: data.data.appid,
+                        path: data.data.path,
+                        extraData: data.data.extra_data || {},
+                        success(res) {
+                            // 支付状态验证
+                            self.pay_status_check_handle(self, data, order_id);
+
+                            // 提示弹窗
+                            self.setData({
+                                payment_confirm_modal_status: true,
+                            });
+                        },
+                        fail(res) {
+                            app.globalData.showToast(self.$t('paytips.paytips.6y488i'));
+                        }
+                    });
+                } else {
+                    uni.requestPayment({
+                        // #ifdef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO
+                        orderInfo: data.data,
+                        // #endif
+                        // #ifdef MP-QQ
+                        package: data.data,
+                        // #endif
+                        // #ifdef MP-WEIXIN
+                        timeStamp: data.data.timeStamp,
+                        nonceStr: data.data.nonceStr,
+                        package: data.data.package,
+                        signType: data.data.signType,
+                        paySign: data.data.paySign,
+                        // #endif
+                        // #ifdef MP-TOUTIAO
+                        service: 5,
+                        // #endif
+                        success: (res) => {
+                            // #ifdef MP-ALIPAY
+                            if (res.resultCode != 9000) {
+                                self.order_item_pay_fail_handle(data, order_id, res.memo || self.$t('paytips.paytips.6y488i'));
+                                return false;
+                            }
+                            // #endif
+                            // #ifdef MP-TOUTIAO
+                            if (res.code != 0) {
+                                self.order_item_pay_fail_handle(data, order_id, self.$t('paytips.paytips.6y488i'));
+                                return false;
+                            }
+                            // #endif
+                            // 数据设置
+                            self.order_item_pay_success_handle(data, order_id);
+                        },
+                        fail: (res) => {
+                            self.order_item_pay_fail_handle(data, order_id, self.$t('paytips.paytips.6y488i'));
+                        },
+                    });
+                }
+            },
+            // QQ支付处理
+            qq_pay_handle(self, data, order_id) {
+                // 是否微信支付
+                if (data.payment.payment == 'Weixin') {
+                    uni.requestWxPayment({
+                        url: data.data,
+                        referer: app.globalData.data.request_url,
+                        success: function (res) {
+                            app.globalData.alert({
+                                msg: self.$t('payment.payment.k2i010'),
+                                is_show_cancel: 0,
+                            });
+                            // 支付接口调用成功，但是不知道是否支付成功，所以需要重新获取列表数据
+                            self.$emit('reset-event');
+                        },
+                        fail: function (res) {
+                            self.order_item_pay_fail_handle(data, order_id, self.$t('paytips.paytips.6y488i'));
+                        },
+                    });
+                } else {
+                    self.mp_pay_handle(self, data, order_id);
+                }
+            },
+            // h5支付处理
+            h5_pay_handle(self, data, order_id) {
+                // 字符串则为跳转地址直接进入
+                if (typeof data.data == 'string') {
+                    window.location.href = data.data;
+                } else {
+                    var status = false;
+                    // 微信jsapi
+                    if (data.payment.payment == 'Weixin' && (data.data.appId || null) != null && (data.data.timeStamp || null) != null && (data.data.nonceStr || null) != null && (data.data.package || null) != null && (data.data.signType || null) != null && (data.data.paySign || null) != null) {
+                        status = true;
+
+                        function onBridgeReady() {
+                            WeixinJSBridge.invoke(
+                                'getBrandWCPayRequest',
+                                {
+                                    appId: data.data.appId,
+                                    timeStamp: data.data.timeStamp,
+                                    nonceStr: data.data.nonceStr,
+                                    package: data.data.package,
+                                    signType: data.data.signType,
+                                    paySign: data.data.paySign,
+                                },
+                                function (res) {
+                                    if (res.err_msg == 'get_brand_wcpay_request:ok') {
+                                        // 数据设置
+                                        self.order_item_pay_success_handle(data, order_id);
+                                    } else {
+                                        self.order_item_pay_fail_handle(data, order_id, res.err_msg);
+                                    }
+                                }
+                            );
+                        }
+                        if (typeof WeixinJSBridge == 'undefined') {
+                            if (document.addEventListener) {
+                                document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false);
+                            } else if (document.attachEvent) {
+                                document.attachEvent('WeixinJSBridgeReady', onBridgeReady);
+                                document.attachEvent('onWeixinJSBridgeReady', onBridgeReady);
+                            }
+                        } else {
+                            onBridgeReady();
+                        }
+                    }
+                    // 二维码展示
+                    if ((data.data.qrcode_url || null) != null && (data.data.name || null) != null && (data.data.order_no || null) != null) {
+                        status = true;
+                        // 显示支付窗口
+                        self.setData({
+                            popup_view_pay_data: data.data,
+                            popup_view_pay_qrcode_is_show: true,
+                        });
+                        // 状态验证
+                        self.pay_status_check_handle(self, data, order_id);
+                    }
+                    // 返回html表单
+                    if ((data.data.html || null) != null) {
+                        status = true;
+                        var div = document.createElement('paydivform');
+                        div.innerHTML = data.data.html;
+                        document.body.appendChild(div);
+                        var fm = document.forms;
+                        var fm_len = fm.length;
+                        if (fm_len > 0) {
+                            fm[fm_len - 1].submit();
+                        }
+                    }
+                    // 未匹配到的支付处理方式
+                    if (!status) {
+                        app.globalData.showToast(data.payment.name + self.$t('payment.payment.2rw3qh'));
+                    }
+                }
+            },
+
+            // 支付状态验证处理
+            pay_status_check_handle(self, data, order_id) {
+                // 先清除已存在的定时
+                clearInterval(self.pay_statuc_check_timer);
+                // 定时校验支付状态
+                var timer = setInterval(function () {
+                    uni.request({
+                        url: self.propQrcodeUrl,
+                        method: 'POST',
+                        data: {
+                            order_no: data.data.order_no,
+                        },
+                        dataType: 'json',
+                        success: (res) => {
+                            if (res.data.code == 0) {
+                                // 清除定时、支付数据、弹窗
+                                clearInterval(self.pay_statuc_check_timer);
+                                self.setData({
+                                    popup_view_pay_data: null,
+                                    popup_view_pay_qrcode_is_show: false,
+                                    payment_confirm_modal_status: false,
+                                });
+                                // 数据设置
+                                self.order_item_pay_success_handle(data, order_id);
+                            } else {
+                                // -333支付中、其它状态则提示错误
+                                if (res.data.code != -333) {
+                                    clearInterval(self.pay_statuc_check_timer);
+                                    app.globalData.showToast(res.data.msg);
+                                }
+                            }
+                        },
+                        fail: () => {
+                            clearInterval(self.pay_statuc_check_timer);
+                            self.order_item_pay_fail_handle(data, order_id, self.$t('common.internet_error_tips'));
+                        },
+                    });
+                }, 3000);
+                self.setData({
+                    pay_statuc_check_timer: timer,
+                });
+            },
+
+            // 支付确认弹窗事件
+            payment_confirm_event(e) {
+                // 关闭弹窗清除定时任务
+                this.setData({
+                    payment_confirm_modal_status: false,
+                });
+                clearInterval(this.pay_statuc_check_timer);
+                // 回调处理
+                if(parseInt(e.currentTarget.dataset.type || 0) == 1) {
+                    this.order_item_pay_success_handle(this.pay_response_data, this.order_id);
+                } else {
+                    this.order_item_pay_fail_handle(this.pay_response_data, this.order_id, this.$t('paytips.paytips.6y488i'));
+                }
+            },
+
+            // 支付成功数据设置 data:后台返回的参数， order_id: 订单id，is_to_page，是否需要跳转页面的参数控制
+            order_item_pay_success_handle(data, order_id, is_to_page = true) {
+                let back_data = {
+                    data: data,
+                    order_id: order_id,
+                    temp_pay_index: this.propTempPayIndex,
+                    payment_id: this.payment_id,
+                    is_to_page: is_to_page,
+                };
+                this.$emit('pay-success', back_data);
+                if (is_to_page) {
+                    this.to_success_page_event();
+                }
+            },
+            // 支付失败数据设置 data:后台返回的参数， order_id: 订单id, msg: 错误提示信息
+            order_item_pay_fail_handle(data, order_id, msg) {
+                let back_data = {
+                    data: data,
+                    order_id: order_id,
+                    temp_pay_index: this.propTempPayIndex,
+                    payment_id: this.payment_id,
+                };
+                this.$emit('pay-fail', back_data);
+                this.to_fail_page_event(msg);
+            },
+            // 成功跳转
+            to_success_page_event() {
+                if (this.propToPage) {
+                    // 跳转支付页面
+                    app.globalData.url_open(this.propToPage, true);
+                } else {
+                    let url_data = {
+                        code: '9000',
+                    };
+                    url_data = Object.assign({}, url_data, this.propToPageBack);
+                    // 跳转支付页面
+                    app.globalData.url_open('/pages/paytips/paytips?params=' + encodeURIComponent(base64.encode(JSON.stringify(url_data))), this.propIsRedirectTo);
+                }
+            },
+            // 失败跳转
+            to_fail_page_event(msg) {
+                let to_fail_page = this.propToFailPage || null;
+                if (to_fail_page != null) {
+                    let join = (to_fail_page.indexOf('?') == -1) ? '?' : '&';
+                    to_fail_page += join+'msg='+msg;
+                    if (this.propIsFailAlert) {
+                        // 现金支付
+                        uni.showModal({
+                            content: msg,
+                            showCancel: false,
+                            confirmText: this.$t('common.confirm'),
+                            success(res) {
+                                if (res.confirm) {
+                                    // 跳转支付页面
+                                    app.globalData.url_open(to_fail_page, true);
+                                }
+                            },
+                        });
+                    } else {
+                        // 跳转支付页面
+                        app.globalData.url_open(to_fail_page, true);
+                    }
+                } else {
+                    if (msg) {
+                        app.globalData.showToast(msg);
+                    }
+                }
+            },
+            to_other(order_id) {
+                if (this.propToAppointPage) {
+                    // 跳转订单列表页
+                    app.globalData.url_open(this.propToAppointPage, true);
+                }
+            },
+            // 页面卸载
+            onUnload(e) {
+                clearInterval(this.pay_statuc_check_timer);
+            },
+            // 支付html展示窗口事件
+            popup_view_pay_html_event_close(e) {
+                this.setData({
+                    popup_view_pay_html_is_show: false,
+                });
+                this.to_other();
+            },
+        },
+    };
+</script>
+<style scoped>
+    /**
+    * 支付方式
+    */
+    .payment-price {
+        font-size: 80rpx;
+    }
+    .payment-list .scroll-y {
+        max-height: 430rpx;
+    }
+    .payment-list .item {
+        padding: 28rpx 28rpx 28rpx 32rpx;
+    }
+    .payment-list .icon {
+        width: 50rpx;
+        height: 50rpx !important;
+    }
+    .payment-submit {
+        padding: 40rpx;
+    }
+
+    /**
+     * 支付确认弹窗
+     */
+    .payment-confirm-modal {
+        position: fixed;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        background-color: rgba(0, 0, 0, 0.6);
+        z-index: 100;
+        width: 100%;
+        height: 100%;
+    }
+    .payment-confirm-modal .content {
+        margin-top: 60%;
+        z-index: 101;
+    }
+</style>
\ No newline at end of file
diff --git a/components/popup/popup.vue b/components/popup/popup.vue
new file mode 100644
index 0000000..d8e591d
--- /dev/null
+++ b/components/popup/popup.vue
@@ -0,0 +1,214 @@
+<template>
+    <view :class="theme_view + ' ' + propMostClass">
+        <view :class="'popup ' + (propClassname || '') + ' ' + (propShow ? 'popup-show' : 'popup-hide') + ' ' + (propAnimation ? 'animation' : '')" :disable-scroll="propDisablescroll">
+            <view class="popup-mask" :style="'z-index: ' + propIndex + ';'" v-if="propMask" @tap="on_mask_tap"></view>
+            <view :class="'popup-content popup-' + (propPosition || 'bottom') + ' ' + (propIsRadius ? '' : 'popup-radius-0') + ' ' + (propIsBar ? 'popup-bar' : '') + ' ' + (propPosition === 'bottom' ? 'bottom-line-exclude' : '')" :style="popup_content_style + propStyle">
+                <slot></slot>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                popup_content_style: '',
+            };
+        },
+        components: {},
+        props: {
+            // 最外层的class
+            propMostClass: {
+                type: String,
+                default: '',
+            },
+            // 内层class
+            propClassname: {
+                type: String,
+                default: '',
+            },
+            propShow: {
+                type: Boolean,
+                default: false,
+            },
+            propPosition: {
+                type: String,
+                default: 'bottom',
+            },
+            propMask: {
+                type: Boolean,
+                default: true,
+            },
+            propAnimation: {
+                type: Boolean,
+                default: true,
+            },
+            propDisablescroll: {
+                type: Boolean,
+                default: false,
+            },
+            propIsBar: {
+                type: Boolean,
+                default: false,
+            },
+            // 弹窗是否需要圆角 默认需要
+            propIsRadius: {
+                type: Boolean,
+                default: true,
+            },
+            propIndex: {
+                type: Number,
+                default: 100,
+            },
+            // 需要携带单位后缀
+            propTop: {
+                type: [String, Number],
+                default: '',
+            },
+            propBottom: {
+                type: String,
+                default: '',
+            },
+            propStyle: {
+                type: String,
+                default: '',
+            },
+        },
+        // 属性值改变监听
+        watch: {
+            // 监听状态
+            propShow(value, old_value) {
+                this.init_handle();
+            },
+        },
+        // 组建创建
+        created: function () {
+            this.init_handle();
+        },
+        methods: {
+            // 事件处理
+            on_mask_tap: function on_mask_tap() {
+                this.$emit(
+                    'onclose',
+                    {
+                        detail: {},
+                    },
+                    {}
+                );
+            },
+            // 初初始化处理
+            init_handle() {
+                var tabbar_height = 0;
+                if(this.propPosition == 'bottom') {
+                    // 弹窗从底部弹出，获取底部菜单高度、如果当前为底部菜单页面则增加底部间距
+                    if(app.globalData.data.is_use_native_tabbar != 1 && app.globalData.is_tabbar_pages()) {
+                        tabbar_height = (app.globalData.app_system_tabbar_height_value()*2)+20;
+                    } else {
+                        var height = (app.globalData.current_page(false) == 'pages/diy/diy') ? app.globalData.app_diy_tabbar_height_value() : 0;
+                        tabbar_height = (height > 0) ? (height*2)+20 : 0;
+                    }
+                }
+
+                // 左边距位置处理
+                var left = 0;
+                // #ifdef H5
+                // 处理内容左边距、避免父级设置内边距影响
+                var width = uni.getSystemInfoSync().windowWidth;
+                if (width > 960) {
+                    left = (width - 800) / 2;
+                }
+                // #endif
+                this.setData({
+                    popup_content_style: 'left:' + left + 'px;' + (this.propTop ? 'top:' + this.propTop : '') + ';' + (this.propBottom ? 'bottom:' + this.propBottom : '') + ';padding-bottom:' + tabbar_height + 'rpx;',
+                });
+            },
+        },
+    };
+</script>
+<style>
+    .popup {
+        opacity: 0;
+    }
+    .popup-content {
+        position: fixed;
+        background: #fff;
+        z-index: 101;
+        overflow: hidden;
+    }
+    .popup-mask {
+        position: fixed;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        background-color: rgba(0, 0, 0, 0.6);
+        opacity: 0;
+        pointer-events: none;
+        z-index: 100;
+    }
+    .popup-left {
+        transform: translateX(-100%);
+        left: 0;
+        top: 0;
+        bottom: 0;
+    }
+    .popup-right {
+        transform: translateX(100%);
+        right: 0;
+        top: 0;
+        bottom: 0;
+    }
+    .popup-top {
+        top: 0;
+        width: 100vw;
+        transform: translateY(-100%);
+    }
+    .popup-bottom {
+        bottom: var(--window-bottom);
+        width: 100vw;
+        transform: translateY(100%);
+    }
+    .popup-show {
+        opacity: 1;
+    }
+    .popup-hide {
+        transition: all 1s linear;
+    }
+    .popup-show .popup-content {
+        transform: none;
+    }
+    .popup-show .popup-mask {
+        opacity: 1;
+        pointer-events: auto;
+    }
+    .popup.animation .popup-mask,
+    .popup.animation .popup-content {
+        transition: all 0.35s linear;
+    }
+    .popup-top {
+        border-bottom-right-radius: 20rpx;
+        border-bottom-left-radius: 20rpx;
+    }
+    .popup-bottom {
+        border-top-right-radius: 20rpx;
+        border-top-left-radius: 20rpx;
+    }
+    .popup-left {
+        border-top-right-radius: 20rpx;
+        border-bottom-right-radius: 20rpx;
+    }
+    .popup-right {
+        border-top-left-radius: 20rpx;
+        border-bottom-left-radius: 20rpx;
+    }
+    .popup-radius-0 {
+        border-radius: 0 !important;
+    }
+    .popup-bar {
+        /* #ifdef H5 || APP */
+        bottom: var(--window-bottom) !important;
+        /* #endif */
+    }
+</style>
diff --git a/components/popupscreen/popupscreen.vue b/components/popupscreen/popupscreen.vue
new file mode 100644
index 0000000..a73d391
--- /dev/null
+++ b/components/popupscreen/popupscreen.vue
@@ -0,0 +1,131 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data || null) != null && status == 1" class="plugins-popupscreen wh-auto ht-auto">
+            <view class="content pr">
+                <image class="dis-block auto" :src="data.images" mode="widthFix" :data-value="data.images_url || ''" @tap="url_event"></image>
+                <view class="tc margin-top-xl">
+                    <view class="close cp round padding-sm auto" @tap.stop="close_event">
+                        <iconfont name="icon-close-o" size="28rpx" color="#cacaca"></iconfont>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data: null,
+                status: 0,
+                cache_key: 'plugins_popupscreen_cache_key',
+                timer: null,
+            };
+        },
+        props: {},
+        // 页面被展示
+        created: function () {
+            this.init_config();
+        },
+
+        methods: {
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    this.setData({
+                        data: app.globalData.get_config('plugins_base.popupscreen.data') || null,
+                    });
+                    this.init();
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 初始化
+            init() {
+                var data = this.data || null;
+                if (data != null && parseInt(data.is_app_enable || 0) == 1 && parseInt(data.is_valid || 0) == 1) {
+                    // 是否全局
+                    var temp_status = true;
+                    if(parseFloat(data.is_overall || 0) == 0) {
+                        // 非首页则不展示
+                        if(!app.globalData.is_tabbar_home()) {
+                            temp_status = false;
+                        }
+                    }
+                    if(temp_status) {
+                        // 不存在关闭缓存或者超过间隔时间则显示
+                        var key = this.cache_key;
+                        var cv = parseInt(uni.getStorageSync(key)) || 0;
+                        var pv = parseInt(data.interval_time) || 86400;
+                        if (cv == 0 || cv + pv < app.globalData.get_timestamp()) {
+                            // 是否开启自动关闭
+                            var timer = null;
+                            var ct = parseInt(data.close_time) || 0;
+                            if (ct > 0) {
+                                var self = this;
+                                timer = setTimeout(function () {
+                                    self.setData({
+                                        status: 0,
+                                    });
+                                    uni.setStorage({
+                                        key: key,
+                                        data: app.globalData.get_timestamp(),
+                                    });
+                                }, ct * 1000);
+                            }
+                            this.setData({
+                                status: 1,
+                                timer: timer,
+                            });
+                        }
+                    }
+                }
+            },
+            
+            // 关闭事件
+            close_event(e) {
+                this.setData({
+                    status: 0,
+                });
+                uni.setStorage({
+                    key: this.cache_key,
+                    data: app.globalData.get_timestamp(),
+                });
+                clearInterval(this.timer);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        }
+    };
+</script>
+<style scoped>
+    .plugins-popupscreen {
+        position: fixed;
+        left: 0;
+        top: 0;
+        z-index: 20;
+        background-color: rgb(0 0 0 / 0.3);
+    }
+    .plugins-popupscreen .close {
+        right: 10%;
+        top: 0;
+        z-index: 1;
+        width: 46rpx;
+        height: 46rpx;
+        line-height: 46rpx;
+        background-color: rgb(4 4 4 / 0.3);
+        border: solid 1px #a9a9a9;
+    }
+    .plugins-popupscreen .content {
+        margin-top: calc(50vh - 200rpx) !important;
+    }
+    .plugins-popupscreen .content image {
+        width: 600rpx;
+    }
+</style>
\ No newline at end of file
diff --git a/components/quick-nav/quick-nav.vue b/components/quick-nav/quick-nav.vue
new file mode 100644
index 0000000..b096886
--- /dev/null
+++ b/components/quick-nav/quick-nav.vue
@@ -0,0 +1,265 @@
+<template>
+    <view :class="theme_view">
+        <!-- 开启事件 -->
+        <movable-area v-if="propIsBtn && quick_status == 1" :class="'quick-movable-container ' + common_ent" :style="'height: calc(100% - ' + height_dec + 'rpx);top:' + top + 'rpx;'">
+            <movable-view direction="all" :x="x" :y="y" :animation="false" class="quick-event-submit" @tap="quick_open_event">
+                <image class="image" :src="common_static_url + 'quick-icon.png'" mode="widthFix"></image>
+            </movable-view>
+        </movable-area>
+
+        <!-- 弹窗 -->
+        <component-popup :propShow="popup_status" :propIsBar="propIsBar" propPosition="bottom" @onclose="quick_close_event">
+            <view :class="'nav-popup-container ' + common_ent">
+                <view class="close oh">
+                    <view class="fr" @tap.stop="quick_close_event">
+                        <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                    </view>
+                </view>
+                <view class="nav-popup-content">
+                    <view v-if="data_list.length > 0" class="nav-data-list">
+                        <view v-for="(item, index) in data_list" :key="index" class="item cp">
+                            <view :class="'item-content ' + ((item.bg_color || null) == null ? 'item-exposed' : '')" :data-value="item.event_value" :data-type="item.event_type" @tap="navigation_event" :style="(item.bg_color || null) == null ? '' : 'background-color:' + item.bg_color + ';'">
+                                <image class="image" :src="item.images_url" mode="aspectFit"></image>
+                            </view>
+                            <view class="title">{{ item.name }}</view>
+                        </view>
+                    </view>
+                    <view v-else>
+                        <!-- 提示信息 -->
+                        <component-no-data :propStatus="0"></component-no-data>
+                    </view>
+                </view>
+            </view>
+        </component-popup>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentPopup from '@/components/popup/popup';
+    import componentNoData from '@/components/no-data/no-data';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: app.globalData.get_static_url('common'),
+                popup_status: false,
+                quick_status: 0,
+                data_list: [],
+                system: null,
+                x: 0,
+                y: 0,
+                top: 0,
+                height_dec: 0,
+                is_first: 1,
+                common_ent: '',
+            };
+        },
+        components: {
+            componentPopup,
+            componentNoData,
+        },
+        props: {
+            propIsBtn: {
+                type: Boolean,
+                default: true,
+            },
+            propIsBar: {
+                type: Boolean,
+                default: false,
+            },
+            propIsNav: {
+                type: Boolean,
+                default: false,
+            },
+            propIsGrayscale: {
+                type: Boolean,
+                default: false,
+            },
+        },
+        // 属性值改变监听
+        watch: {
+            // 是否灰度
+            propIsGrayscale(value, old_value) {
+                this.common_ent = value ? 'grayscale' : '';
+            },
+        },
+        // 页面被展示
+        created: function () {
+            this.init_config();
+
+            // 页面是否定义导航
+            var value = this.propIsNav ? 100 : 0;
+            this.top = value;
+            this.height_dec = value;
+            // #ifdef H5 || APP
+            this.top = 140;
+            this.height_dec = this.propIsBar ? 280 : 140;
+            // #endif
+
+            // 非首次进入则重新初始化配置接口
+            if (this.is_first == 0) {
+                app.globalData.init_config();
+            }
+
+            // 数据设置
+            var system = app.globalData.get_system_info(null, null, true);
+            var height = app.globalData.window_height_handle(system);
+            var width = app.globalData.window_width_handle(system.windowWidth);
+            this.setData({
+                is_first: 0,
+                system: system,
+                x: width - 65,
+                y: height - 280,
+                // 是否灰度
+                common_ent: this.propIsGrayscale ? 'grayscale' : '',
+            });
+        },
+        methods: {
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    var data_list = app.globalData.get_config('quick_nav') || [];
+                    this.setData({
+                        data_list: data_list,
+                        quick_status: (data_list.length > 0) ? (app.globalData.get_config('config.home_navigation_main_quick_status') || 0) : 0,
+                    });
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 弹层开启
+            quick_open_event(e) {
+                this.setData({
+                    popup_status: true,
+                    data_list: app.globalData.get_config('quick_nav') || [],
+                });
+            },
+
+            // 弹层关闭
+            quick_close_event(e) {
+                this.setData({
+                    popup_status: false,
+                });
+            },
+
+            // 操作事件
+            navigation_event(e) {
+                this.setData({
+                    popup_status: false,
+                });
+                app.globalData.operation_event(e);
+            },
+        },
+    };
+</script>
+<style>
+    /**
+     * 按钮
+     */
+    .quick-movable-container {
+        position: fixed;
+        width: 100%;
+        height: 100%;
+        top: 0;
+        left: 0;
+        background: transparent;
+        pointer-events: none;
+        z-index: 2;
+    }
+
+    .quick-event-submit {
+        pointer-events: auto;
+        width: 50px;
+        height: 50px;
+        border-radius: 50%;
+    }
+
+    .quick-event-submit .image {
+        width: 50px !important;
+        height: 50px !important;
+        display: block;
+        position: relative;
+        z-index: 10;
+        border-radius: 100%;
+        box-shadow: 0 0 6rpx 10rpx rgba(89, 181, 255, 15%);
+        background: #59b5ff;
+    }
+
+    /**
+     * 弹窗
+     */
+    .nav-popup-container {
+        padding: 20rpx 10rpx 0 10rpx;
+        background: #fff;
+    }
+
+    .nav-popup-container .close {
+        position: absolute;
+        top: 20rpx;
+        right: 20rpx;
+        z-index: 2;
+    }
+
+    .nav-popup-content {
+        max-height: 80vh;
+        overflow-y: scroll;
+        overflow-x: hidden;
+        padding-bottom: 20rpx;
+    }
+
+    /**
+     * 内容
+     */
+    .nav-data-list {
+        overflow: hidden;
+        background: #fff;
+    }
+
+    .nav-data-list .item {
+        width: calc(25% - 60rpx);
+        float: left;
+        padding: 30rpx;
+        /* #ifdef H5 */
+        cursor: pointer;
+        /* #endif */
+    }
+
+    .nav-data-list .item-content {
+        border-radius: 50%;
+        padding: 20rpx;
+        text-align: center;
+        margin: 0 auto;
+        -webkit-box-shadow: 0 2px 12px rgb(226 226 226 / 95%);
+        box-shadow: 0 2px 12px rgb(226 226 226 / 95%);
+    }
+
+    .nav-data-list .item-content,
+    .nav-data-list .item .image {
+        width: 70rpx !important;
+        height: 70rpx !important;
+    }
+
+    .nav-data-list .item .item-exposed {
+        padding: 0;
+        -webkit-box-shadow: none;
+        box-shadow: none;
+    }
+
+    .nav-data-list .item .item-exposed,
+    .nav-data-list .item .item-exposed .image {
+        width: 110rpx !important;
+        height: 110rpx !important;
+    }
+
+    .nav-data-list .item .title {
+        margin-top: 10rpx;
+        font-size: 28rpx !important;
+        text-align: center;
+        -o-text-overflow: ellipsis;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+        max-width: 100%;
+    }
+</style>
diff --git a/components/realstore-cart/realstore-cart.vue b/components/realstore-cart/realstore-cart.vue
new file mode 100644
index 0000000..da99bff
--- /dev/null
+++ b/components/realstore-cart/realstore-cart.vue
@@ -0,0 +1,1117 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="!propIsBaseMode && propStatus">
+            <!-- 购物车弹层背景 -->
+            <view v-if="cart_status" class="plugins-realstore-cart-mask wh-auto ht-auto pf" @tap="cart_switch_event"></view>
+            <!-- 购物车列表 -->
+            <view class="plugins-realstore-cart-content pf wh-auto" :style="realstore_cart_content_style">
+                <view class="bottom-line-exclude">
+                    <view v-if="cart_status" class="bg-white border-radius-main pr oh margin-horizontal-main margin-bottom-xxxl">
+                        <block v-if="(cart || null) != null && (cart.data || null) != null && cart.data.length > 0">
+                            <view class="oh br-b padding-vertical-main padding-horizontal-main text-size-xs">
+                                <text class="va-m cr-base">{{$t('goods-category.goods-category.ico62g')}}</text>
+                                <view v-if="(info.buy_use_type_list || null) != null && info.buy_use_type_list.length > 0" class="dis-inline-block margin-left-xl">
+                                    <text class="cr-red">{{$t('realstore-cart.realstore-cart.v437n6')}}</text>
+                                    <view class="va-m dis-inline-block br-green cr-green round padding-horizontal-sm padding-vertical-xs cp" @tap="buy_use_type_event">
+                                        <text class="va-m">{{$t('realstore-cart.realstore-cart.6bmc34')}}({{info.buy_use_type_list[buy_use_type_active_index]['name']}})</text>
+                                        <view class="va-m dis-inline-block margin-left-xs">
+                                            <iconfont name="icon-arrow-bottom" size="24rpx" propClass="cr-green"></iconfont>
+                                        </view>
+                                    </view>
+                                </view>
+                                <view class="fr cp" @tap="cart_all_delete_event">
+                                    <view class="dis-inline-block va-m">
+                                        <uni-icons type="trash" size="24rpx" color="#f00"></uni-icons>
+                                    </view>
+                                    <text class="cr-red va-m margin-left-xs">{{$t('common.clear')}}</text>
+                                </view>
+                            </view>
+                            <scroll-view :scroll-y="true" class="cart-list goods-list">
+                                <view v-for="(goods, index) in cart.data" :key="index" class="item padding-main oh spacing-mb">
+                                    <view :data-index="index" @tap="goods_event">
+                                        <view class="flex-row jc-sb">
+                                            <image :src="goods.images" mode="widthFix" class="goods-img radius br"></image>
+                                            <view class="goods-base flex-1 flex-width padding-left-main flex-col jc-sb">
+                                                <view class="goods-base-content">
+                                                    <view class="goods-title text-size-sm single-text">{{ goods.title }}</view>
+                                                    <view v-if="goods.spec != null" class="text-size-xs cr-grey margin-top-sm">
+                                                        <block v-for="(sv, si) in goods.spec" :key="si">
+                                                            <text v-if="si > 0" class="padding-left-xs padding-right-xs">;</text>
+                                                            <text>{{ sv.value }}</text>
+                                                        </block>
+                                                    </view>
+                                                </view>
+                                                <view class="margin-top-sm">
+                                                    <view class="sales-price text-size-sm single-text dis-inline-block va-m">{{ propCurrencySymbol }}{{ goods.price }}</view>
+                                                    <view class="tc fr flex-row align-c">
+                                                        <view v-if="(goods.stock || 0) > 0" class="cp pr top-sm" :data-index="index" data-type="0" @tap.stop="cart_stock_event">
+                                                            <iconfont name="icon-cart-dec" size="48rpx" :color="theme_color"></iconfont>
+                                                        </view>
+                                                        <view v-if="(goods.stock || 0) > 0" class="buy-number dis-inline-block cr-black text-size-sm padding-left-xs padding-right-xs va-m">{{ goods.stock }} </view>
+                                                        <view class="cp pr top-sm" :data-index="index" data-type="1" @tap.stop="cart_stock_event">
+                                                            <iconfont name="icon-cart-inc" size="48rpx" :color="theme_color"></iconfont>
+                                                        </view>
+                                                    </view>
+                                                </view>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </scroll-view>
+                        </block>
+                        <block v-else>
+                            <component-no-data propStatus="0" :propMsg="$t('realstore-cart.realstore-cart.2dc65q')"></component-no-data>
+                            <view v-if="(info.buy_use_type_list || null) != null && info.buy_use_type_list.length > 0" class="padding-vertical-xxxl margin-vertical-xxxl tc text-size-xs">
+                                <text class="cr-red va-m">{{$t('realstore-cart.realstore-cart.v437n6')}}</text>
+                                <view class="va-m dis-inline-block br-green cr-green round padding-horizontal padding-vertical-xs cp" @tap="buy_use_type_event">
+                                    <text class="va-m">{{$t('realstore-cart.realstore-cart.6bmc34')}}{{info.buy_use_type_list[buy_use_type_active_index]['name']}})</text>
+                                    <view class="va-m dis-inline-block margin-left-xs">
+                                        <iconfont name="icon-arrow-bottom" size="24rpx" propClass="cr-green"></iconfont>
+                                    </view>
+                                </view>
+                            </view>
+                        </block>
+                    </view>
+
+                    <!-- 购物车底部导航 -->
+                    <view class="plugins-realstore-cart-botton-nav pr round oh bg-white">
+                        <view class="wh-auto flex-row jc-sb align-c">
+                            <view class="flex-row align-c flex-1 flex-width padding-bottom-xs">
+                                <view class="cart-icon-total pr cp top-sm padding-left-main" @tap="cart_switch_event">
+                                    <iconfont name="icon-menu-cart" size="36rpx" color="#666"></iconfont>
+                                    <view v-if="(cart || null) != null && (cart.buy_number || 0) > 0" class="badge-icon pa">
+                                        <component-badge :propNumber="cart.buy_number"></component-badge>
+                                    </view>
+                                </view>
+                                <view class="cart-total-price single-text fw-b cr-red padding-left-sm" @tap="cart_switch_event">
+                                    <text class="text-size-xss">{{ propCurrencySymbol }}</text>
+                                    <text class="text-size-lg">{{ (cart || null) == null ? '0.00' : (cart.total_price || '0.00') }}</text>
+                                </view>
+                            </view>
+                            <view class="padding-right-main padding-top-main padding-bottom-sm">
+                                <button v-if="params.source == 'goods'" type="default" size="mini" hover-class="none" @tap="cart_submit_event" :loading="realstore_goods_data_cart_loading" :class="'btn text-size-md round margin-right-main ' + (realstore_goods_data_cart_status ? 'bg-main-pair cr-white' : 'bg-grey-disabled cr-grey')" :disabled="!realstore_goods_data_cart_status">{{ realstore_goods_data_cart_text }}</button>
+                                <button type="default" size="mini" hover-class="none" @tap="buy_submit_event" :loading="settlement_btn_loading" :class="'btn text-size-md round ' + (settlement_btn_status ? 'bg-main cr-white' : 'bg-grey-disabled cr-grey')">{{ settlement_btn_text }}</button>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 下单类型选择弹窗 -->
+            <block v-if="buy_use_type_choice_status">
+                <!-- 下单类型选择弹层背景 -->
+                <view class="plugins-realstore-buy-type-mask wh-auto ht-auto pf"></view>
+                <!-- 下单类型弹窗选择 -->
+                <view class="plugins-realstore-buy-type-choice pf bg-white border-radius-main padding-xxl">
+                    <view class="tc margin-top-xs margin-bottom-xl">
+                        <text class="cr-grey text-size">{{$t('realstore-cart.realstore-cart.d1kk7x')}}</text>
+                        <view v-if="(base.is_tips_user_choice_buy_use_type_mandatory || 0) == 0" class="fr" @tap="buy_use_type_choice_close_event">
+                            <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                        </view>
+                    </view>
+                    <block v-for="(item, index) in buy_use_type_choice_list" :key="index">
+                        <view class="item pr">
+                            <view :class="'item-content pr padding-horizontal border-radius-main item-content-'+item.index" :data-index="item.key" @tap="buy_use_type_choice_event">
+                                <image class="left-icon dis-inline-block va-m" :src="static_url+'buy_use_type/'+item.index+'.png'" mode="aspectFit"></image>
+                                <text class="cr-black text-size-sm va-m margin-left-sm">{{item.name}}</text>
+                                <view class="right-arrow pa top-0 right-xxxxl">
+                                    <iconfont name="icon-arrow-right" size="24rpx" propClass="lh-il" color="#333"></iconfont>
+                                </view>
+                            </view>
+                            <!-- #ifndef H5 -->
+                            <view v-if="item.index == 0" class="scan-item border-radius-main tc pa right-0 top-0" :data-index="index" @tap="search_icon_event">
+                                <iconfont name="icon-scan" size="36rpx" propClass="lh-il va-m" color="#02b3c2"></iconfont>
+                            </view>
+                            <!-- #endif -->
+                        </view>
+                    </block>
+                </view>
+            </block>
+
+            <!-- 商品购买 -->
+            <component-goods-buy ref="goods_buy" :propCurrencySymbol="propCurrencySymbol" v-on:CartSuccessEvent="goods_cart_back_event"></component-goods-buy>
+
+            <!-- 购物车抛物线 -->
+            <component-cart-para-curve ref="cart_para_curve"></component-cart-para-curve>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import base64 from '@/common/js/lib/base64.js';
+    import componentPopup from "@/components/popup/popup";
+    import componentGoodsBuy from '@/components/goods-buy/goods-buy';
+    import componentCartParaCurve from '@/components/cart-para-curve/cart-para-curve';
+    import componentBadge from '@/components/badge/badge';
+    import componentNoData from '@/components/no-data/no-data';
+
+    var static_url = app.globalData.get_static_url('realstore', true);
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: app.globalData.get_theme_color(),
+                static_url: static_url,
+                params: {},
+                is_first: 1,
+                cart_status: false,
+                cart: null,
+                info: null,
+                base: null,
+                source: null,
+                // 结算按钮
+                settlement_btn_loading: true,
+                settlement_btn_status: false,
+                settlement_btn_text: this.$t('realstore-cart.realstore-cart.50lf68'),
+                // 临时操作数据
+                temp_opt_data: null,
+                // 下单类型
+                cache_buy_use_type_active_index_key: 'cache_plugins_realstore_buy_use_type_active_index_',
+                buy_use_type_active_index: 0,
+                // 下单类型选择弹窗
+                buy_use_type_choice_list: [],
+                buy_use_type_choice_status: false,
+                cache_buy_use_type_interval_time_key: 'cache_plugins_realstore_buy_use_type_interval_time_',
+                // 指定商品信息
+                realstore_goods_data: null,
+                // 操作按钮是否加载中
+                realstore_goods_data_cart_loading: true,
+                realstore_goods_data_cart_status: false,
+                realstore_goods_data_cart_type: null,
+                realstore_goods_data_cart_value: null,
+                realstore_goods_data_cart_text: this.$t('realstore-cart.realstore-cart.50lf68'),
+                // 样式
+                realstore_cart_content_style: ''
+            };
+        },
+
+        components: {
+            componentPopup,
+            componentGoodsBuy,
+            componentCartParaCurve,
+            componentBadge,
+            componentNoData
+        },
+        props: {
+            propCurrencySymbol: {
+                type: String,
+                default: app.globalData.currency_symbol(),
+            },
+            propIsBaseMode: {
+                type: Boolean,
+                default: false,
+            },
+            propStatus: {
+                type: Boolean,
+                default: true,
+            },
+            propIndex: {
+                type: Number,
+                default: 100
+            }
+        },
+
+        created: function() {},
+
+        methods: {
+            // 获取数据
+            init(params) {
+                // 非基础模式
+                if(!this.propIsBaseMode) {
+                    // 获取底部菜单高度、如果当前为底部菜单页面则增加底部间距、如果当前使用了原生菜单则不取底部菜单高度
+                    var tabbar_height = (app.globalData.data.is_tabbar_pages == 0 && app.globalData.is_tabbar_pages()) ? (app.globalData.app_tabbar_height_value()*2) : 0;
+                    // 门店信息
+                    var info = params.info || null;
+                    if(info != null && (params.source || null) != null) {
+                        this.setData({
+                            params: params,
+                            info: info,
+                            base: params.base || null,
+                            source: params.source,
+                            realstore_cart_content_style: 'bottom: '+tabbar_height+'rpx',
+                        });
+
+                        // 商品来源
+                        var type_data = this.buy_use_type_data();
+                        if(this.source == 'goods' && (params.realstore_id || null) == null) {
+                            // 调用父级需要重新加载数据
+                            this.$emit('RefreshLoadingEvent', {buy_use_type_active_index: type_data.active_index, buy_use_type_data_index: type_data.data_index, realstore_id: this.info.id});
+                        } else {
+                            // 非系统购物车来源
+                            if(this.source != 'system-cart') {
+                                // 店铺状态正常、是否指定商品、如果不存在操作按钮、不可以加入购物车则置空
+                                var cart_status = false;
+                                var cart_type = '';
+                                var cart_text = '';
+                                var realstore_goods_data = params.realstore_goods_data || null;
+                                if(realstore_goods_data != null && (realstore_goods_data.buy_button || null) != null) {
+                                    // 是否存在错误
+                                    if((realstore_goods_data.buy_button.error || null) != null) {
+                                        cart_text = realstore_goods_data.buy_button.error;
+                                        // 是否展示型、门店存在客服电话则展示电话号码
+                                        if((realstore_goods_data.buy_button.data || null) != null && (realstore_goods_data.buy_button['data'][0] || null) != null && realstore_goods_data.buy_button['data'][0]['type'] == 'show') {
+                                            var cart_value = ((info.service_data || null) == null ? info.contacts_tel : (info.service_data.service_tel || info.contacts_tel)) || null;
+                                            if(cart_value != null) {
+                                                cart_status = true;
+                                                cart_type = 'show';
+                                                cart_text = this.$t('cart.cart.31h34v');
+                                            }
+                                        }
+                                    } else {
+                                        // 匹配是否可以加入购物车操作
+                                        if(realstore_goods_data.buy_button.data.length > 0) {
+                                            var buy_button = realstore_goods_data.buy_button.data;
+                                            var arr = ['cart', 'buy', 'plugins-batchbuy-button-cart', 'plugins-batchbuy-button-buy'];
+                                            for(var i in buy_button) {
+                                                if(arr.indexOf(buy_button[i]['type']) != -1) {
+                                                    cart_status = true;
+                                                    cart_type = buy_button[i]['type'];
+                                                    cart_text = this.$t('realstore-cart.realstore-cart.b27ln3');
+                                                    break;
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                                this.setData({
+                                    realstore_goods_data: realstore_goods_data,
+                                    realstore_goods_data_cart_status: cart_status,
+                                    realstore_goods_data_cart_type: cart_type,
+                                    realstore_goods_data_cart_value: cart_value,
+                                    realstore_goods_data_cart_loading: false,
+                                    realstore_goods_data_cart_text: cart_text,
+                                });
+
+                                // 是否需要弹出下单类型选择
+                                // 打开开关，并且店铺必须存在下单类型
+                                var cache_index = this.get_cache_buy_use_type_active_index();
+                                if((this.base || null) != null && parseInt(this.base.is_tips_user_choice_buy_use_type || 0) == 1 && (cache_index === null || cache_index === '') && (this.info.buy_use_type_list || null) != null && this.info.buy_use_type_list.length > 1 && (this.info.status_info || null) != null && this.info.status_info.status == 1) {
+                                    // 门店、商品是否开启了弹窗提示
+                                    var key = 'is_tips_user_choice_buy_use_type_'+this.params.source+'_detail';
+                                    if(parseInt(this.base[key] || 0) == 1) {
+                                        // 配置的间隔时间（秒）
+                                        var interval_time = parseInt(this.base.tips_user_choice_buy_use_type_interval_time || 0);
+                                        // 缓存的间隔时间（秒）
+                                        var cache_time = parseInt(uni.getStorageSync(this.cache_buy_use_type_interval_time_key+this.info.id) || 0);
+                                        // 当前时间（秒）
+                                        var current_time = Date.parse(new Date()) / 1000;
+                                        // 配置时间为空 或 缓存时间为空 或 当前时间大于缓存+配置时间
+                                        if (interval_time == 0 || (cache_time == 0 || current_time > cache_time+interval_time)) {
+                                            // 倒序处理展示、系统默认在店在最前面，目的是让在店在最后面展示
+                                            var temp = [];
+                                            this.info.buy_use_type_list.forEach((v, i) => {
+                                                v['key'] = i;
+                                                temp.unshift(v);
+                                            });
+                                            this.setData({
+                                                buy_use_type_choice_list: temp,
+                                                buy_use_type_choice_status: true
+                                            });
+                                        }
+                                    }
+                                }
+
+                                // 获取购物车数据
+                                this.get_cart_data();
+                            }
+                        }
+
+                        // 设置下单类型
+                        this.setData({
+                            buy_use_type_active_index: type_data.active_index,
+                        });
+                    }
+                }
+            },
+
+            // 获取购物车数据
+            get_cart_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('cartdata', 'detail', 'realstore'),
+                    method: 'POST',
+                    data: this.request_params_merge(
+                        {
+                            id: this.info.id || 0,
+                        }, 'cart'),
+                    dataType: 'json',
+                    success: (res) => {
+                        if(res.data.code == 0) {
+                            this.setData({
+                                cart: res.data.data,
+                            });
+
+                            // 首次判断是否需要开启购物车
+                            if(this.is_first == 1 && (this.params.is_show_cart || 0) == 1) {
+                                this.cart_event(true);
+                            }
+
+                            // 非首次状态记录
+                            this.setData({
+                                is_first: 0,
+                            });
+
+                            // 购物车获取成功回调
+                            this.$emit('CartDataBackEvent', this.cart);
+                        } else {
+                            app.globalData.showToast(this.$t('realstore-cart.realstore-cart.47h2a0'));
+                        }
+                        
+                        // 结算按钮处理
+                        this.settlement_btn_handle();
+                    },
+                    fail: () => {
+                        // 结算按钮处理
+                        this.settlement_btn_handle();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 结算按钮处理
+            settlement_btn_handle() {
+                // 结算按钮状态处理
+                var btn_status = true;
+                var btn_text = this.$t('goods-category.goods-category.44f1ww');
+                if(this.info.status_info.status != 1) {
+                    btn_status = false;
+                    btn_text = this.info.status_info.msg;
+                } else {
+                    // 购物车是否存在商品
+                    if((this.cart || null) == null || parseInt(this.cart.buy_number || 0) == 0) {
+                        btn_status = false;
+                    } else {
+                        // 起步价
+                        var msg = this.starting_price_handle();
+                        if(msg !== null) {
+                            btn_status = false;
+                            btn_text = msg;
+                        }
+                    }
+                }
+
+                this.setData({
+                    settlement_btn_status: btn_status,
+                    settlement_btn_loading: false,
+                    settlement_btn_text: btn_text,
+                });
+            },
+
+            // 起步价处理
+            starting_price_handle() {
+                var starting_price = parseFloat(this.info.starting_price) || 0;
+                if(starting_price > 0 && (this.cart || null) != null) {
+                    if(parseFloat(this.cart.total_price) < starting_price) {
+                        // 是否限制类型
+                        var limit_type = this.info.starting_price_limit_type_list || [];
+                        if(limit_type.length > 0) {
+                            var type_data = this.buy_use_type_data();
+                            if(limit_type.indexOf(type_data.data_index) != -1 || limit_type.indexOf(type_data.data_index.toString()) != -1) {
+                                return temp['name'] + this.$t('realstore-cart.realstore-cart.miv944')+ this.propCurrencySymbol + starting_price;
+                            }
+                        } else {
+                            return this.$t('realstore-cart.realstore-cart.miv944') + this.propCurrencySymbol + starting_price;
+                        }
+                    }
+                }
+                return null;
+            },
+
+            // 购物车状态切换
+            cart_switch_event(e) {
+                this.setData({
+                    cart_status: !this.cart_status,
+                });
+            },
+
+            // 购物车状态设置
+            cart_event(status) {
+                this.setData({
+                    cart_status: status,
+                });
+            },
+
+            // 加入购物车
+            cart_submit_event(e) {
+                // 是否展示模式、则拨打电话
+                if(this.realstore_goods_data_cart_type == 'show' && (this.realstore_goods_data_cart_value || null) != null) {
+                    app.globalData.call_tel(this.realstore_goods_data_cart_value);
+                    return false;
+                }
+
+                // 门店商品是否正常
+                if((this.realstore_goods_data || null) == null) {
+                    app.globalData.showToast(this.$t('realstore-cart.realstore-cart.20epzm'));
+                    return false;
+                }
+                this.$refs.goods_buy.init(this.realstore_goods_data, {...this.params, ...{buy_event_type: 'cart'}});
+            },
+
+            // 购物车结算
+            buy_submit_event(e) {
+                if(!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+
+                // 门店状态
+                if(!this.is_status_check()) {
+                    return false;
+                }
+
+                // 获取购物车数据
+                var ids = [];
+                if((this.cart || null) != null) {
+                    var temp_data = this.cart.data || [];
+                    for (var i in temp_data) {
+                        ids.push(temp_data[i]['id']);
+                    }
+                }
+                if(ids.length <= 0) {
+                    app.globalData.showToast(this.$t('realstore-cart.realstore-cart.2dc65q'));
+                    return false;
+                }
+
+                // 起步价
+                var msg = this.starting_price_handle();
+                if(msg !== null) {
+                    app.globalData.showToast(this.$t('realstore-cart.realstore-cart.2dc65q'));
+                    return false;
+                }
+
+                // 进入订单确认页面
+                var data = this.request_params_merge(
+                    {
+                        buy_type: 'cart',
+                        ids: ids.join(','),
+                    }, 'buy');
+                app.globalData.url_open('/pages/buy/buy?data=' + encodeURIComponent(base64.encode(JSON.stringify(data))));
+            },
+
+            // 门店状态判断
+            is_status_check() {
+                if((this.info || null) == null) {
+                    app.globalData.showToast(this.$t('realstore-cart.realstore-cart.8tzr7l'));
+                    return false;
+                } else {
+                    if(this.info.status_info.status != 1) {
+                        app.globalData.showToast(this.info.status_info.msg);
+                        return false;
+                    }
+                }
+                return true;
+            },
+
+            // 批量删除操作
+            cart_all_delete_event(e) {
+                var self = this;
+                uni.showModal({
+                    title: self.$t('common.warm_tips'),
+                    content: self.$t('goods-category.goods-category.o6i1w2'),
+                    confirmText: self.$t('common.confirm'),
+                    cancelText: self.$t('common.not_yet'),
+                    success: (result) => {
+                        if(result.confirm) {
+                            self.setData({
+                                temp_opt_data: null,
+                            });
+                            var ids = [];
+                            var temp_data = self.cart.data;
+                            for (var i in temp_data) {
+                                ids.push(temp_data[i]['id']);
+                            }
+                            self.cart_delete(ids.join(','));
+                            self.cart_event(false);
+                        }
+                    },
+                });
+            },
+
+            // 购物车数量操作
+            cart_stock_event(e) {
+                if(!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                var user = app.globalData.get_user_info(this, 'cart_stock_event', e);
+                if(user != false) {
+                    var index = e.currentTarget.dataset.index;
+                    var type = parseInt(e.currentTarget.dataset.type) || 0;
+                    var temp_data = this.cart.data;
+                    var temp_goods = temp_data[index];
+
+                    // 数据操作处理
+                    var opt_number = this.stock_handle(type, temp_goods, 'stock');
+                    if(opt_number === false) {
+                        return false;
+                    }
+
+                    // 数据临时记录
+                    this.setData({
+                        temp_opt_data: null,
+                    });
+
+                    // 操作类型
+                    if(opt_number == 0) {
+                        this.cart_delete(temp_goods['id'], temp_goods.goods_id);
+                    } else {
+                        var number = type == 0 ? parseInt(temp_goods['stock']) - opt_number : opt_number + parseInt(temp_goods['stock']);
+                        this.cart_update(temp_goods['id'], temp_goods['goods_id'], number);
+                    }
+                }
+            },
+
+            // 数量操作处理
+            stock_handle(type, goods, stock_field) {
+                // 加减处理
+                var stock = parseInt(goods[stock_field]) || 0;
+                if(type == 0) {
+                    stock -= 1;
+                } else {
+                    stock += 1;
+                }
+                if(stock < 0) {
+                    stock = 0;
+                }
+        
+                // 数据校验
+                var buy_min_number = parseInt(goods['buy_min_number']) || 1;
+                var buy_max_number = parseInt(goods['buy_max_number']) || 0;
+                var spec_buy_min_number = parseInt(goods['spec_buy_min_number']) || 0;
+                var spec_buy_max_number = parseInt(goods['spec_buy_max_number']) || 0;
+                var inventory = parseInt(goods['inventory']);
+                var inventory_unit = goods['inventory_unit'];
+
+                // 最小起购数量
+                var min = spec_buy_min_number > 0 ? spec_buy_min_number : buy_min_number;
+                if(min > 0) {
+                    if(type == 0) {
+                        if(stock < min) {
+                            stock = 0;
+                        }
+                    } else {
+                        if(stock < min) {
+                            stock = min;
+                        }
+                    }
+                }
+
+                // 最大购买数量
+                var max = spec_buy_max_number > 0 ? spec_buy_max_number : buy_max_number;
+                if(max > 0 && stock > max) {
+                    stock = max;
+                    app.globalData.showToast(this.$t('goods-category.goods-category.z1eh3v') + max + inventory_unit);
+                    return false;
+                }
+
+                // 数量是否改变
+                if(goods[stock_field] == stock) {
+                    app.globalData.showToast(this.$t('goods-category.goods-category.1ox23z'));
+                    return false;
+                }
+
+                // 操作数量
+                var opt_number = 1;
+                if(type == 0) {
+                    if(stock <= 0) {
+                        opt_number = 0;
+                    }
+                } else {
+                    if(stock > goods['buy_number']) {
+                        opt_number = stock - goods['buy_number'];
+                    }
+                }
+                return opt_number;
+            },
+
+            // 购物车添加
+            cart_save(goods_id, stock, spec = '') {
+                uni.request({
+                    url: app.globalData.get_request_url('save', 'cart'),
+                    method: 'POST',
+                    data: {
+                        goods_id: goods_id,
+                        stock: stock,
+                        spec: spec,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if(res.data.code == 0) {
+                            // 购物车操作成功回调
+                            this.cart_opt_success_handle({
+                                type: 'save',
+                                goods_id: goods_id,
+                                stock: stock,
+                            });
+                        } else {
+                            if(app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 购物车更新
+            cart_update(cart_id, goods_id, stock) {
+                uni.request({
+                    url: app.globalData.get_request_url('stock', 'cart'),
+                    method: 'POST',
+                    data: {
+                        id: cart_id,
+                        goods_id: goods_id,
+                        stock: stock,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if(res.data.code == 0) {
+                            // 购物车操作成功回调
+                            this.cart_opt_success_handle({
+                                type: 'update',
+                                cart_id: cart_id,
+                                goods_id: goods_id,
+                                stock: stock,
+                            });
+                        } else {
+                            if(app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            } else {
+                                app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                            }
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 购物车删除
+            cart_delete(cart_id, goods_id = null) {
+                uni.request({
+                    url: app.globalData.get_request_url('delete', 'cart'),
+                    method: 'POST',
+                    data: {
+                        id: cart_id,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if(res.data.code == 0) {
+                            // 购物车操作成功回调
+                            this.cart_opt_success_handle({
+                                type: (goods_id === null) ? 'all-delete' : 'delete',
+                                cart_id: cart_id,
+                                goods_id: goods_id,
+                                stock: 0,
+                            });
+                        } else {
+                            if(app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            } else {
+                                app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                            }
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 扫码事件
+            search_icon_event(e) {
+                this.buy_use_type_choice_event(e);
+                this.search_icon_handle(e);
+            },
+
+            // 搜索icon扫码事件、扫码商品id实现加入购物车
+            search_icon_handle(e) {
+                var user = app.globalData.get_user_info(this, 'search_icon_handle', e);
+                if (user != false) {
+                    // 门店状态
+                    if (!this.is_status_check()) {
+                        return false;
+                    }
+
+                    // 调用扫码
+                    var self = this;
+                    uni.scanCode({
+                        success: function (res) {
+                            uni.showLoading({
+                                title: self.$t('common.processing_in_text'),
+                                mask: true,
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url('scan', 'detail', 'realstore'),
+                                method: 'POST',
+                                data: self.request_params_merge(
+                                    {
+                                        value: res.result,
+                                    }, 'buy'),
+                                dataType: 'json',
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        if (res.data.data.is_error == 1) {
+                                            app.globalData.showToast(res.data.data.is_error_msg);
+                                        } else {
+                                            // 加入购物车
+                                            self.cart_save(res.data.data.goods_id, 1, res.data.data.spec);
+                                        }
+                                    } else {
+                                        if (app.globalData.is_login_check(res.data)) {
+                                            app.globalData.showToast(res.data.msg);
+                                        } else {
+                                            app.globalData.showToast(self.$t('common.sub_error_retry_tips'));
+                                        }
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(self.$t('common.internet_error_tips'));
+                                },
+                            });
+                        },
+                    });
+                }
+            },
+
+            // 商品操作处理，添加，减少，增加数量自动处理
+            goods_opt_handle(type, goods, spec, stock_field, pos = null) {
+                var opt_number = this.stock_handle(type, goods, stock_field);
+                if(opt_number === false) {
+                    return false;
+                }
+
+                // 临时存在操作数据
+                this.setData({
+                    temp_opt_data: {
+                        pos: pos,
+                        goods: goods,
+                        type: type,
+                    },
+                });
+
+                // 为0或减操作则查询
+                var cart_item = this.goods_opt_cart_data(type, goods, spec);
+                
+                // 操作类型
+                if(opt_number == 0) {
+                    if(cart_item == null) {
+                        app.globalData.showToast(this.$t('goods-category.goods-category.x46kbv'));
+                        return false;
+                    }
+                    this.cart_delete(cart_item.id, cart_item.goods_id);
+                } else if(cart_item == null) {
+                    this.cart_save(goods['id'], opt_number, spec);
+                } else {
+                    var number = type == 0 ? parseInt(cart_item['stock']) - opt_number : opt_number + parseInt(cart_item['stock']);
+                    this.cart_update(cart_item.id, goods['id'], number);
+                }
+            },
+
+            // 商品操作获取购物车存在的数据
+            // type 0减少, 1增加
+            // goods 商品数据
+            // spec 操作的商品规格
+            goods_opt_cart_data(type, goods, spec = '') {
+                var cart_item = null;
+                if(type == 0 || (type == 1 && goods['buy_number'] > 0)) {
+                    var cart_data = this.cart.data;
+                    var params_spec = (spec || null) == null || typeof spec != 'object' ? '' : JSON.stringify(spec);
+                    for (var i in cart_data) {
+                        if(goods['id'] == cart_data[i]['goods_id']) {
+                            var cart_spec = (cart_data[i]['spec'] || null) == null || typeof cart_data[i]['spec'] != 'object' ? '' : JSON.stringify(cart_data[i]['spec']);
+                            if(type == 0 || (type == 1 && cart_spec == params_spec)) {
+                                cart_item = cart_data[i];
+                            }
+                            break;
+                        }
+                    }
+                }
+                return cart_item;
+            },
+
+            // 购物车操作成功处理
+            cart_opt_success_handle(params) {
+                // 获取购物车数据
+                this.get_cart_data();
+
+                // 调用父级
+                this.$emit('CartSuccessEvent', params);
+
+                // 执行购物车抛物线
+                this.cart_para_curve_handle();
+            },
+
+            // 购物车抛物线动画
+            cart_para_curve_handle() {
+                if((this.temp_opt_data || null) != null && (this.temp_opt_data.pos || null) != null && (this.temp_opt_data.type || 0) == 1) {
+                    if((this.$refs.cart_para_curve || null) != null) {
+                        this.$refs.cart_para_curve.init(null, this.temp_opt_data.pos, this.temp_opt_data.goods.images, 0);
+                    }
+                }
+            },
+
+            // 使用类型事件
+            buy_use_type_event() {
+                var self = this;
+                uni.showActionSheet({
+                    itemList: this.info.buy_use_type_list.map(function (v) {
+                        return v.name;
+                    }),
+                    success: function (res) {
+                        self.buy_use_type_confirm_handle(self, res.tapIndex);
+                    },
+                });
+            },
+
+            // 下单类型选择事件
+            buy_use_type_choice_event(e) {
+                this.buy_use_type_confirm_handle(this, e.currentTarget.dataset.index);
+                this.setData({
+                    buy_use_type_choice_status: false,
+                });
+                app.globalData.showToast(this.$t('recommend-form.recommend-form.145ci4'), 'success');
+            },
+
+            // 下单类型确认处理
+            buy_use_type_confirm_handle(self, index) {
+                self.setData({
+                    buy_use_type_active_index: index,
+                    settlement_btn_loading: true,
+                    realstore_goods_data_cart_loading: true,
+                });
+                uni.setStorageSync(self.cache_buy_use_type_active_index_key+self.info.id, index);
+
+                // 获取购物车数据、系统购物车来源则不执行
+                if(this.source != 'system-cart') {
+                    self.get_cart_data();
+                }
+
+                // 下单类型切换回调
+                var type_data = this.buy_use_type_data();
+                self.$emit('BuyTypeSwitchEvent', {buy_use_type_active_index: type_data.active_index, buy_use_type_data_index: type_data.data_index, realstore_id: this.info.id});
+            },
+
+            // 下单类型弹窗关闭
+            buy_use_type_choice_close_event(e) {
+                this.setData({
+                    buy_use_type_choice_status: false,
+                });
+                uni.setStorageSync(this.cache_buy_use_type_interval_time_key+this.info.id, Date.parse(new Date()) / 1000);
+            },
+
+            // 获取使用类型数据索引、默认在店0
+            buy_use_type_data() {
+                // 不在店铺设置的类型列表则默认0
+                var data = {
+                    active_index: 0,
+                    data_index: 0,
+                }
+                // 门店信息
+                if((this.info || null) != null) {
+                    // 用户未设置类型则使用默认的
+                    var active_index = this.get_cache_buy_use_type_active_index();
+                    if(active_index !== null && active_index !== '') {
+                        var temp = this.info.buy_use_type_list[active_index] || null;
+                        if(temp != null) {
+                            data['active_index'] = active_index;
+                            data['data_index'] = temp.index;
+                        }
+                    } else {
+                        // 是否默认类型
+                        if(this.info.default_buy_use_type != undefined && this.info.default_buy_use_type != -1) {
+                            // 不在店铺设置的类型列表则默认0
+                            for (var i in this.info.buy_use_type_list) {
+                                if(this.info.buy_use_type_list[i]['index'] == this.info.default_buy_use_type) {
+                                    data['active_index'] = i;
+                                    data['data_index'] = this.info.buy_use_type_list[i]['index'];
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+                return data;
+            },
+
+            // 获取下单类型缓存数据
+            get_cache_buy_use_type_active_index() {
+                return uni.getStorageSync(this.cache_buy_use_type_active_index_key+this.info.id);
+            },
+
+            // 请求参数处理
+            // 默认增加使用类型参数
+            // 下单 buy / 初始化 init / 获取数据 data / 获取购物车 cart
+            request_params_merge(data, type = 'init') {
+                // 用户使用类型
+                if((this.info || null) != null && (this.info.buy_use_type_list || null) != null && this.info.buy_use_type_list.length > 0) {
+                    var type_data = this.buy_use_type_data();
+                    data['buy_use_type_data_index'] = type_data.data_index;
+                }
+
+                // 初始化
+                if(type == 'init' || type == 'buy') {
+                    // 桌码
+                    if((this.params.tablecode_id || null) != null) {
+                        data['tablecode_id'] = this.params.tablecode_id;
+                    }
+                }
+
+                // 初始化、获取数据
+                if(type == 'init' || type == 'data' || type == 'cart') {
+                    // 用户选择的位置
+                    var lng = 0;
+                    var lat = 0;
+                    var user_location = app.globalData.choice_user_location_init();
+                    if((user_location || null) != null) {
+                        lng = user_location.lng || 0;
+                        lat = user_location.lat || 0;
+                    }
+                    data['lng'] = lng;
+                    data['lat'] = lat;
+                }
+
+                // 提交订单
+                if(type == 'buy') {
+                    // 门店id
+                    data['realstore_id'] = this.info.id;
+                }
+
+                return data;
+            },
+
+            // 加入购物车成功回调
+            goods_cart_back_event(e) {
+                this.get_cart_data();
+            },
+
+            // 商品事件
+            goods_event(e) {
+                // 是否可以打开商品页面
+                if(app.globalData.data.is_realstore_forbid_to_goods_detail != 1) {
+                    // 商品数据缓存处理
+                    var goods = this.cart.data[e.currentTarget.dataset.index];
+                    goods['id'] = goods.goods_id;
+                    app.globalData.goods_data_cache_handle(goods.id, goods);
+                    
+                    // 调用公共打开url地址
+                    var type_data = this.buy_use_type_data();
+                    var url = '/pages/goods-detail/goods-detail?id=' + goods.id + '&is_opt_back=1&buy_use_type_data_index=' + type_data.data_index + '&realstore_id=' + this.info.id;
+                    app.globalData.url_open(url);
+                }
+            }
+        }
+    };
+</script>
+<style>
+    .plugins-realstore-cart-mask,
+    .plugins-realstore-buy-type-mask {
+        left: 0;
+        top: 0;
+        background: rgb(0, 0, 0, 0.6);
+        z-index: 5;
+    }
+    .plugins-realstore-cart-content,
+    .plugins-realstore-buy-type-choice {
+        left: 0;
+        bottom: 0;
+        z-index: 6;
+    }
+
+    /**
+     * 购物车列表
+     */
+    .plugins-realstore-cart-content .cart-list {
+        max-height: 60vh;
+    }
+    .plugins-realstore-cart-content .cart-list .goods-img {
+        width: 120rpx;
+        height: 120rpx !important;
+    }
+    .plugins-realstore-cart-content .cart-list .goods-base {
+        width: calc(100% - 140rpx);
+    }
+    .plugins-realstore-cart-content .cart-list .goods-base-content {
+        min-height: 60rpx;
+    }
+    .plugins-realstore-cart-content .cart-list .goods-base .buy-number {
+        min-width: 32rpx;
+    }
+
+    /**
+     * 底部导航
+     */
+    .plugins-realstore-cart-botton-nav {
+        width: calc(100% - 40rpx);
+        left: auto;
+        bottom: 20rpx;
+        z-index: 2;
+        margin-left: 20rpx;
+        box-shadow: 0rpx 4rpx 8rpx 0px rgba(0, 0, 0, 0.16);
+    }
+    .plugins-realstore-cart-botton-nav .cart-icon-total .badge-icon {
+        top: -20rpx;
+        right: -2rpx;
+    }
+    .plugins-realstore-cart-botton-nav .btn {
+        min-width: 160rpx;
+        line-height: 70rpx;
+        height: 70rpx;
+        padding: 0 38rpx;
+        border: 0;
+        /* #ifdef MP-QQ */
+        padding-top: 0;
+        padding-bottom: 0;
+        /* #endif */
+    }
+
+    /**
+     * 弹窗下单类型选择
+     */
+    .plugins-realstore-buy-type-mask {
+        z-index: 10;
+    }
+    .plugins-realstore-buy-type-choice {
+        z-index: 11;
+        width: calc(100% - 240rpx);
+        left: 50%;
+        top: 50%;
+        height: -webkit-max-content;
+        height: max-content;
+        transform: translate(-50%, -50%);
+    }
+    .plugins-realstore-buy-type-choice .item {
+        height: 112rpx;
+        line-height: 112rpx;
+    }
+    .plugins-realstore-buy-type-choice .item .scan-item,
+    .plugins-realstore-buy-type-choice .item-content-0 {
+        background: #E8FFF2;
+    }
+    .plugins-realstore-buy-type-choice .item-content-1 {
+        background: #FFF9DC;
+    }
+    .plugins-realstore-buy-type-choice .item-content-2 {
+        background: #FFE8DC;
+    }
+    .plugins-realstore-buy-type-choice .item-content-3 {
+        background: #EDF9FF;
+    }
+    .plugins-realstore-buy-type-choice .item-content .left-icon {
+        width: 68rpx;
+        height: 68rpx;
+    }
+    .plugins-realstore-buy-type-choice .item:not(:last-child) {
+        margin-bottom: 32rpx;
+    }
+    /* #ifndef H5 */
+    .plugins-realstore-buy-type-choice .item-content-0 {
+        width: calc(100% - 190rpx);
+    }
+    .plugins-realstore-buy-type-choice .item .scan-item {
+        width: 120rpx;
+    }
+    /* #endif */
+</style>
\ No newline at end of file
diff --git a/components/realstore-list/realstore-list.vue b/components/realstore-list/realstore-list.vue
new file mode 100644
index 0000000..6c7a1c4
--- /dev/null
+++ b/components/realstore-list/realstore-list.vue
@@ -0,0 +1,233 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data_list || null) != null && data_list.length > 0" class="plugins-realstore-data-list oh">
+            <block v-for="(item, index) in data_list" :key="index">
+                <view class="item bg-white padding-top-xl padding-bottom-sm padding-horizontal-main border-radius-main pr spacing-mb" :class="item.status_info.type === 2 ? 'opacity' : ''" :data-index="index" :data-value="item.url+propRealstoreDetailQuery" @tap="realstore_item_event">
+                    <view class="base oh flex-row">
+                        <!-- 基础内容 -->
+                        <image :src="item.logo" mode="widthFix" class="logo circle br"></image>
+                        <view class="base-right flex-1 flex-width">
+                            <view class="title fw-b text-size single-text tl">
+                                <text v-if="(item.alias || null) != null" class="va-m title-icon border-radius-sm br-main cr-main text-size-xs padding-horizontal-xs margin-right-xs">{{ item.alias }}</text>
+                                <text class="va-m">{{ item.name }}</text>
+                            </view>
+                            <view class="margin-top-sm padding-top-xs text-size-xs cr-grey">
+                                <view v-if="(item.status_info.time || null) != null" class="flex-row align-c">
+                                    <iconfont name="icon-time pr top-xs cr-grey-9"></iconfont>
+                                    <view :class="'status-icon text-size-xs divider-r padding-left-xs padding-right-sm margin-right-sm ' + (item.status_info.status == 1 ? 'cr-green' : item.status_info.type == 1 ? 'cr-red' : 'cr-grey-c')">
+                                        {{ item.status_info.msg }}
+                                    </view>
+                                    {{ item.status_info.time }}
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="flex-row jc-sb align-c br-t-dashed margin-top-main padding-top-sm">
+                        <!-- 地址 -->
+                        <view class="address-content single-text cr-base margin-left-xs dis-inline-block text-size-xs oh cp tl" :data-value="item.province_name + item.city_name + item.county_name + item.address" @tap.stop="text_copy_event">
+                            <view class="dis-inline-block va-m cr-grey-9 margin-top-sm">
+                                <iconfont name="icon-map-address"></iconfont>
+                            </view>
+                            <text class="va-m margin-left-xs">{{ item.province_name }}{{ item.city_name }}{{ item.county_name }}{{ item.address }}</text>
+                        </view>
+                        <view v-if="(item.distance || null) != null" class="text-size-xs cr-grey-c pa address-distance">{{$t('extraction-address.extraction-address.42v8tv')}}{{ item.distance }}</view>
+                    </view>
+                    <!-- 右侧操作 -->
+                    <view class="icon-list pa">
+                        <view v-if="(item.service_data || null) != null && (item.service_data.service_tel || null) != null" class="icon-item dis-inline-block tc cp" :data-value="item.service_data.service_tel" @tap.stop="tel_event">
+                            <iconfont name="icon-tel" size="30rpx"></iconfont>
+                        </view>
+                        <!-- #ifndef MP-KUAISHOU -->
+                        <view v-if="item.lat != 0 && item.lng != 0" class="icon-item dis-inline-block tc cp" :data-index="index" @tap.stop="address_map_event">
+                            <iconfont name="icon-send" size="30rpx"></iconfont>
+                        </view>
+                        <!-- #endif -->
+                    </view>
+                </view>
+            </block>
+        </view>
+    </view>
+</template>
+<script>
+const app = getApp();
+export default {
+    data() {
+        return {
+            theme_view: app.globalData.get_theme_value_view(),
+            data_list: [],
+            favor_user: [],
+        };
+    },
+    components: {},
+    props: {
+        propIsFavor: {
+            type: Boolean,
+            default: true,
+        },
+        propIsChoice: {
+            type: Boolean,
+            default: false,
+        },
+        propIsChoiceBackType: {
+            type: String,
+            default: '',
+        },
+        propIsOpenRealstoreRedirect: {
+            type: Boolean,
+            default: true,
+        },
+        propData: {
+            type: Object,
+            default: () => {
+                return {};
+            },
+        },
+        propFavorUser: {
+            type: Array,
+            default: () => [],
+        },
+        propRealstoreDetailQuery: {
+            type: String,
+            default: '',
+        },
+    },
+    // 属性值改变监听
+    watch: {
+        // 数据
+        propData(value, old_value) {
+            this.init();
+        }
+    },
+    // 页面被展示
+    created: function (e) {
+        this.init();
+    },
+    methods: {
+        // 初始化
+        init() {
+            var data_list = ((this.propData || null) == null || (this.propData.data || null) == null || this.propData.data.length == 0) ? [] : this.propData.data;
+            this.setData({
+                data_list: data_list,
+                favor_user: this.propFavorUser,
+            });
+            this.data_list_handle();
+        },
+
+        // 数据列表处理
+        data_list_handle() {
+            var temp_data_list = this.data_list;
+            for (var i in temp_data_list) {
+                temp_data_list[i]["is_favor"] = this.favor_user.indexOf(temp_data_list[i]["id"]) == -1 ? 0 : 1;
+            }
+            this.setData({
+                data_list: temp_data_list,
+            });
+        },
+
+        // 收藏事件
+        favor_event(e) {
+            if (!app.globalData.is_single_page_check()) {
+                return false;
+            }
+            var user = app.globalData.get_user_info(this, "favor_event");
+            if (user != false) {
+                var index = e.currentTarget.dataset.index;
+                var info = this.data_list[index];
+                uni.showLoading({
+                    title: this.$t('common.processing_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("reversal", "favor", "realstore"),
+                    method: "POST",
+                    data: {
+                        id: info.id,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            var temp_data = this.data_list;
+                            var temp_favor = this.favor_user;
+                            temp_data[index]["is_favor"] = res.data.data.status;
+                            if (res.data.data.status == 1) {
+                                if (temp_favor.indexOf(info.id) == -1) {
+                                    temp_favor.push(info.id);
+                                }
+                            } else {
+                                if (temp_favor.indexOf(info.id) != -1) {
+                                    temp_favor.splice(index, 1);
+                                }
+                            }
+                            this.setData({
+                                data_list: temp_data,
+                                favor_user: temp_favor,
+                            });
+                            app.globalData.showToast(res.data.msg, "success");
+                        } else {
+                            if (app.globalData.is_login_check(res.data, this, "favor_event")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            }
+        },
+
+        // 电话
+        tel_event(e) {
+            app.globalData.call_tel(e);
+        },
+
+        // 剪切板
+        text_copy_event(e) {
+            app.globalData.text_copy_event(e);
+        },
+
+        // 地图查看
+        address_map_event(e) {
+            var info = this.data_list[e.currentTarget.dataset.index] || {};
+            if (info.lat == 0 || info.lng == 0) {
+                app.globalData.showToast(this.$t('user-order-detail.user-order-detail.i876o3'));
+                return false;
+            }
+            var address = (info.province_name || "") + (info.city_name || "") + (info.county_name || "") + (info.address || "");
+            app.globalData.open_location(info.lng, info.lat, info.name, address);
+        },
+
+        // 门店事件
+        realstore_item_event(e) {
+            // 是否选择模式
+            if(this.propIsChoice) {
+                // 存储门店缓存
+                var data = this.data_list[e.currentTarget.dataset.index];
+                uni.setStorageSync(app.globalData.data.cache_realstore_detail_choice_key, {
+                    data: data,
+                    status: 1
+                });
+
+                // 回调事件
+                this.$emit('onChoiceEvent', data);
+
+                // 选择回调类型
+                switch(this.propIsChoiceBackType) {
+                    // 返回上一个页面
+                    case 'back' :
+                        app.globalData.page_back_prev_event();
+                        break;
+                    // 进入门店详情页面
+                    case 'realstore-detail' :
+                        app.globalData.url_open(data.url, this.propIsOpenRealstoreRedirect);
+                        break;
+                }
+            } else {
+                app.globalData.url_event(e);
+            }
+        }
+    }
+};
+</script>
+<style></style>
diff --git a/components/region-picker/region-picker.vue b/components/region-picker/region-picker.vue
new file mode 100644
index 0000000..9859378
--- /dev/null
+++ b/components/region-picker/region-picker.vue
@@ -0,0 +1,234 @@
+<template>
+    <view :class="theme_view">
+        <component-popup :propShow="propShow" propPosition="bottom" @onclose="popup_close_event">
+            <view class="flex-row jc-sb align-c padding-main">
+                <text class="cr-grey" @tap="popup_close_event">{{$t('common.cancel')}}</text>
+                <text class="cr-blue" @tap="sub_ragion_event">{{$t('common.confirm')}}</text>
+            </view>
+            <view class="g-dp-ctt-wrapper">
+                <picker-view class="picker-view" :indicator-style="indicatorStyle" :value="columns_index[0]" data-column="0" @change="changeHandler">
+                    <picker-view-column>
+                        <view class="g-dp-ctt-wp-item" v-for="(item, a) in columns[0]" :key="item.id">{{ item.name }}</view>
+                    </picker-view-column>
+                </picker-view>
+
+                <picker-view class="picker-view" :indicator-style="indicatorStyle" :value="columns_index[1]" data-column="1" @change="changeHandler">
+                    <picker-view-column>
+                        <view class="g-dp-ctt-wp-item" v-for="(item, b) in columns[1]" :key="item.id">{{ item.name }}</view>
+                    </picker-view-column>
+                </picker-view>
+
+                <picker-view class="picker-view" :indicator-style="indicatorStyle" :value="columns_index[2]" data-column="2" @change="changeHandler">
+                    <picker-view-column>
+                        <view class="g-dp-ctt-wp-item" v-for="(item, c) in columns[2]" :key="item.id">{{ item.name }}</view>
+                    </picker-view-column>
+                </picker-view>
+            </view>
+        </component-popup>
+    </view>
+</template>
+<script>
+const app = getApp();
+import componentPopup from "@/components/popup/popup";
+export default {
+    data() {
+        return {
+            theme_view: app.globalData.get_theme_value_view(),
+            columns: [[0], [0], [0]],
+            // 下标
+            columns_index: [[0], [0], [0]],
+            indicatorStyle: `height: ${uni.upx2px(88)}px;`,
+        };
+    },
+    components: {
+        componentPopup,
+    },
+    props: {
+        propShow: {
+            type: Boolean,
+            default: false,
+        },
+        propProvinceId: {
+            type: [String,Number],
+            default: "",
+        },
+        propCityId: {
+            type: [String,Number],
+            default: "",
+        },
+        propCountyId: {
+            type: [String,Number],
+            default: "",
+        },
+    },
+    watch: {
+        propShow(new_val, old_val) {
+            if (new_val) {
+                this.getProvince();
+            }
+        },
+    },
+    methods: {
+        // 地区初始化匹配索引
+        get_region_value(index, id) {
+            var data = this.columns[index];
+            var data_id = id;
+            var list_index = [];
+            data.forEach((d, i) => {
+                if (d.id == data_id) {
+                    list_index = [i];
+                    return false;
+                }
+            });
+            this.$set(this.columns_index, index, list_index);
+        },
+        // picker 滚动change事件
+        changeHandler(e) {
+            const { dataset, value } = e.target;
+            if (dataset.column == 0) {
+                if (this.columns[0][value[0]].id) {
+                    this.$set(this.columns_index, dataset.column, value);
+                    this.$set(this.columns_index, 1, [0]);
+                    this.$set(this.columns_index, 2, [0]);
+                    this.getCity(this.columns[0][value[0]].id, true);
+                }
+            } else if (dataset.column == 1) {
+                if (this.columns[1][value[0]].id) {
+                    this.$set(this.columns_index, dataset.column, value);
+                    this.$set(this.columns_index, 2, [0]);
+                    this.getArea(this.columns[1][value[0]].id, true);
+                }
+            } else if (dataset.column == 2) {
+                this.$set(this.columns_index, dataset.column, value);
+            }
+        },
+
+        // 获取省
+        getProvince() {
+            uni.request({
+                url: app.globalData.get_request_url("index", "region"),
+                method: "POST",
+                data: {},
+                dataType: "json",
+                success: (res) => {
+                    if (res.data.code == 0) {
+                        var data = res.data.data;
+                        this.$set(this.columns, 0, data);
+                        this.getCity(this.propProvinceId ? this.propProvinceId : data[0].id);
+                        if (this.propProvinceId) {
+                            this.get_region_value(0, this.propProvinceId);
+                        }
+                    } else {
+                        app.globalData.showToast(res.data.msg);
+                    }
+                },
+                fail: () => {
+                    app.globalData.showToast(this.$t('extraction-apply.extraction-apply.fo7y6c'));
+                },
+            });
+        },
+        // 获取市
+        getCity(province_id, init = false) {
+            if (province_id) {
+                uni.request({
+                    url: app.globalData.get_request_url("index", "region"),
+                    method: "POST",
+                    data: {
+                        pid: province_id,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.$set(this.columns, 1, data);
+                            if (init) {
+                                this.getArea(data[0].id);
+                            } else {
+                                this.getArea(this.propCityId ? this.propCityId : data[0].id);
+                                if (this.propCityId) {
+                                    this.get_region_value(1, this.propCityId);
+                                }
+                            }
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('extraction-apply.extraction-apply.b6qg7b'));
+                    },
+                });
+            }
+        },
+        // 获取区
+        getArea(city_id, init = false) {
+            if (city_id) {
+                // 加载loding
+                uni.request({
+                    url: app.globalData.get_request_url("index", "region"),
+                    method: "POST",
+                    data: {
+                        pid: city_id,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.$set(this.columns, 2, data);
+                            if (!init) {
+                                if (this.propCountyId) {
+                                    this.get_region_value(2, this.propCountyId);
+                                }
+                            }
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('extraction-apply.extraction-apply.5s5734'));
+                    },
+                });
+            }
+        },
+        // 关闭按钮
+        popup_close_event(e) {
+            this.$emit("onclose", false);
+        },
+        //提交按钮
+        sub_ragion_event(e) {
+            let province = this.columns[0][this.columns_index[0]];
+            let city = this.columns[1][this.columns_index[1]];
+            let areal = this.columns[2][this.columns_index[2]];
+            this.popup_close_event();
+            this.$emit("call-back", province, city, areal);
+        },
+    },
+};
+</script>
+<style scoped>
+    ::v-deep .popup-bottom {
+        border-radius: 0;
+    }
+    .picker-view {
+        width: 32%; height: 480rpx
+    }
+    .picker-view-column {
+        height: 480rpx !important;
+    }
+    .g-dp-ctt-wrapper {
+        height: 480upx;
+        width: 100%;
+        background-color: #ffffff;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+    .g-dp-ctt-wp-item {
+        width: 100%;
+        height: 88upx;
+        line-height: 88upx;
+        text-align: center;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        font-size: 30upx;
+    }
+</style>
diff --git a/components/search/search.vue b/components/search/search.vue
new file mode 100644
index 0000000..3558b61
--- /dev/null
+++ b/components/search/search.vue
@@ -0,0 +1,262 @@
+<template>
+    <view :class="theme_view">
+        <view :class="'search-content pr round '+propSize" :style="'background:' + propBgColor + ';' + ((propBrColor || null) != null ? 'border:1px solid ' + propBrColor + ';' : '')">
+            <view class="search-icon dis-inline-block pa" :style="'padding:' + propPadding" @tap="search_icon_event">
+                <iconfont :name="propIcon" :color="propIconColor" size="24rpx"></iconfont>
+            </view>
+            <input
+                type="text"
+                confirm-type="search"
+                :class="'input round wh-auto dis-block '+propClass"
+                :placeholder="(propPlaceholder || propPlaceholderValue || this.$t('search.search.660us5'))"
+                :placeholder-class="propPlaceholderClass"
+                :value="propDefaultValue"
+                :focus="propFocus"
+                @input="search_input_value_event"
+                @confirm="search_submit_confirm_event"
+                @focus="search_input_focus_event"
+                @blur="search_input_blur_event"
+                :style="'color:' + propTextColor + ';'"
+            />
+            <button v-if="propIsBtn" class="search-btn pa bg-main" size="mini" type="default" @tap="search_submit_confirm_event">{{$t('common.search')}}</button>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                input_value: '',
+            };
+        },
+        components: {},
+        props: {
+            propUrl: {
+                type: String,
+                default: '/pages/goods-search/goods-search',
+            },
+            propFormName: {
+                type: String,
+                default: 'keywords',
+            },
+            propDefaultValue: {
+                type: String,
+                default: '',
+            },
+            propPlaceholder: {
+                type: String,
+                default: '',
+            },
+            propPlaceholderValue: {
+                type: String,
+                default: '',
+            },
+            propPlaceholderClass: {
+                type: String,
+                default: 'cr-grey-c',
+            },
+            propClass: {
+                type: String,
+                default: '',
+            },
+            propTextColor: {
+                type: String,
+                default: '#666',
+            },
+            propBgColor: {
+                type: String,
+                default: '#fff',
+            },
+            propBrColor: {
+                type: String,
+                default: '',
+            },
+            propIsRequired: {
+                type: Boolean,
+                default: true,
+            },
+            propIsOnEvent: {
+                type: Boolean,
+                default: false,
+            },
+            propIsOnFocusEvent: {
+                type: Boolean,
+                default: false,
+            },
+            propIsOnBlurEvent: {
+                type: Boolean,
+                default: false,
+            },
+            propIsOnInputEvent: {
+                type: Boolean,
+                default: false,
+            },
+            propIcon: {
+                type: String,
+                default: 'icon-search-max',
+            },
+            propIconColor: {
+                type: String,
+                default: '#ccc',
+            },
+            propIsIconOnEvent: {
+                type: Boolean,
+                default: false,
+            },
+            propIsBtn: {
+                type: Boolean,
+                default: false,
+            },
+            propSize: {
+                type: String,
+                default: '',
+            },
+            propFocus: {
+                type: Boolean,
+                default: false,
+            },
+            propPadding: {
+                type: String,
+                default: '16rpx 20rpx 0 20rpx;',
+            },
+        },
+        // 属性值改变监听
+        watch: {
+            // 默认值
+            propDefaultValue(value, old_value) {
+                this.setData({
+                    input_value: value,
+                });
+            }
+        },
+        // 页面被展示
+        created: function () {
+            this.setData({
+                input_value: this.propDefaultValue
+            });
+        },
+        methods: {
+            // 搜索输入事件
+            search_input_value_event(e) {
+                this.setData({
+                    input_value: e.detail.value,
+                });
+                // 是否回调事件
+                if (this.propIsOnInputEvent) {
+                    this.$emit('oninput', e.detail.value);
+                }
+            },
+
+            // 搜索失去焦点事件
+            search_input_blur_event(e) {
+                this.setData({
+                    input_value: e.detail.value,
+                });
+                // 是否回调事件
+                if (this.propIsOnBlurEvent) {
+                    this.$emit('onblur', e.detail.value);
+                }
+            },
+
+            // 搜索获取焦点事件
+            search_input_focus_event(e) {
+                this.setData({
+                    input_value: e.detail.value,
+                });
+                // 是否回调事件
+                if (this.propIsOnFocusEvent) {
+                    this.$emit('onfocus', e.detail.value);
+                }
+            },
+
+            // 搜索确认事件
+            search_submit_confirm_event() {
+                // 是否验证必须要传值
+                var value = this.input_value || this.propPlaceholderValue;
+                if (this.propIsRequired && value === '') {
+                    app.globalData.showToast(this.$t('search.search.ic9b89'));
+                    return false;
+                }
+
+                // 是否回调事件
+                if (this.propIsOnEvent) {
+                    this.$emit('onsearch', value);
+                } else {
+                    // 进入搜索页面
+                    app.globalData.url_open(this.propUrl + '?' + this.propFormName + '=' + value);
+                }
+            },
+
+            // 搜索确认（外部调用直接跳转搜索）
+            search_submit_confirm(value = '') {
+                app.globalData.url_open(this.propUrl + '?' + this.propFormName + '=' + value);
+            },
+
+            // icon事件
+            search_icon_event() {
+                // 是否回调事件
+                if (this.propIsIconOnEvent) {
+                    this.$emit('onicon', {});
+                }
+            },
+        },
+    };
+</script>
+<style scoped>
+    .search-content .search-icon {
+        z-index: 1;
+        left: 0;
+        top: 0;
+        line-height: 28rpx;
+        height: 42rpx;
+    }
+    .search-content .input {
+        box-sizing: border-box;
+        font-size: 24rpx;
+        padding: 0 32rpx 0 64rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        background: transparent;
+    }
+    .search-content .search-btn {
+        width: 106rpx;
+        height: 46rpx;
+        line-height: 46rpx;
+        font-size: 28rpx;
+        border-radius: 30rpx;
+        padding: 0;
+        color: #fff;
+        right: 6rpx;
+        top: 50%;
+        transform: translateY(-50%);
+        z-index: 2;
+    }
+
+    .search-content.sm .search-icon {
+        padding-top: 18rpx;
+    }
+    .search-content.sm .input {
+        height: 60rpx;
+        line-height: 60rpx;
+        font-size: 26rpx;
+    }
+    .search-content.sm .search-btn {
+        height: 50rpx;
+        line-height: 50rpx;
+    }
+
+    .search-content.md .search-icon {
+        padding-top: 22rpx;
+    }
+    .search-content.md .input {
+        height: 66rpx;
+        line-height: 66rpx;
+        font-size: 28rpx;
+    }
+    .search-content.md .search-btn {
+        height: 56rpx;
+        line-height: 56rpx;
+    }
+</style>
diff --git a/components/share-popup/share-popup.vue b/components/share-popup/share-popup.vue
new file mode 100644
index 0000000..ef416ab
--- /dev/null
+++ b/components/share-popup/share-popup.vue
@@ -0,0 +1,299 @@
+<template>
+    <view :class="theme_view">
+        <component-popup :propShow="popup_status" propPosition="bottom" @onclose="popup_close_event">
+            <view class="share-popup bg-white">
+                <view class="close fr oh">
+                    <view class="fr" @tap.stop="popup_close_event">
+                        <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                    </view>
+                </view>
+                <view class="share-popup-content">
+                    <!-- #ifdef MP-ALIPAY -->
+                    <view class="share-items oh cp" @tap="share_base_event">
+                        <image class="image" :src="common_static_url + 'share-user-icon.png'" mode="scaleToFill"></image>
+                        <text class="cr-grey text-size-xs single-text">{{ $t('share-popup.share-popup.h04xiy') }}</text>
+                    </view>
+                    <!-- #endif -->
+                    <!-- #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-TOUTIAO || MP-KUAISHOU -->
+                    <view class="share-items oh cp">
+                        <button class="btn dis-block br-0 ht-auto" type="default" size="mini" open-type="share" hover-class="none" @tap="popup_close_event">
+                            <image class="image" :src="common_static_url + 'share-user-icon.png'" mode="scaleToFill"></image>
+                            <text class="cr-grey text-size-xs single-text">{{ $t('share-popup.share-popup.h04xiy') }}</text>
+                        </button>
+                    </view>
+                    <!-- #endif -->
+                    <!-- #ifdef APP -->
+                    <block v-if="is_app_weixin">
+                        <view class="share-items oh cp" data-scene="WXSceneSession" data-provider="weixin" @tap="share_app_event">
+                            <image class="image" :src="common_static_url + 'share-user-icon.png'" mode="scaleToFill"></image>
+                            <text class="cr-grey text-size-xs single-text">{{ $t('share-popup.share-popup.rhs2c5') }}</text>
+                        </view>
+                        <view class="share-items oh cp" data-scene="WXSceneTimeline" data-provider="weixin" @tap="share_app_event">
+                            <image class="image" :src="common_static_url + 'share-friend-icon.png'" mode="scaleToFill"></image>
+                            <text class="cr-grey text-size-xs single-text">{{ $t('share-popup.share-popup.mv9l10') }}</text>
+                        </view>
+                        <view class="share-items oh cp" data-scene="WXSceneFavorite" data-provider="weixin" @tap="share_app_event">
+                            <image class="image" :src="common_static_url + 'share-favor-icon.png'" mode="scaleToFill"></image>
+                            <text class="cr-grey text-size-xs single-text">{{ $t('share-popup.share-popup.f08y38') }}</text>
+                        </view>
+                    </block>
+                    <block v-if="is_app_qq">
+                        <view class="share-items oh cp" data-provider="qq" @tap="share_app_event">
+                            <image class="image":src="common_static_url + 'share-qq-icon.png'" mode="scaleToFill"></image>
+                            <text class="cr-grey text-size-xs single-text">{{ $t('share-popup.share-popup.1242w9') }}</text>
+                        </view>
+                    </block>
+                    <!-- #endif -->
+                    <!-- #ifdef H5 || APP -->
+                    <view class="share-items oh cp" @tap="share_url_copy_event">
+                        <image class="image" :src="common_static_url + 'share-url-icon.png'" mode="scaleToFill"></image>
+                        <text class="cr-grey text-size-xs single-text">{{ $t('share-popup.share-popup.1oh013') }}</text>
+                    </view>
+                    <!-- #endif -->
+                    <view v-if="is_goods_poster == 1 && (goods_id || 0) != 0" class="share-items oh cp" @tap="poster_event">
+                        <image class="image" :src="common_static_url + 'share-poster-icon.png'" mode="scaleToFill"></image>
+                        <text class="cr-grey text-size-xs single-text">{{ $t('share-popup.share-popup.dcp2qu') }}</text>
+                    </view>
+                </view>
+            </view>
+        </component-popup>
+
+        <!-- 用户基础 -->
+        <component-user-base ref="user_base"></component-user-base>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    var common_static_url = app.globalData.get_static_url('common');
+    import componentPopup from '@/components/popup/popup';
+    import componentUserBase from '@/components/user-base/user-base';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                popup_status: false,
+                type: null,
+                is_goods_poster: 0,
+                goods_id: 0,
+                url: null,
+                images: null,
+                title: null,
+                summary: null,
+                is_app_weixin: true,
+                is_app_qq: true,
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentPopup,
+            componentUserBase,
+        },
+
+        created: function () {},
+
+        methods: {
+            // 初始配置
+            init(config = {}) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                this.setData({
+                    popup_status: config.status == undefined ? true : config.status,
+                    type: config.type == undefined ? null : config.type,
+                    is_goods_poster: config.is_goods_poster || 0,
+                    goods_id: config.goods_id || 0,
+                    goods_id: config.goods_id || 0,
+                    url: config.url || null,
+                    images: config.images || null,
+                    title: config.title || null,
+                    summary: config.summary || null,
+                    share_info: config.share_info || {},
+                });
+
+                // 用户头像和昵称设置提示
+                if ((this.$refs.user_base || null) != null) {
+                    this.$refs.user_base.init('share');
+                }
+
+                // #ifdef APP
+                // app分享通道隔离
+                uni.getProvider({
+                    service: 'share',
+                    success: (result) => {
+                        var provider = result.provider || [];
+                        this.setData({
+                            is_app_weixin: provider.indexOf('weixin') != -1,
+                            is_app_qq: provider.indexOf('qq') != -1,
+                        });
+                    },
+                    fail: (error) => {},
+                });
+                // #endif
+            },
+
+            // 弹层关闭
+            popup_close_event(e) {
+                this.setData({
+                    popup_status: false,
+                });
+            },
+
+            // url链接地址复制分享
+            share_url_copy_event() {
+                var url = app.globalData.get_page_url();
+                // 增加分享标识
+                if(url.indexOf('referrer') == -1) {
+                    var uid = app.globalData.get_user_cache_info('id') || null;
+                    if(uid != null) {
+                        var join = url.indexOf('?') == -1 ? '?' : '&';
+                        url += join+'referrer='+uid;
+                    }
+                }
+                app.globalData.text_copy_event(url);
+            },
+
+            // 基础分享事件
+            share_base_event() {
+                this.setData({
+                    popup_status: false,
+                });
+                uni.pageScrollTo({
+                    scrollTop: 0,
+                    duration: 300,
+                    complete: (res) => {
+                        setTimeout(function () {
+                            uni.showShareMenu();
+                        }, 500);
+                    },
+                });
+            },
+
+            // 商品海报分享
+            poster_event() {
+                var user = app.globalData.get_user_info(this, 'poster_event');
+                if (user != false) {
+                    uni.showLoading({
+                        title: this.$t('detail.detail.6xvl35'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('goodsposter', 'distribution', 'distribution'),
+                        method: 'POST',
+                        data: { goods_id: this.goods_id },
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+
+                            if (res.data.code == 0) {
+                                uni.previewImage({
+                                    current: res.data.data,
+                                    urls: [res.data.data],
+                                });
+                            } else {
+                                if (app.globalData.is_login_check(res.data, this, 'poster_event')) {
+                                    app.globalData.showToast(res.data.msg);
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // app分享
+            share_app_event(e) {
+                // 分享参数
+                var provider = e.currentTarget.dataset.provider;
+                var scene = e.currentTarget.dataset.scene || null;
+                // 分享基础数据
+                var share = app.globalData.share_content_handle(this.share_info || {});
+                var img = this.images || share.img;
+                var url = this.url || share.url;
+                var title = this.title || share.title;
+                var summary = this.summary || share.desc;
+                var type = this.type === null ? ((img || null) == null ? 1 : 0) : this.type;
+                var miniProgram = {};
+
+                // #ifdef APP
+                // 分享到好友，是否走微信小程序，则获取微信小程序原始id
+                if (scene == 'WXSceneSession') {
+                    var weixin_original_id = app.globalData.get_config('config.common_app_mini_weixin_share_original_id') || null;
+                    if (weixin_original_id != null) {
+                        type = 5;
+                        miniProgram = {
+                            id: weixin_original_id,
+                            path: url.split('#')[1],
+                            type: 0,
+                            webUrl: url,
+                        };
+                    }
+                }
+                // #endif
+
+                // 关闭分享弹窗
+                this.setData({
+                    popup_status: false,
+                });
+                // 调用分享组件
+                uni.share({
+                    provider: provider,
+                    scene: scene,
+                    type: type,
+                    href: url,
+                    title: title,
+                    summary: summary,
+                    imageUrl: img,
+                    miniProgram: miniProgram,
+                    success: function (res) {},
+                    fail: function (err) {},
+                });
+            },
+        },
+    };
+</script>
+<style>
+    .share-popup {
+        padding: 20rpx 10rpx 0 10rpx;
+        position: relative;
+    }
+    .share-popup .close {
+        position: absolute;
+        top: 0;
+        right: 0;
+        z-index: 2;
+        padding: 20rpx;
+    }
+    .share-popup-content {
+        padding: 0 20rpx;
+        text-align: left;
+    }
+    .share-popup-content .share-items {
+        padding: 30rpx 0;
+        min-height: 85rpx;
+        display: flex;
+    }
+    .share-popup-content .share-items:not(:first-child) {
+        border-top: 1px solid #f0f0f0;
+    }
+    .share-popup-content .share-items .btn {
+        background: transparent;
+        padding: 0;
+        width: 100%;
+        text-align: left;
+        margin: 0;
+    }
+    .share-popup-content .share-items .image {
+        width: 80rpx;
+        height: 80rpx;
+        vertical-align: middle;
+        margin-right: 20rpx;
+    }
+    .share-popup-content .share-items .single-text {
+        width: calc(100% - 100rpx);
+        line-height: 85rpx;
+    }
+</style>
diff --git a/components/shop-list/shop-list.vue b/components/shop-list/shop-list.vue
new file mode 100644
index 0000000..efb8622
--- /dev/null
+++ b/components/shop-list/shop-list.vue
@@ -0,0 +1,94 @@
+<template>
+	<view>
+		<view v-if="(data_list || null) != null && data_list.length > 0" class="plugins-shop-data-list oh">
+			<block v-for="(item, index) in data_list" :key="index">
+				<view class="item oh border-radius-main padding-vertical-xl padding-horizontal-main bg-white spacing-mb pr">
+					<view class="item-right-icon">
+						<iconfont name="icon-arrow-right" color="#999"></iconfont>
+					</view>
+					<view class="flex-row align-c" :data-value="item.url" @tap="url_event">
+						<image :src="item.logo" mode="aspectFit" class="logo border-radius-xs fl br"></image>
+						<view class="right-content fr flex-1 flex-width">
+							<view class="title single-text">
+								<!-- 认证信息 -->
+								<view
+									v-if="(config.is_enable_auth || 0) == 1 && ((item.auth_type != -1 && (item.auth_type_msg || null) != null) || ((item.bond_status || 0) == 1 && (item.bond_status_msg || null) != null))"
+									class="auth-icon dis-inline-block">
+									<!-- 实名认证 -->
+									<block v-if="item.auth_type != -1 && (item.auth_type_msg || null) != null">
+										<block v-if="item.auth_type == 0">
+											<image :src="config.shop_auth_personal_icon" class="icon va-m" mode="aspectFill"></image>
+										</block>
+										<block v-if="item.auth_type == 1">
+											<image :src="config.shop_auth_company_icon" class="icon va-m" mode="aspectFill"></image>
+										</block>
+									</block>
+									<!-- 保证金认证 -->
+									<block v-if="(item.bond_status || 0) == 1 && (item.bond_status_msg || null) != null">
+										<image :src="config.shop_auth_bond_icon" class="icon va-m" mode="aspectFill"></image>
+									</block>
+								</view>
+								<!-- 标题 -->
+								<text class="fw-b text-size va-m">{{item.name}}</text>
+							</view>
+							<view class="desc multi-text cr-base text-size-xs margin-top-sm padding-top-xs">{{item.describe}}</view>
+						</view>
+					</view>
+				</view>
+			</block>
+		</view>
+	</view>
+</template>
+<script>
+	const app = getApp();
+	export default {
+		data() {
+			return {
+				config: {},
+				data_list: []
+			};
+		},
+		components: {},
+		props: {
+			propConfig: {
+				type: [String, Object],
+				default: null
+			},
+			propData: {
+			    type: Object,
+			    default: () => {
+			        return {};
+			    },
+			}
+		},
+		// 属性值改变监听
+		watch: {
+		    // 数据
+		    propData(value, old_value) {
+		        this.init();
+		    }
+		},
+		// 页面被展示
+		created: function(e) {
+			this.init();
+		},
+		methods: {
+            // 初始化
+            init() {
+                var config = ((this.propConfig || null) == null ? app.globalData.get_config('plugins_base.shop.data') : this.propConfig) || {};
+                var data_list = ((this.propData || null) == null || (this.propData.data || null) == null || this.propData.data.length == 0) ? [] : this.propData.data;
+                this.setData({
+                	config: config,
+                	data_list: data_list
+                });
+            },
+
+			// url事件
+			url_event(e) {
+				app.globalData.url_event(e);
+			}
+		}
+	};
+</script>
+<style>
+</style>
\ No newline at end of file
diff --git a/components/slider/slider.vue b/components/slider/slider.vue
new file mode 100644
index 0000000..5299288
--- /dev/null
+++ b/components/slider/slider.vue
@@ -0,0 +1,158 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="propData.length > 0" class="spacing-mb" :class="(propLeft ? 'swiper-left ' : '') + (propRight ? 'swiper-right ' : '')">
+            <uni-swiper-dot class="uni-swiper-dot-box" :mode="propMode" :dots-styles="dotsStyles" @clickItem="click_item" :info="propData" :current="current">
+                <swiper class="banner oh" :class="' banner-' + (propSize || 'default') + ' ' + propRadius" :autoplay="propData.length > 0" :duration="duration" :circular="circular" @change="swiper_change" :current="swiperDotIndex">
+                    <swiper-item v-for="(item, i) in propData" :key="i">
+                        <image class="image" :src="item.images_url" mode="widthFix" :data-value="item.event_value || item.url" :data-type="item.event_type == undefined ? 1 : item.event_type" @tap="banner_event"> </image>
+                    </swiper-item>
+                </swiper>
+            </uni-swiper-dot>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                circular: true,
+                duration: 500,
+                styleIndex: -1,
+                current: 0,
+                swiperDotIndex: 0,
+                dotsStyles: {},
+            };
+        },
+
+        components: {},
+        props: {
+            propData: {
+                type: Array,
+                default: [],
+            },
+            propSize: {
+                type: String,
+                default: 'default',
+            },
+            propRadius: {
+                type: String,
+                default: 'border-radius-main',
+            },
+            // 指示点 class 调整靠左
+            propLeft: {
+                type: Boolean,
+                default: false,
+            },
+            // 指示点 class 调整靠右
+            propRight: {
+                type: Boolean,
+                default: false,
+            },
+            // 轮播指示点分类 default/dot/round/nav/indexes
+            propMode: {
+                type: String,
+                default: 'dot',
+            },
+            // 未选择指示点背景色
+            propBackgroundColor: {
+                type: String,
+                default: '#fff',
+            },
+            // 指示点宽度 在 mode = nav、mode = indexes 时不生效
+            propWidth: {
+                type: Number,
+                default: 6,
+            },
+            // 指示点距 swiper 底部的高度
+            propBottom: {
+                type: Number,
+                default: 10,
+            },
+            // 未选择指示点边框样式
+            propBorder: {
+                type: String,
+                default: '0',
+            },
+            // 指示点前景色，只在 mode = nav ，mode = indexes 时生效
+            propColor: {
+                type: String,
+                default: '#fff',
+            },
+            // 已选择指示点背景色，在 mode = nav 时不生效
+            propSelectedBackgroundColor: {
+                type: String,
+                default: '' + app.globalData.hex_rgba(app.globalData.get_theme_color(), 0.5),
+            },
+            // 已选择指示点边框样式，在 mode = nav 时不生效
+            propSelectedBorder: {
+                type: String,
+                default: '0',
+            },
+        },
+        beforeMount() {
+            this.dotsStyles = {
+                backgroundColor: this.propBackgroundColor,
+                width: this.propWidth,
+                bottom: this.propBottom,
+                border: this.propBorder,
+                color: this.propColor,
+                selectedBackgroundColor: this.propSelectedBackgroundColor,
+                selectedBorder: this.propSelectedBorder,
+            };
+        },
+        methods: {
+            swiper_change(e) {
+                // 原始index
+                this.current = e.detail.current;
+                // 当前滑index
+                // this.currentIndex = tmpCurrent == this.propData.length - 1 ? 0 : tmpCurrent + 1;
+                this.$emit('changeBanner', this.propData[this.current].bg_color);
+            },
+            click_item(e) {
+                this.swiperDotIndex = e;
+            },
+            banner_event(e) {
+                app.globalData.operation_event(e);
+            },
+        },
+    };
+</script>
+<style>
+    .banner {
+        transform: translateY(0);
+    }
+
+    .banner .image {
+        min-width: 100%;
+    }
+
+    .banner-mini,
+    .banner-mini .image {
+        height: 200rpx !important;
+    }
+
+    .banner-default,
+    .banner-default .image {
+        height: 280rpx !important;
+    }
+
+    .banner-max,
+    .banner-max .image {
+        height: 420rpx !important;
+    }
+
+    /**
+	 * 指示点 左右定位
+	 */
+    .swiper-left /deep/ .uni-swiper__dots-box {
+        justify-content: start;
+        padding-left: 24rpx;
+    }
+
+    .swiper-right /deep/ .uni-swiper__dots-box {
+        justify-content: end;
+        padding-right: 24rpx;
+    }
+</style>
diff --git a/components/status-bar-height/status-bar-height.vue b/components/status-bar-height/status-bar-height.vue
new file mode 100644
index 0000000..4037368
--- /dev/null
+++ b/components/status-bar-height/status-bar-height.vue
@@ -0,0 +1,27 @@
+<template>
+    <view :class="theme_view">
+        <view :style="{ height: statusBarHeight }" class="status-bar-height"></view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                statusBarHeight: 20
+            };
+        },
+        components: {},
+        props: {},
+        mounted() {
+        	this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
+        },
+        methods: {}
+    };
+</script>
+<style>
+    .status-bar-height {
+    	height: 20px;
+    }
+</style>
\ No newline at end of file
diff --git a/components/switch/switch.vue b/components/switch/switch.vue
new file mode 100644
index 0000000..45a40ac
--- /dev/null
+++ b/components/switch/switch.vue
@@ -0,0 +1,186 @@
+<template>
+    <view :class="'switch-container switch-container-size-' + propSize" :style="'background:' + propBgColor + ';border:1px solid ' + propBrColor + ';'">
+        <view class="switch_view">
+            <view :class="'switch-item ' + propCheckedClass + ' ' + (isSwitch ? 'checked_switch' : '')" :style="isSwitch ? `color:${propCheckedColor}` : ''" @click.prevent.stop="changeSwitch(true)" :animation="animationData2">
+                {{ propSwitchList[0] || this.$t('switch.switch.924s7v') }}
+            </view>
+            <view class="switch-item" :class="{ checked_switch: !isSwitch }" :style="!isSwitch ? `color:${propCheckedColor}` : ''" @click.prevent.stop="changeSwitch(false)" :animation="animationData3">
+                {{ propSwitchList[1] || this.$t('switch.switch.g142o6') }}
+            </view>
+        </view>
+        <view class="disabled" v-if="propDisabled"></view>
+        <view :class="'position_view ' + propCheckedBgClass" :animation="animationData1" :style="[{ background: propCheckedBgColor }]"></view>
+    </view>
+</template>
+<script>
+    export default {
+        props: {
+            propSwitchList: {
+                type: Array,
+                default: ['', ''],
+            },
+            propSize: {
+                type: String,
+                default: 'sm',
+            },
+            propDefault: {
+                type: Boolean,
+                default: true,
+            },
+            propIsShowModal: {
+                type: Boolean,
+                default: false,
+            },
+            propDisabled: {
+                type: Boolean,
+                default: false,
+            },
+            propBgColor: {
+                type: String,
+                default: '#fff',
+            },
+            propBrColor: {
+                type: String,
+                default: '#ccc',
+            },
+            propCheckedBgColor: {
+                type: String,
+                default: '#4caf50',
+            },
+            propCheckedBgClass: {
+                type: String,
+                default: '',
+            },
+            propCheckedColor: {
+                type: String,
+                default: '#fff',
+            },
+            propCheckedClass: {
+                type: String,
+                default: '',
+            },
+            propId: {
+                type: null,
+                default: null,
+            },
+        },
+        data() {
+            return {
+                isSwitch: true,
+                initAnimation: {},
+                animationData1: {},
+                animationData2: {},
+                animationData3: {},
+            };
+        },
+        created() {
+            this.initAnimation = uni.createAnimation({
+                duration: 500,
+                timingFunction: 'ease',
+            });
+            this.isSwitch = this.propDefault;
+            this.changeAnimation();
+        },
+        methods: {
+            changeSwitch(isSwitch) {
+                if (isSwitch == this.isSwitch || this.propDisabled) {
+                    return;
+                }
+                if (this.propIsShowModal) {
+                    let index = isSwitch ? 0 : 1;
+                    let text = this.propSwitchList[index];
+                    let self = this;
+                    uni.showModal({
+                        title: self.$t('switch.switch.447u86'),
+                        content: self.$t('switch.switch.8w5ok6', [text]),
+                        success: (res) => {
+                            if (res.confirm) {
+                                self.isSwitch = isSwitch;
+                                self.changeAnimation();
+                                self.callParentEvent(isSwitch);
+                            }
+                        },
+                    });
+                } else {
+                    this.isSwitch = isSwitch;
+                    this.changeAnimation();
+                    this.callParentEvent(isSwitch);
+                }
+            },
+            changeAnimation() {
+                if (this.isSwitch) {
+                    this.animationData1 = this.initAnimation.left(0).width('60%').step().export();
+                    this.animationData2 = this.initAnimation.width('60%').step().export();
+                    this.animationData3 = this.initAnimation.width('40%').step().export();
+                } else {
+                    this.animationData1 = this.initAnimation.left('40%').width('60%').step().export();
+                    this.animationData2 = this.initAnimation.width('40%').step().export();
+                    this.animationData3 = this.initAnimation.width('60%').step().export();
+                }
+            },
+            callParentEvent() {
+                this.$emit('change', this.isSwitch, this.propId, () => {
+                    // 回调方法应用场景：父级组件请求api接口失败调用
+                    this.isSwitch = !this.isSwitch;
+                    this.changeAnimation();
+                });
+            },
+        },
+    };
+</script>
+<style>
+    .switch-container {
+        display: flex;
+        flex-direction: row;
+        width: 180rpx;
+        height: 60rpx;
+        line-height: 60rpx;
+        border-radius: 1000px;
+        position: relative;
+    }
+    .switch-container .switch_view {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        z-index: 1;
+        display: flex;
+        border-radius: 1000px;
+    }
+    .switch-container .switch_view .switch-item {
+        color: #666;
+        font-size: 24rpx;
+        height: 100%;
+        width: 40%;
+        border-radius: 1000px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+    .switch-container .position_view {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 60%;
+        height: 100%;
+        border-radius: 1000px;
+        background: #1aad19;
+    }
+    .switch-container .disabled {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        z-index: 99;
+        background: #fff;
+        opacity: 0.6;
+        border-radius: 1000px;
+    }
+    .switch-container-size-xs {
+        width: 150rpx;
+        height: 45rpx;
+        line-height: 45rpx;
+    }
+</style>
diff --git a/components/time-select/time-select.vue b/components/time-select/time-select.vue
new file mode 100644
index 0000000..66d5269
--- /dev/null
+++ b/components/time-select/time-select.vue
@@ -0,0 +1,554 @@
+<template>
+    <view :class="theme_view">
+        <view class="time-select-content" @tap="_dataOpen">
+            <slot></slot>
+        </view>
+        <view :class="'time-select-popup-mask ' + (propIsShow ? 'time-select-popup-show' : '')" @tap="_maskClose">
+            <view class="time-select-popup-content" @click.stop="_stopFunc">
+                <view class="time-select-close-btn" v-if="propCloseBtn" @tap="_closeBtnClose">×</view>
+                <view class="time-select-title padding-bottom-sm">
+                    <view v-if="(propTitle || null) != null">{{ propTitle || this.$t('buy.buy.q8u066') }}</view>
+                    <view v-if="(propSubhead || null) != null">{{ propSubhead }}</view>
+                </view>
+                <view class="time-select-time-box">
+                    <view class="left_box">
+                        <block v-if="item.timeArr.length > 0" v-for="(item, index) in timeList" :key="item.dateStr">
+                            <view @tap="_changeDay(index)" :class="{ active: item.checked }">
+                                {{ item.name }}
+                            </view>
+                        </block>
+                    </view>
+                    <view class="right_box">
+                        <view v-if="day_active_index == 0 && (propPlaceholder || null) != null" @tap="_changeTime('')" :class="time_active_index === '' ? 'active' : ''">{{ propPlaceholder }}</view>
+                        <block v-for="(item, index) in activeTimeArr" :key="item.time">
+                            <view @tap="_changeTime(index)" :class="{ active: item.checked }"> {{ item.time }}{{ propRangeType ? '-' + item.endtime : '' }} </view>
+                        </block>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    export default {
+        props: {
+            propTitle: {
+                type: String,
+                default: ',',
+            },
+            propPlaceholder: {
+                type: String,
+                default: '',
+            },
+            propSubhead: {
+                type: String,
+                default: '',
+            },
+            propRangeType: {
+                type: Boolean,
+                default: true,
+            },
+            propIsShow: {
+                type: Boolean,
+                default: false,
+            },
+            propMaskHide: {
+                type: Boolean,
+                default: true,
+            },
+            propCloseBtn: {
+                type: Boolean,
+                default: true,
+            },
+            propRangeDay: {
+                type: [Number, String],
+                default: 2,
+            },
+            propRangeStartTime: {
+                type: String,
+                default: '00:00:00',
+            },
+            propRangeEndTime: {
+                type: String,
+                default: '00:00:00',
+            },
+            propDefaultTime: {
+                type: String,
+                default: '',
+            },
+            propIsRoundingTime: {
+                type: Boolean,
+                default: true,
+            },
+            propIntervalTime: {
+                //间隔时间
+                type: [Number, String],
+                default: 30,
+            },
+            propIsNow: {
+                type: Boolean,
+                default: false,
+            },
+            propDayStartIntTime: {
+                //每天开始间隔时间
+                type: [Number, String],
+                default: 0,
+            },
+            propDisabled: {
+                type: [String, Array],
+                default: () => [],
+            },
+        },
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                timeList: [],
+                selectDateStr: '',
+                select_dateStr: '',
+                selectTime: '',
+                selectEndime: '',
+                activeTimeArr: [],
+                day_active_index: 0,
+                time_active_index: '',
+            };
+        },
+        beforeMount() {
+            this._initDay();
+        },
+        watch: {
+            propIsShow: function (val, oldVal) {
+                val && this.timeList.length <= 0 && this._initDay();
+            },
+        },
+        methods: {
+            _stopFunc() {},
+
+            _dataOpen() {
+                this._selectEvent('open');
+            },
+            _closeBtnClose() {
+                if (this.propCloseBtn) {
+                    this._selectEvent('close');
+                }
+            },
+            _maskClose() {
+                if (this.propMaskHide) {
+                    this._selectEvent('close');
+                }
+            },
+            _selectEvent(data = '') {
+                this.$emit('selectEvent', data);
+            },
+            _changeDay(e) {
+                let _ind = e - 0;
+                let { timeList } = this;
+                timeList.forEach((ele) => {
+                    ele.checked = false;
+                });
+                timeList[_ind].checked = true;
+                this.timeList = timeList;
+                this.selectDateStr = timeList[_ind].dateStr;
+                this.select_dateStr = timeList[_ind]._dateStr;
+                this.activeTimeArr = timeList[_ind].timeArr;
+                this.day_active_index = e;
+            },
+            _changeTime(e) {
+                let { activeTimeArr } = this;
+                let timeArr = JSON.parse(JSON.stringify(activeTimeArr));
+                timeArr.forEach((ele) => {
+                    ele.checked = false;
+                });
+                let _data = '';
+                if (e !== '') {
+                    let _ind = e - 0;
+                    timeArr[_ind].checked = true;
+                    this.selectTime = timeArr[_ind].time;
+                    this.selectEndime = timeArr[_ind].endtime;
+                    _data = this._handleData();
+                }
+                this.time_active_index = e;
+                this.activeTimeArr = timeArr;
+                _data['value'] = this.propRangeType ? _data._dateRange : _data._date;
+                this._selectEvent(_data);
+            },
+            _handleData() {
+                let _data = {};
+                let { selectDateStr, select_dateStr, selectTime, selectEndime } = this;
+                _data.date = selectDateStr + ' ' + selectTime;
+                _data._date = select_dateStr + ' ' + selectTime;
+                _data.dateRange = selectDateStr + ' ' + selectTime + '-' + selectEndime;
+                _data._dateRange = select_dateStr + ' ' + selectTime + '-' + selectEndime;
+                _data.timeStamp = new Date(selectDateStr + ' ' + selectTime).getTime();
+                return _data;
+            },
+            _initDay() {
+                let _timeList = [];
+                for (let index = 0; index < this.propRangeDay; index++) {
+                    let _item = {
+                        ...this._getDate(index),
+                    };
+                    _item.timeArr = this._initTime(index);
+                    _timeList.push(_item);
+                }
+
+                if (this.propDefaultTime) {
+                    //存在默认时间
+                    let _day = this.propDefaultTime.split(' ')[0].replace(/-/g, '/');
+                    let _time = this.propDefaultTime.split(' ')[1];
+                    let _flag = true;
+                    for (let index = 0; index < _timeList.length; index++) {
+                        const element = _timeList[index];
+                        element.checked = false;
+                        if (element.timeArr.length > 0 && element.dateStr === _day) {
+                            element.checked = true;
+                            _flag = false;
+                            element.timeArr.forEach((item) => {
+                                if (this._timeRange(item.time + ':00', item.endtime + ':00', _time)) {
+                                    item.checked = true;
+                                    this.time = item.time;
+                                    this.endtime = item.endtime;
+                                }
+                            });
+
+                            this.selectDateStr = element.dateStr;
+                            this.select_dateStr = element._dateStr;
+                            this.activeTimeArr = element.timeArr;
+                        }
+                    }
+                    if (_flag) {
+                        this._setDefaultTime(_timeList);
+                    }
+                } else {
+                    this._setDefaultTime(_timeList);
+                }
+
+                this.timeList = _timeList;
+                this.time_active_index = this.propDefaultTime || '';
+            },
+            _setDefaultTime(list) {
+                for (let index = 0; index < list.length; index++) {
+                    const element = list[index];
+                    if (element.timeArr.length > 0) {
+                        element.checked = true;
+                        //是否默认选择时间
+                        // element.timeArr[0].checked = true;
+                        this.selectDateStr = element.dateStr;
+                        this.select_dateStr = element._dateStr;
+                        this.activeTimeArr = element.timeArr;
+                        break;
+                    }
+                }
+            },
+            _initTime(num) {
+                let _item = [];
+                let TempDisabled = this.propDisabled;
+                let tempIntervalTime = this.propIntervalTime;
+                if (tempIntervalTime <= 0) {
+                    tempIntervalTime = 1;
+                }
+                let TempRangeStartTime = this._timeHandle(this.propRangeStartTime);
+                let TempRangeEndTime = this._timeHandle(this.propRangeEndTime);
+                if (TempRangeEndTime == '00:00:00') {
+                    TempRangeEndTime = '23:59:59';
+                }
+                if (typeof TempDisabled === 'string') {
+                    TempDisabled = TempDisabled ? TempDisabled.split(',') : [];
+                } else if (Array.isArray(TempDisabled)) {
+                    TempDisabled = TempDisabled.map((ele) => {
+                        return ele + '';
+                    });
+                }
+                if (num === 0 && !TempDisabled.includes('0')) {
+                    //今天
+                    let _nowTime = this._roundingTime();
+                    if (this._timeRange(TempRangeStartTime, TempRangeEndTime, _nowTime)) {
+                        //当前时间在营业时间内
+                        return this._forTime(_nowTime, TempRangeEndTime, tempIntervalTime, _nowTime);
+                    } else if (this._toTimeStr(_nowTime) < this._toTimeStr(TempRangeStartTime)) {
+                        //早于今天开始时间
+                        return this._forTime(TempRangeStartTime, TempRangeEndTime, tempIntervalTime, _nowTime);
+                    } else {
+                        return [];
+                    }
+                } else {
+                    //其他日期
+                    if (TempDisabled.includes(num + '')) {
+                        //禁止当前日期了
+                        return [];
+                    }
+
+                    return this._forTime(TempRangeStartTime, TempRangeEndTime, tempIntervalTime);
+                }
+            },
+            _getDate(num) {
+                let date = new Date();
+                let date1 = new Date(date);
+                let weekday = [this.$t('time-select.time-select.8k5rr7'), this.$t('time-select.time-select.17353c'), this.$t('time-select.time-select.40rmq4'), this.$t('time-select.time-select.q35g41'), this.$t('time-select.time-select.v213l8'), this.$t('time-select.time-select.8q3q2x'), this.$t('time-select.time-select.9605m5')];
+                date1.setDate(date.getDate() + num);
+                let name = '',
+                    dateStr = '';
+                name = date1.getMonth() - 0 + 1 + this.$t('detail.detail.zill36') + date1.getDate() + this.$t('time-select.time-select.h7l2xj') + weekday[date1.getDay()] + ')';
+                dateStr = date1.getFullYear() + '/' + (date1.getMonth() - 0 + 1) + '/' + date1.getDate();
+                if (num == 0) {
+                    name = this.$t('time-select.time-select.cq522p') + weekday[date1.getDay()] + ')';
+                } else if (num == 1) {
+                    name = this.$t('time-select.time-select.ub264m') + weekday[date1.getDay()] + ')';
+                }
+                return {
+                    name: name,
+                    dateStr: dateStr,
+                    _dateStr: dateStr.replace(/\//g, '-'),
+                };
+            },
+            _addZero(num) {
+                num = num + '';
+                if (num.length === 1) {
+                    return '0' + num;
+                }
+                return num;
+            },
+            _roundingTime() {
+                let _now = new Date();
+                let _h = _now.getHours() - 0;
+                let _m = _now.getMinutes() - 0;
+                if (_m > 30) {
+                    _m = '00';
+                    _h += 1;
+                } else if (_m - 0 > 0 && _m - 0 < 30) {
+                    _m = 30;
+                }
+                if (this.propIsRoundingTime && !this.propIsNow) {
+                    return _h + ':' + _m + ':00';
+                }
+                return new Date().getHours() + ':' + new Date().getMinutes() + ':00';
+            },
+            _forTime(st, et, it, dt = 0) {
+                let TempDayStartIntTime = this.propDayStartIntTime * 1000 * 60;
+                let _st = this._toTimeStr(st);
+                let _et = this._toTimeStr(et);
+                let _it = it * 1000 * 60;
+                let _list = [];
+                if (_st < _et) {
+                    for (let i = _st + TempDayStartIntTime; i < _et; i += _it) {
+                        _list.push({
+                            time: this._toLocalTime(i),
+                            endtime: this._toLocalTime(i + _it > _et ? _et : i + _it),
+                            checked: false,
+                        });
+                    }
+                } else {
+                    //跨天了
+                    for (let i = dt; i < _et; i += _it) {
+                        _list.push({
+                            time: this._toLocalTime(i),
+                            endtime: this._toLocalTime(i + _it > _et ? _et : i + _it),
+                            checked: false,
+                        });
+                    }
+                    for (let i = _st + TempDayStartIntTime; i < this._toTimeStr('23:59:59'); i += _it) {
+                        _list.push({
+                            time: this._toLocalTime(i),
+                            endtime: this._toLocalTime(i + _it),
+                            checked: false,
+                        });
+                    }
+                }
+                return _list;
+            },
+            _toTimeStr(time = '') {
+                let newTime = time;
+                let itemStr = 0;
+                let timeArr = newTime.split(':');
+                let h = timeArr[0] * 1000 * 60 * 60;
+                let m = timeArr[1] * 1000 * 60;
+                let s = timeArr[2] * 1000;
+                itemStr = h + m + s;
+                return itemStr;
+            },
+            _toLocalTime(v, type = 0) {
+                let h = parseInt((v / 1000 / 60 / 60) % 24);
+                let m = parseInt((v / 1000 / 60) % 60);
+                let s = parseInt((v / 1000) % 60);
+                v = type === 0 ? `${this._addZero(h)}:${this._addZero(m)}` : `${this._addZero(h)}:${this._addZero(m)}:${this._addZero(s)}`;
+                return v;
+            },
+            _timeRange(beginTime, endTime, nowTime) {
+                let strb = beginTime.split(':');
+                let stre = endTime.split(':');
+                let strn = nowTime.split(':');
+
+                let b = new Date();
+                let e = new Date();
+                let n = new Date();
+
+                b.setHours(strb[0]);
+                b.setMinutes(strb[1]);
+                e.setHours(stre[0]);
+                e.setMinutes(stre[1]);
+                n.setHours(strn[0]);
+                n.setMinutes(strn[1]);
+
+                let _b = b.getTime();
+                let _e = e.getTime();
+                let _n = n.getTime();
+
+                if (_b > _e) {
+                    if (_n - _e >= 0 && _n - _b < 0) {
+                        return false;
+                    } else {
+                        return true;
+                    }
+                } else {
+                    if (_n - _b >= 0 && _n - _e < 0) {
+                        return true;
+                    } else {
+                        return false;
+                    }
+                }
+            },
+            _timeHandle(value) {
+                let arr = (value || null) == null ? [] : value.split(':');
+                let len = arr.length;
+                if (len < 3) {
+                    while (len < 3) {
+                        arr.push('00');
+                        len++;
+                    }
+                }
+                return arr.join(':');
+            },
+        },
+    };
+</script>
+<style>
+    .time-select-popup-mask {
+        position: fixed;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        top: 0;
+        background-color: rgba(0, 0, 0, 0.5);
+        opacity: 0;
+        z-index: 100;
+        pointer-events: none;
+    }
+    .time-select-popup-mask view {
+        box-sizing: border-box;
+    }
+    .time-select-popup-content {
+        height: 0rpx;
+        background-color: #fff;
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        padding: 20rpx 10rpx 0 10rpx;
+        transition: height 0.5s;
+        border-top-right-radius: 20rpx;
+        border-top-left-radius: 20rpx;
+        height: auto;
+        z-index: 101;
+        transform: translateY(100%);
+    }
+    .time-select-popup-show {
+        opacity: 1;
+        pointer-events: auto;
+    }
+    .time-select-popup-show .time-select-popup-content {
+        transform: none;
+    }
+    .time-select-popup-mask,
+    .time-select-popup-content {
+        transition: all 0.25s linear;
+    }
+    .time-select-title {
+        text-align: center;
+        font-size: 32rpx;
+        color: #222222;
+        font-weight: 600;
+        position: relative;
+    }
+    .time-select-close-btn {
+        position: absolute;
+        width: 80rpx;
+        line-height: 80rpx;
+        text-align: center;
+        right: 0rpx;
+        padding-right: 15rpx;
+        top: 0;
+        color: #999999;
+        z-index: 99;
+        font-size: 44rpx;
+    }
+    .time-select-title > view:nth-child(2) {
+        font-size: 22rpx;
+        color: #919191;
+        margin-top: 10rpx;
+    }
+    .time-select-time-box {
+        border-top: 1px solid #fbf8fb;
+        background-color: #fbf8fb;
+        height: 660rpx;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+    .time-select-time-box > view {
+        height: 100%;
+        overflow-y: auto;
+        -webkit-overflow-scrolling: touch;
+        font-size: 28rpx;
+    }
+    .time-select-time-box .left_box {
+        color: #919191;
+        width: 45%;
+    }
+    .time-select-time-box .left_box view,
+    .time-select-time-box .right_box view {
+        text-align: center;
+        line-height: 90rpx;
+        position: relative;
+        color: #666;
+    }
+    .time-select-time-box .right_box view::before {
+        content: ' ';
+        width: 80%;
+        position: absolute;
+        left: 10%;
+        bottom: 0;
+        border: 1px dashed #f4f4f4;
+    }
+    .time-select-time-box .right_box view:last-child::before {
+        border: none;
+    }
+    .time-select-time-box .right_box {
+        width: 55%;
+        flex: 1;
+        background-color: #fff;
+        text-align: center;
+    }
+    .time-select-time-box .right_box .active {
+        position: relative;
+        color: #000;
+        font-weight: bold;
+    }
+    .time-select-time-box .left_box .active {
+        background-color: #fff;
+        color: #000;
+    }
+    .time-select-time-box .right_box .active::after {
+        content: ' ';
+        position: absolute;
+        top: 50%;
+        margin-top: -16rpx;
+        right: 50rpx;
+        width: 10rpx;
+        height: 20rpx;
+        border-color: #000;
+        border-style: solid;
+        border-width: 0 4rpx 4rpx 0;
+        transform: rotate(45deg);
+    }
+</style>
diff --git a/components/title/title.vue b/components/title/title.vue
new file mode 100644
index 0000000..bd3479a
--- /dev/null
+++ b/components/title/title.vue
@@ -0,0 +1,62 @@
+<template>
+    <view :class="theme_view">
+        <view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+            <view class="title-left">
+                <text class="text-wrapper" :class="propTitleLeftBorder ? 'title-left-border' : ''" :style="'color:' + propTitleColor + ';'">{{propTitle}}</text>
+                <text class="vice-name margin-left-sm" :style="'color:' + propViceTitleColor + ';'">{{propViceTitle}}</text>
+            </view>
+            <text :data-value="propMoreUrl" @tap="url_event" class="arrow-right padding-right cr-grey cp">{{propMore || this.$t('common.more')}}</text>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+            };
+        },
+        props: {
+            propTitle: {
+                type: String,
+                default: ''
+            },
+            propTitleColor: {
+                type: String,
+                default: '#333'
+            },
+            propViceTitle: {
+                type: String,
+                default: ''
+            },
+            propViceTitleColor: {
+                type: String,
+                default: '#999'
+            },
+            propMore: {
+                type: String,
+                default: '',
+            },
+            propMoreUrl: {
+                type: String,
+                default: ''
+            },
+            propTitleLeftBorder: {
+                type: Boolean,
+                default: true
+            },
+        },
+        methods: {
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        }
+    }
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/components/trn-nav/trn-nav.vue b/components/trn-nav/trn-nav.vue
new file mode 100644
index 0000000..6a83036
--- /dev/null
+++ b/components/trn-nav/trn-nav.vue
@@ -0,0 +1,90 @@
+<template>
+	<view>
+		<view :style="'background:'+(propBackgroundColor || '#fff')+';'+nav_style" :class="'trn-nav-top '+(propEnt || '')">
+            <view v-if="(propTitle || null) != null" class="trn-nav-top-title single-text">{{propTitle}}</view>
+			<slot></slot>
+		</view>
+	</view>
+</template>
+<script>
+    const app = getApp();
+	export default {
+		data() {
+			return {
+                theme_view: app.globalData.get_theme_value_view(),
+				statusbar_height: 0,
+                nav_style: ''
+			}
+		},
+		props: {
+			propTitle: String,
+			propBackgroundColor: String,
+            propEnt: String,
+			propScroll: Number,
+			propHeight: Number,
+		},
+		watch: {
+            // 属性值改变监听
+			propScroll(value, old_value) {
+                // opacity 0 就是完全透明  1是不透明
+                var opacity = 0;
+				if(value >= 70 && value <= 100) {
+					opacity = 0.2;
+				}
+				// 越往下滑动 透明度越低
+				if(value >= 101 && value <= 120) {
+					opacity = 0.3;
+				}
+				if(value >= 120 && value <= 150) {
+					opacity = 0.5;
+				}
+				if(value >= 150 && value <= 170) {
+					opacity = 0.7;
+				}
+				if(value >= 170 && value <= 190) {
+					opacity = 1;
+				}
+				if(value > 190) {
+					opacity = 1;
+				}
+				// 距离小于多少就不显示了
+				if(value <= 70) {
+					opacity = 0;
+				}
+
+                // 设置样式
+                this.nav_style = 'opacity:'+opacity+';';
+                // #ifdef MP
+                this.nav_style += 'height:'+(this.propHeight+this.statusbar_height)+'px;';
+                // #endif
+                // #ifdef H5 || APP
+                this.nav_style += 'height:44px;';
+                // #endif
+			}
+		},
+		methods: {
+		},
+		mounted() {
+            // 获取系统状态栏高度
+			this.statusbar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
+		}
+	}
+</script>
+<style>
+	.trn-nav-top {
+		padding-top: var(--status-bar-height);
+        opacity: 0;
+		width: 100%;
+		z-index: 10;
+		position: fixed;
+        top: 0;
+        left: 0;
+	}
+    .trn-nav-top .trn-nav-top-title {
+        font-size: 36rpx;
+        text-align: left;
+        padding: 12px 250rpx 0 20rpx;
+        height: 37px;
+        color: #000;
+    }
+</style>
diff --git a/components/upload/upload.vue b/components/upload/upload.vue
new file mode 100644
index 0000000..f096d55
--- /dev/null
+++ b/components/upload/upload.vue
@@ -0,0 +1,157 @@
+<template>
+    <view :class="theme_view">
+        <view class="flex-row flex-wrap">
+            <block v-if="propData.length > 0">
+                <view v-for="(item, index) in propData" :key="index" class="item margin-right-lg pr">
+                    <text class="delete-icon pa z-i" @tap="upload_delete_event" :data-index="index">
+                        <iconfont name="icon-bjdz-guanbi" size="36rpx" color="rgba(87,91,102,0.65)"></iconfont>
+                    </text>
+                    <image :src="item" @tap="upload_show_event" :data-index="index" mode="aspectFill" class="img border-radius-main oh"></image>
+                </view>
+            </block>
+            <view v-if="(propData || null) == null || propData.length < propMaxNum" class="img bg-grey-f5 border-radius-main flex-col align-c jc-c" @tap="file_upload_event">
+                <iconfont name="icon-wytw-sctp" size="52rpx" color="#999"></iconfont>
+                <text class="text-size-xs cr-grey-9">{{$t('upload.upload.b33f08')}}</text>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    var common_static_url = app.globalData.get_static_url('common');
+    export default {
+        props: {
+            // 初始图片数据
+            propData: {
+                type: Array,
+                default: () => {
+                    return [];
+                },
+            },
+            // 最大上传数量
+            propMaxNum: {
+                type: [Number, String],
+                default: 3,
+            },
+            // 路径类型 默认common
+            propPathType: {
+                type: String,
+                default: 'common',
+            },
+        },
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                form_images_list: [],
+            };
+        },
+        mounted() {
+            this.setData({
+                form_images_list: this.propData,
+            });
+        },
+        created: function () {},
+
+        methods: {
+            // 采用递归的方式上传多张
+            upload_one_by_one(img_paths, success, fail, count, length) {
+                var self = this;
+                if (self.form_images_list.length <= this.propMaxNum) {
+                    uni.uploadFile({
+                        url: app.globalData.get_request_url('index', 'ueditor'),
+                        filePath: img_paths[count],
+                        name: 'upfile',
+                        formData: {
+                            action: 'uploadimage',
+                            path_type: self.propPathType,
+                        },
+                        success: function (res) {
+                            success++;
+                            if (res.statusCode == 200) {
+                                var data = typeof res.data == 'object' ? res.data : JSON.parse(res.data);
+                                if (data.code == 0 && (data.data.url || null) != null) {
+                                    var list = self.form_images_list;
+                                    list.push(data.data.url);
+                                    self.setData({
+                                        form_images_list: list,
+                                    });
+                                    self.$emit('call-back', self.form_images_list);
+                                } else {
+                                    app.globalData.showToast(data.msg);
+                                }
+                            }
+                        },
+                        fail: function (e) {
+                            fail++;
+                        },
+                        complete: function (e) {
+                            count++;
+
+                            // 下一张
+                            if (count >= length) {
+                                // 上传完毕，作一下提示
+                                //app.showToast('上传成功' + success +'张', 'success');
+                            } else {
+                                // 递归调用，上传下一张
+                                self.upload_one_by_one(img_paths, success, fail, count, length);
+                            }
+                        },
+                    });
+                }
+            },
+
+            // 文件上传
+            file_upload_event(e) {
+                var self = this;
+                uni.chooseImage({
+                    count: self.propMaxNum,
+                    success(res) {
+                        var success = 0;
+                        var fail = 0;
+                        var length = res.tempFilePaths.length;
+                        var count = 0;
+                        self.upload_one_by_one(res.tempFilePaths, success, fail, count, length);
+                    },
+                });
+            },
+
+            // 图片删除
+            upload_delete_event(e) {
+                var self = this;
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('order.order.psi67g'),
+                    success(res) {
+                        if (res.confirm) {
+                            var list = self.form_images_list;
+                            list.splice(e.currentTarget.dataset.index, 1);
+                            self.setData({
+                                form_images_list: list,
+                            });
+                            self.$emit('call-back', self.form_images_list);
+                        }
+                    },
+                });
+            },
+
+            // 上传图片预览
+            upload_show_event(e) {
+                uni.previewImage({
+                    current: this.form_images_list[e.currentTarget.dataset.index],
+                    urls: this.form_images_list,
+                });
+            },
+        },
+    };
+</script>
+<style scoped>
+    .img {
+        width: 120rpx;
+        height: 120rpx;
+    }
+    .delete-icon {
+        top: -16rpx;
+        right: -16rpx;
+    }
+</style>
diff --git a/components/user-base/user-base.vue b/components/user-base/user-base.vue
new file mode 100644
index 0000000..929a830
--- /dev/null
+++ b/components/user-base/user-base.vue
@@ -0,0 +1,485 @@
+<template>
+    <view :class="theme_view">
+        <component-popup :propShow="popup_status" propPosition="bottom" @onclose="popup_close_event">
+            <view :class="'user-base-popup bg-white ' + (propIsGrayscale ? 'grayscale' : '')">
+                <view class="close fr oh">
+                    <view class="fr" @tap.stop="popup_close_event">
+                        <iconfont name="icon-close-o" size="24rpx" color="#999"></iconfont>
+                    </view>
+                </view>
+                <form @submit="form_submit" class="form-container">
+                    <view class="padding-top-sm">
+                        <view class="text-size-md spacing-mb">
+                            <text>{{$t('user-base.user-base.g5663y')}}</text>
+                            <text v-if="(check_field.is_avatar || 0) == 1">{{$t('personal.personal.cw1d8p')}}</text>
+                            <text v-if="(check_field.is_nickname || 0) == 1">、{{$t('personal.personal.gw8br3')}}</text>
+                            <text v-if="(check_field.is_mobile || 0) == 1">、{{$t('login.login.28k91h')}}</text>
+                        </view>
+                        <view class="padding-bottom-main cr-grey-9 br-b">
+                            <text>{{$t('user-base.user-base.913g4e')}}</text>
+                            <text v-if="(check_field.is_avatar || 0) == 1">{{$t('personal.personal.cw1d8p')}}</text>
+                            <text v-if="(check_field.is_nickname || 0) == 1">、{{$t('personal.personal.gw8br3')}}</text>
+                            <text v-if="(check_field.is_mobile || 0) == 1">、{{$t('login.login.28k91h')}}</text>
+                            <text>{{$t('user-base.user-base.yujeaf')}}</text>
+                        </view>
+                        <view v-if="(check_field.is_avatar || 0) == 1" class="form-gorup oh flex-row align-c br-b">
+                            <view class="form-gorup-title text-size-md">{{$t('personal.personal.cw1d8p')}}<text class="form-group-tips-must">*</text></view>
+                            <button class="bg-white br-0 padding-0 margin-left-xxl flex-row jc-sb align-c flex-1" hover-class="none" open-type="chooseAvatar" @chooseavatar="choose_avatar_event" @tap="choose_avatar_event">
+                                <image :src="user_avatar || default_avatar" mode="widthFix" class="circle br user-base-avatar"></image>
+                                <iconfont name="icon-arrow-right" size="24rpx" color="#ccc"></iconfont>
+                            </button>
+                        </view>
+                        <view v-if="(check_field.is_nickname || 0) == 1" class="form-gorup oh flex-row align-c br-b">
+                            <view class="form-gorup-title text-size-md">{{$t('personal.personal.gw8br3')}}<text class="form-group-tips-must">*</text></view>
+                            <view class="user-nickname-container padding-left-xxl">
+                                <input :type="client_value == 'weixin' ? 'nickname': 'text'" maxlength="16" placeholder-class="cr-grey-c" class="cr-base" :placeholder="$t('user-base.user-base.o19lj3')" @input="on_input_nickname" @blur="on_input_nickname" />
+                            </view>
+                        </view>
+                        <view v-if="(check_field.is_mobile || 0) == 1" class="form-gorup oh flex-row align-c br-b">
+                            <view class="form-gorup-title text-size-md">{{$t('login.login.1p7843')}}<text class="form-group-tips-must">*</text></view>
+                            <view class="user-mobile-container padding-left-xxl">
+                                <button class="bg-white br-white text-size-md margin-top-sm padding-left-0 tl" :class="(user_mobile || null) == null ? 'cr-green' : ''" type="default" hover-class="none" open-type="getPhoneNumber" @getphonenumber="confirm_phone_number_event">{{ user_mobile || $t('login.login.8fghjs') }}</button>
+                            </view>
+                        </view>
+
+                        <view class="tc padding-top-xxl">
+                            <button class="sub-btn cr-white text-size" :class="form_submit_disabled_status ? 'bg-grey-d br-grey-d' : 'bg-main br-main'" type="default" form-type="submit" hover-class="none">{{$t('common.save')}}</button>
+                        </view>
+                    </view>
+                </form>
+            </view>
+        </component-popup>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentPopup from '@/components/popup/popup';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                client_value: app.globalData.application_client_type(),
+                default_avatar: app.globalData.data.default_user_head_src,
+                cache_key: app.globalData.data.cache_user_base_personal_interval_time_key,
+                popup_status: false,
+                user: {},
+                check_field: {},
+                user_avatar: '',
+                nickname: '',
+                user_mobile: '',
+                pages: [],
+                client: [],
+                interval_time: 0,
+                is_weixin_force: false,
+                form_submit_disabled_status: true,
+                back_object: null,
+                back_method: null,
+                back_params: null
+            };
+        },
+
+        components: {
+            componentPopup,
+        },
+        props: {
+            propIsGrayscale: {
+                type: Boolean,
+                default: false,
+            },
+        },
+
+        created: function () {
+            // 初始化配置
+            this.init_config();
+        },
+
+        methods: {
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    this.setData({
+                        pages: app.globalData.get_config('config.common_app_user_base_popup_pages', []),
+                        client: app.globalData.get_config('config.common_app_user_base_popup_client', []),
+                        interval_time: parseInt(app.globalData.get_config('config.common_app_user_base_popup_interval_time', 1800)),
+                        is_weixin_force: this.client_value == 'weixin' && parseInt(app.globalData.get_config('config.common_app_is_weixin_force_user_base', 0)) == 1,
+                    });
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 初始配置
+            init(params = {}) {
+                // 初始化配置
+                this.init_config(true);
+
+                // 未指定类型则自动匹配页面
+                var type = '';
+                if((params.type || null) == null) {
+                    var page = '/'+app.globalData.current_page(false);
+                    var obj = {
+                        'index': '/pages/index/index',
+                        'goods-category': '/pages/goods-category/goods-category',
+                        'cart': '/pages/cart/cart',
+                        'user': '/pages/user/user',
+                    };
+                    var index = Object.values(obj).indexOf(page);
+                    if(index != -1) {
+                        type = Object.keys(obj)[index];
+                    }
+                } else {
+                    type = params.type;
+                }
+                if((type || null) != null) {
+                    // 是否需要展示弹窗提示
+                    if (!this.popup_status && this.pages.indexOf(type) != -1 && this.client.indexOf(this.client_value) != -1) {
+                        // 当前缓存用户
+                        var user = app.globalData.get_user_cache_info() || null;
+                        // 需要填写字段数据
+                        var result = this.form_write_field_check_data(user);
+                        // 非微信 或者 微信小程序是否强制填写基础信息、强制则不验证时间
+                        if(this.client_value != 'weixin' || !this.is_weixin_force) {
+                            // 间隔时间
+                            var cache_time = parseInt(uni.getStorageSync(this.cache_key) || 0);
+                            var current_time = Date.parse(new Date()) / 1000;
+                            if (result.popup_status && !this.popup_status && cache_time > 0 && current_time < cache_time + parseInt(this.interval_time)) {
+                                result['popup_status'] = false;
+                            }
+                        }
+
+                        // 1秒后再提示用户填写信息
+                        clearTimeout(this.timer);
+                        var self = this;
+                        var timer = setTimeout(function () {
+                            self.setData({
+                                ...result,
+                                ...{
+                                    back_object: params.object || null,
+                                    back_method: params.method || null,
+                                    back_params: params.params || params,
+                                }
+                            });
+                        }, 500);
+                        this.setData({
+                            timer: timer
+                        });
+                    }
+                }
+            },
+
+            // 表单需要填写的验证数据
+            form_write_field_check_data(user, is_set_data = false) {
+                var check_field = {
+                    is_nickname: 0,
+                    is_avatar: 0,
+                    is_mobile: 0,
+                };
+                if((user || null) != null) {
+                    // 默认昵称则赋空值
+                    var arr = [this.$t('user-base.user-base.8u9on2'), this.$t('user-base.user-base.t8i9l4'), this.$t('user-base.user-base.0imw74'), this.$t('user-base.user-base.27q5af'), this.$t('user-base.user-base.211pk4'), this.$t('user-base.user-base.5x8o43'), 'WeChat User', 'Usuarios de Wechat'];
+                    if ((user.nickname || null) == null || arr.indexOf(user.nickname) != -1) {
+                        user['nickname'] = '';
+                        check_field['is_nickname'] = 1;
+                    }
+                    // 头像是默认则置为空
+                    if ((user.avatar || null) == null || user.avatar.indexOf('default-user-avatar') != -1) {
+                        user['avatar'] = '';
+                        check_field['is_avatar'] = 1;
+                    }
+                    // 手机
+                    if(parseInt(user.is_mandatory_bind_mobile || 0) == 1 && (user.mobile || null) == null) {
+                        var onekey_bind_mobile = app.globalData.get_config('config.common_user_onekey_bind_mobile_list', []);
+                        if(onekey_bind_mobile.length > 0) {
+                            if(onekey_bind_mobile.indexOf(this.client_value) != -1) {
+                                user['mobile'] = '';
+                                check_field['is_mobile'] = 1;
+                            }
+                        }
+                    }
+                }
+                var result = {
+                    check_field: check_field,
+                    user: user,
+                    popup_status: check_field.is_nickname + check_field.is_avatar + check_field.is_mobile > 0,
+                };
+                // 是否设置数据
+                if(is_set_data) {
+                    this.setData(result);
+                }
+                return result;
+            },
+
+            // 基础信息填写打开
+            user_base_open(object, method, params) {
+                clearTimeout(this.timer);
+                this.setData({
+                    popup_status: true,
+                    back_object: object,
+                    back_method: method,
+                    back_params: params
+                });
+            },
+
+            // 弹层关闭
+            popup_close_event(e) {
+                this.setData({
+                    popup_status: false,
+                });
+                uni.setStorageSync(this.cache_key, Date.parse(new Date()) / 1000);
+            },
+
+            // 头像事件
+            choose_avatar_event(e) {
+                var self = this;
+                if (this.client_value == 'weixin') {
+                    self.upload_handle(e.detail.avatarUrl);
+                } else {
+                    uni.chooseImage({
+                        count: 1,
+                        success(res) {
+                            if (res.tempFilePaths.length > 0) {
+                                self.upload_handle(res.tempFilePaths[0]);
+                            }
+                        },
+                    });
+                }
+            },
+
+            // 上传处理
+            upload_handle(image) {
+                var self = this;
+                uni.uploadFile({
+                    url: app.globalData.get_request_url('useravatarupload', 'personal'),
+                    filePath: image,
+                    name: 'file',
+                    formData: {},
+                    success: function (res) {
+                        if (res.statusCode == 200) {
+                            var data = typeof res.data == 'object' ? res.data : JSON.parse(res.data);
+                            if (data.code == 0) {
+                                self.setData({
+                                    user_avatar: data.data
+                                });
+                                // 提交按钮状态处理
+                                self.submit_button_status_handle();
+                            } else {
+                                app.globalData.showToast(data.msg);
+                            }
+                        }
+                    },
+                });
+            },
+
+            // 输入框值监听
+            on_input_nickname(e) {
+                this.setData({
+                    nickname: e.detail.value || '',
+                });
+                // 提交按钮状态处理
+                this.submit_button_status_handle();
+            },
+
+            // 一键获取手机号码
+            confirm_phone_number_event(e) {
+                var encrypted_data = e.detail.encryptedData || null;
+                var iv = e.detail.iv || null;
+                var code = e.detail.code || null;
+                if ((encrypted_data != null && iv != null) || code != null) {
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    var user = this.user || {};
+                    var data = {
+                        encrypted_data: encrypted_data,
+                        iv: iv,
+                        code: code,
+                        openid: user[this.client_value + '_openid'] || '',
+                    };
+                    var field_unionid = this.client_value + '_unionid';
+                    data[field_unionid] = user[field_unionid] || '';
+                    uni.request({
+                        url: app.globalData.get_request_url('onekeyusermobiledecrypt', 'user'),
+                        method: 'POST',
+                        data: data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                this.setData({
+                                    user_mobile: res.data.data
+                                });
+                                // 提交按钮状态处理
+                                this.submit_button_status_handle();
+                            } else {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                } else {
+                    var msg = e.errmsg || e.errMsg || e.detail.errmsg || e.detail.errMsg || null;
+                    if (msg != null) {
+                        app.globalData.showToast(msg);
+                    }
+                }
+            },
+
+            // 提交按钮状态处理
+            submit_button_status_handle() {
+                var status = false;
+                // 头像
+                if(parseInt(this.check_field.is_avatar || 0) == 1 && (this.user_avatar || null) == null) {
+                    status = true;
+                }
+                // 昵称
+                if(!status && parseInt(this.check_field.is_nickname || 0) == 1 && (this.nickname || null) == null) {
+                    status = true;
+                }
+                // 手机
+                if(!status && parseInt(this.check_field.is_mobile || 0) == 1 && (this.user_mobile || null) == null) {
+                    status = true;
+                }
+                this.setData({
+                    form_submit_disabled_status: status,
+                });
+            },
+
+            // 数据提交
+            form_submit(e) {
+                // 验证数据项
+                var validation = [];
+                if (parseInt(this.check_field.is_avatar || 0) == 1) {
+                    validation.push({
+                        fields: 'avatar',
+                        msg: this.$t('user-base.user-base.gzc3y4'),
+                    });
+                }
+                if (parseInt(this.check_field.is_nickname || 0) == 1) {
+                    validation.push({
+                        fields: 'nickname',
+                        msg: this.$t('user-base.user-base.lro9u7'),
+                    });
+                }
+                if (parseInt(this.check_field.is_mobile || 0) == 1) {
+                    validation.push({
+                        fields: 'mobile',
+                        msg: this.$t('login.login.tghjer'),
+                    });
+                }
+                // 数据
+                var data = {
+                    nickname: this.nickname || '',
+                    avatar: this.user_avatar || '',
+                    mobile: this.user_mobile || ''
+                };
+                // 当前用户是否已经存在
+                var user = this.user || {};
+                if((user.id || null) == null) {
+                    data['openid'] = user[this.client_value + '_openid'] || '';
+                    data['province'] = user.province || '';
+                    data['city'] = user.city || '';
+                    data['gender'] = user.gender || 0;
+                    var field_unionid = this.client_value + '_unionid';
+                    data[field_unionid] = user[field_unionid] || '';
+                    // 接口地址
+                    var url = app.globalData.get_request_url('userbasereg', 'user');
+                } else {
+                    // 存在用户则先存储用户信息
+                    uni.setStorageSync(app.globalData.data.cache_user_info_key, user);
+                    // 验证数据项
+                    if (parseInt(this.check_field.is_avatar || 0) != 1) {
+                        delete data['avatar'];
+                    }
+                    if (parseInt(this.check_field.is_nickname || 0) != 1) {
+                        delete data['nickname'];
+                    }
+                    if (parseInt(this.check_field.is_mobile || 0) != 1) {
+                        delete data['mobile'];
+                    }
+                    // 接口地址
+                    var url = app.globalData.get_request_url('save', 'personal');
+                }
+                if (app.globalData.fields_check(data, validation)) {
+                    // 数据保存
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    uni.request({
+                        url: url,
+                        method: 'POST',
+                        data: data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                uni.setStorageSync(app.globalData.data.cache_user_info_key, res.data.data);
+                                app.globalData.showToast(res.data.msg, 'success');
+                                this.setData({
+                                    popup_status: false,
+                                });
+                                // 回调
+                                if (typeof this.back_object === 'object' && (this.back_method || null) != null) {
+                                    this.back_object[this.back_method](this.back_params);
+                                }
+                            } else {
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            }
+        }
+    };
+</script>
+<style scoped>
+    .user-base-popup {
+        padding: 36rpx;
+        position: relative;
+    }
+    .user-base-popup .close {
+        position: absolute;
+        top: 36rpx;
+        right: 36rpx;
+        z-index: 2;
+    }
+    .user-base-avatar {
+        width: 80rpx;
+        height: 80rpx !important;
+    }
+    .user-base-popup .form-gorup-title {
+        line-height: 70rpx;
+        margin-bottom: 0;
+    }
+    .user-base-popup .user-nickname-container,
+    .user-base-popup .user-mobile-container {
+        width: calc(100% - 120rpx);
+    }
+    .form-container .form-gorup {
+        padding: 24rpx 0;
+        border-radius: 0;
+    }
+    .form-container .form-gorup-title {
+        font-weight: 400;
+    }
+    .sub-btn {
+        width: 336rpx;
+        height: 84rpx;
+        line-height: 84rpx;
+        padding: 0;
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 12rpx;
+    }
+</style>
diff --git a/components/wholesale-rules/wholesale-rules.vue b/components/wholesale-rules/wholesale-rules.vue
new file mode 100644
index 0000000..42256f3
--- /dev/null
+++ b/components/wholesale-rules/wholesale-rules.vue
@@ -0,0 +1,169 @@
+<template>
+    <view :class="theme_view">
+        <!-- 批发规则展示 -->
+        <view v-if="(data || null) != null" class="plugins-wholesale-container scroll-view-horizontal" :class="propIsAlone ? 'is-alone' : ''">
+            <scroll-view scroll-x="true">
+                <view :class="'plugins-wholesale-container-rules-view wh-auto padding-main item-number-'+data.rules.length" @tap="popup_wholesale_event">
+                    <view v-for="(item, index) in data.rules" :key="index" class="item">
+                        <view class="price">
+                            <text v-if="item.arr.type == 1" class="cr-red text-size-xs">{{propCurrencySymbol}}</text>
+                            <text class="sales-price text-size-lg">{{item.range_val}}</text>
+                            <text v-if="item.arr.type == 0" class="unit text-size-xsss">{{item.arr.unit}}</text>
+                        </view>
+                        <view class="msg text-size-sm cr-base margin-top-xs cr-black">{{item.range_msg}}</view>
+                    </view>
+                </view>
+            </scroll-view>
+        </view>
+
+        <!-- 批发规则弹层 -->
+        <block v-if="propIsPopup">
+            <component-popup :propShow="popup_status" propPosition="bottom" @onclose="popup_wholesale_close_event">
+                <view class="padding-horizontal-main padding-top-main bg-white">
+                    <view class="close oh">
+                        <view class="fr" @tap.stop="popup_wholesale_close_event">
+                            <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                        </view>
+                    </view>
+                    <view class="plugins-wholesale-container-rules">
+                        <block v-if="(data || null) != null">
+                            <view class="oh flex-row flex-wrap">
+                                <block v-for="(item, index) in data.rules" :key="index">
+                                    <view class="item flex-width-half margin-bottom">
+                                        <view class="item-content padding-main bg-base border-radius-main oh tc">
+                                            <text class="cr-base">{{ item.range_msg }}</text>
+                                            <text v-if="item.arr.type == 1" class="cr-main text-size-xs">{{propCurrencySymbol}}</text>
+                                            <text class="cr-main fw-b text-size-lg">{{ item.range_val }}</text>
+                                            <text v-if="item.arr.type == 0" class="cr-grey text-size-xsss">{{ item.arr.unit }}</text>
+                                        </view>
+                                    </view>
+                                </block>
+                            </view>
+                        </block>
+                        <block v-else>
+                            <view class="cr-grey tc padding-top-xl padding-bottom-xxxl">{{$t('goods-detail.goods-detail.m3op38')}}</view>
+                        </block>
+                    </view>
+                </view>
+            </component-popup>
+        </block>
+    </view>
+</template>
+<script>
+const app = getApp();
+import componentPopup from "@/components/popup/popup";
+export default {
+    data() {
+        return {
+            theme_view: app.globalData.get_theme_value_view(),
+            data: null,
+            popup_status: false,
+        };
+    },
+    components: {
+        componentPopup
+    },
+    props: {
+        // 是否展示弹窗
+        propIsPopup: {
+            type: Boolean,
+            default: false,
+        },
+        // 价格符号
+        propCurrencySymbol: {
+            type: String,
+            default: app.globalData.currency_symbol(),
+        },
+        // 列表数据
+        propData: {
+            type: [Array, Object, String],
+            default: {},
+        },
+        // 是否独立行
+        propIsAlone: {
+            type: Boolean,
+            default: false,
+        },
+    },
+    // 属性值改变监听
+    watch: {
+        // 数据
+        propData(value, old_value) {
+            this.setData({
+                data: value,
+            });
+        }
+    },
+
+    // 页面被展示
+    created: function () {
+        this.setData({
+            data: this.propData,
+        });
+    },
+
+    methods: {
+        // 批发开启弹层
+        popup_wholesale_event(e) {
+            if(this.propIsPopup) {
+                this.setData({
+                    popup_status: true,
+                });
+            }
+        },
+        
+        // 批发弹层关闭
+        popup_wholesale_close_event(e) {
+            this.setData({
+                popup_status: false,
+            });
+        },
+    }
+}
+</script>
+<style scoped>
+    /**
+     * 批发 - 插件
+     */
+    .plugins-wholesale-container.is-alone {
+        background: linear-gradient(to bottom, #fafafa 0%, #fff 100%);
+    }
+    .plugins-wholesale-container-rules-view {
+        display: flex;
+        justify-content: flex-start;
+        gap: 60rpx;
+    }
+    .plugins-wholesale-container-rules-view.item-number-2,
+    .plugins-wholesale-container-rules-view.item-number-3,
+    .plugins-wholesale-container-rules-view.item-number-4 {
+        justify-content: space-around;
+        gap: 0;
+    }
+    .plugins-wholesale-container-rules-view .item {
+        margin-bottom: 0 !important;
+    }
+    .plugins-wholesale-container-rules-view .item .price > .unit {
+        color: #969696;
+        margin-left: 5rpx;
+    }
+    .plugins-wholesale-container-rules {
+        max-height: 50vh;
+        overflow-y: scroll;
+        overflow-x: hidden;
+        margin-top: 20rpx;
+    }
+    .plugins-wholesale-container-rules .item:nth-child(2n)>.item-content {
+        margin-left: 10rpx;
+    }
+    .plugins-wholesale-container-rules .item:nth-child(2n+1)>.item-content {
+        margin-right: 10rpx;
+    }
+    .plugins-wholesale-container-rules .spec-tips {
+        color: #ffbf00;
+        border: 1px solid #333;
+        background: #333;
+        padding: 2rpx 10rpx;
+        top: 22rpx;
+        left: 20rpx;
+    }
+</style>
\ No newline at end of file
diff --git a/i18n_tools.config.js b/i18n_tools.config.js
new file mode 100644
index 0000000..d8fbdb9
--- /dev/null
+++ b/i18n_tools.config.js
@@ -0,0 +1,12 @@
+
+module.exports = {
+    entry: [''], // 提取、还原、遗漏扫描入口文件夹，可以配置多个,默认是 src
+    outDir: 'lang', // i18n 输出文件夹 默认是 src/locales
+    outShow: 2, //输出文件展示结构 1 扁平化结构 2树级结构 默认扁平化
+    exclude: ['lang'], // 不提取的文件夹, 默认是 ['src/locales']
+    extensions: ['.vue', '.js', '.ts'], // 提取的文件后缀名，默认是 ['.js', '.vue', '.ts']
+    filename: 'zh', // 输出的文件名,默认为 zh_cn
+    extname: 'json', //  输出的文件后缀名默认为 js  ,支持json和js（js格式为 module.exports = {} 或 export default {}），
+    // langList: ['en', 'spa', 'cht'] // 翻译目标语言列表，默认是 ['en']   具体语种请自行查看。注意：使用不同的翻译接口，需要更换对应的语言编码，腾讯翻译、火山翻译、谷歌翻译语言编码大致相同，百度要特别注意，与上述3种翻译有不同的语言编码
+    langList: ['en'] // 翻译目标语言列表，默认是 ['en']   具体语种请自行查看。注意：使用不同的翻译接口，需要更换对应的语言编码，腾讯翻译、火山翻译、谷歌翻译语言编码大致相同，百度要特别注意，与上述3种翻译有不同的语言编码
+}
\ No newline at end of file
diff --git a/locale/en.json b/locale/en.json
new file mode 100644
index 0000000..d846222
--- /dev/null
+++ b/locale/en.json
@@ -0,0 +1,1935 @@
+{
+	"language": {
+		"zh": "Simplified Chinese",
+		"en": "English"
+	},
+	"common": {
+		"home": "Home",
+		"category": "Category",
+		"cart": "Cart",
+		"my": "My",
+		"confirm": "Confirm",
+		"cancel": "Cancel",
+		"not_yet": "Not yet",
+		"save": "Preserve",
+		"add": "Add",
+        "copy": "Copy",
+		"del": "Delete",
+        "del_record": "Delete record",
+        "del_success": "Delete successful",
+        "del_fail": "Delete failed",
+		"edit": "Edit",
+        "link": "Link",
+        "gift": "Gift",
+        "image": "Image",
+        "video": "Video",
+        "file": "File",
+		"more": "More",
+		"more_null": "",
+        "view_more": "View more",
+		"search": "Search",
+		"num": "quantity",
+		"order": "order form",
+		"service": "service",
+		"please_input": "Please enter",
+		"settlement": "balance",
+		"confirm_sub": "Confirm submission",
+        "submit_payment": "Submit payment",
+        "my_want_receive": "I want to claim it",
+		"clear": "empty",
+		"all": "All",
+		"share": "Share",
+		"return": "Return",
+		"view_text": "Check",
+        "detail_text": "Detail",
+        "refresh_text": "Refresh",
+        "yes_text": "Yes",
+        "no_text": "NO",
+        "place_order_text": "Place Order",
+		"processing_in_text": "Processing",
+		"loading_in_text": "Loading",
+		"upload_in_text": "Uploading",
+		"auth_in_text": "Authorizing",
+		"warm_tips": "Kind reminder",
+		"no_relevant_data_tips": "No relevant data available",
+		"internet_error_tips": "The internet has wandered off~",
+		"sub_error_retry_tips": "Submission failed, please try again!",
+		"not_more_list_data_tips": "No more list data available",
+		"login_in_text": "Logging in",
+		"sending_in_text": "Sending",
+        "payment_in_text": "Payment in progress",
+		"sending": "Sending",
+		"scan_name": "Scan it",
+		"not_have_name": "not have",
+        "note": "Remarks",
+        "recommend_code_name": "Recommend code",
+        "now_update_text": "Update Now",
+        "already_latest_text": "It is already the latest",
+        "to_update_text": "Go update",
+        "to_star_text": "To star",
+        "use_time": "Usage time",
+        "add_time": "Add time",
+        "upd_time": "Update time",
+        "receive_time": "Receiving time",
+		"service_time": "service time ",
+		"apply_time": "Application time",
+        "verification_text": "Verification code",
+        "verification_message": "Please enter the verification code",
+        "verification_mobile_message": "Please enter the verification code or mobile number",
+        "unique_message": "The unique identifier is empty",
+        "not_supported_scan_tips": "H5 webpage does not support scanning codes",
+        "copy_link": "Copy link"
+	},
+    "client": {
+        "weixin": "WeChat",
+        "alipay": "Alipay",
+        "baidu": "Baidu",
+        "qq": "QQ",
+        "toutiao": "Headlines/Tiktok",
+        "kuaishou": "Kwai"
+    },
+	"pages": {
+		"goods-category": "Product classification",
+		"cart": "shopping cart",
+		"user": "User Center",
+		"cart-page": "shopping cart",
+		"buy": "acknowledgement of order",
+        "web-view": "",
+		"login": "Login",
+		"paytips": "Secure payment",
+		"goods-search": "Product search",
+        "goods-search-start": "Product search",
+		"goods-detail": "Product details",
+		"goods-comment": "Product evaluation",
+		"user-address": "My address",
+		"user-address-save": "Address editing",
+		"user-order": "My order",
+		"user-order-detail": "Order details",
+		"user-order-comments": "Order evaluation",
+		"user-favor": "Product Collection",
+		"user-goods-comments": "Product reviews",
+		"user-goods-comments-form": "Product Editing",
+		"message": "news",
+		"user-integral": "Points details",
+		"user-goods-browse": "My Tracks",
+		"user-orderaftersale": "Refund/After sales",
+		"user-orderaftersale-detail": "After sales of orders",
+		"extraction-address": "Self pickup address",
+		"customview-customview": "Custom Page",
+		"design": "",
+        "diy": "",
+		"error": "Kind reminder",
+		"article-category": "All articles",
+		"article-detail": "Article details",
+		"setup": "set up",
+		"password": "password modify",
+		"personal": "personal data",
+		"logout": "Account cancellation",
+        "about": "About Us",
+		"plugins-seckill-index": "Limited time flash sale",
+		"plugins-coupon-index": "Coupon Collection Center",
+        "plugins-coupon-detail": "Coupon",
+		"plugins-coupon-shop": "Shop Coupon Collection Center",
+		"plugins-coupon-user": "My coupons",
+		"plugins-membershiplevelvip-index": "Member VIP",
+		"plugins-membershiplevelvip-buy": "Activate membership",
+		"plugins-membershiplevelvip-user": "My Members",
+		"plugins-membershiplevelvip-order": "Open an order",
+		"plugins-membershiplevelvip-order-detail": "Order details",
+		"plugins-membershiplevelvip-profit": "Revenue details",
+		"plugins-membershiplevelvip-profit-detail": "Revenue details",
+		"plugins-membershiplevelvip-poster": "Promotion rewards",
+		"plugins-membershiplevelvip-team": "My team",
+		"plugins-membershiplevelvip-member-code": "Membership code",
+		"plugins-distribution-user": "My Distribution",
+		"plugins-distribution-order": "Distribution orders",
+		"plugins-distribution-order-detail": "Order details",
+		"plugins-distribution-profit": "Revenue details",
+		"plugins-distribution-profit-detail": "Revenue details",
+		"plugins-distribution-team": "My team",
+		"plugins-distribution-map": "Customer distribution",
+		"plugins-distribution-recommend-list": "My Recommended Treasure",
+		"plugins-distribution-recommend-detail": "Recommended Treasure Details",
+		"plugins-distribution-recommend-form": "Recommended Treasure Add/Edit",
+		"plugins-distribution-poster": "Promotion rewards",
+		"plugins-distribution-extraction": "Pickup point",
+		"plugins-distribution-extraction-apply": "Pickup point info",
+		"plugins-distribution-extraction-order": "Pickup order",
+		"plugins-distribution-extraction-switch": "Pickup point switching",
+		"plugins-distribution-introduce": "Level Introduction",
+		"plugins-distribution-promotion-user": "Promote users",
+		"plugins-distribution-promotion-order": "Promote orders",
+		"plugins-distribution-visit-list": "Customer visits",
+		"plugins-distribution-visit-form": "Customer visit addition/editing",
+		"plugins-wallet-user": "My wallet",
+		"plugins-wallet-recharge": "Recharge",
+		"plugins-wallet-cash-auth": "Withdrawal of balance",
+		"plugins-wallet-cash-create": "Withdrawal of balance",
+		"plugins-wallet-wallet-log-detail": "Details",
+		"plugins-wallet-user-recharge-detail": "Recharge details",
+		"plugins-wallet-user-cash-detail": "Withdrawal details",
+		"plugins-wallet-user-transfer-detail": "Transfer details",
+		"plugins-wallet-payment-code": "Wallet payment code",
+		"plugins-wallet-transfer": "Transfer",
+		"plugins-excellentbuyreturntocash-profit": "Details of Yougou cashback",
+		"plugins-excellentbuyreturntocash-profit-detail": "Details of Yougou cashback",
+		"plugins-weixinliveplayer-index": "direct seeding",
+		"plugins-weixinliveplayer-search": "Live streaming list",
+		"plugins-weixinliveplayer-detail": "Live streaming details",
+		"plugins-exchangerate-currency": "Currency switching",
+		"plugins-invoice-invoice": "Invoice List",
+		"plugins-invoice-invoice-detail": "Invoice details",
+		"plugins-invoice-invoice-saveinfo": "Invoice editing",
+		"plugins-invoice-order": "Order invoicing",
+        "plugins-invoice-recharge": "Recharge invoice",
+		"plugins-signin-user": "Sign in",
+		"plugins-signin-detail": "Sign in",
+		"plugins-signin-user-qrcode-detail": "Sign in code details",
+		"plugins-signin-user-qrcode-saveinfo": "Sign in code editing",
+		"plugins-signin-user-coming-list": "User check-in",
+		"plugins-points-index": "Points Mall",
+		"plugins-points-scan": "Scan the QR code to claim points",
+		"plugins-brand-index": "brand",
+		"plugins-shop-index": "All stores",
+		"plugins-shop-detail": "Store homepage",
+		"plugins-shop-search": "Store Product Search",
+		"plugins-shop-favor": "Store favorites",
+		"plugins-shop-license": "Business qualifications",
+        "plugins-shop-check": "Order verification",
+		"plugins-activity-index": "All activities",
+		"plugins-activity-detail": "Event details",
+		"plugins-label-detail": "Label details",
+		"plugins-blog-index": "Blog",
+		"plugins-blog-search": "Blog search",
+		"plugins-blog-detail": "Blog details",
+		"plugins-blog-comments": "Comment List",
+		"plugins-blog-user-list": "My post",
+		"plugins-blog-form": "Posting a blog post",
+		"plugins-express-detail": "Logistics details",
+		"plugins-realstore-index": "store",
+		"plugins-realstore-search": "Store Search",
+		"plugins-realstore-detail": "Store details",
+		"plugins-realstore-favor": "Store Collection",
+		"plugins-realstore-orderallot-list": "Store orders",
+		"plugins-realstore-orderallot-detail": "Store Order Details",
+		"plugins-realstore-batchorder-list": "Batch orders",
+		"plugins-realstore-frequencycard-list": "Secondary card",
+		"plugins-realstore-frequencycard-used": "Secondary Card Usage Record",
+        "plugins-realstore-check": "Order verification",
+		"plugins-binding-index": "Combination and matching",
+		"plugins-binding-detail": "Combination and matching details",
+		"plugins-delivery-order": "Delivery order",
+		"plugins-delivery-order-detail": "Order details",
+		"plugins-delivery-logistics": "Logistics info",
+		"plugins-ask-index": "Q&A",
+		"plugins-ask-detail": "Q&A details",
+		"plugins-ask-form": "I need to ask a question",
+		"plugins-ask-user-detail": "Question details",
+		"plugins-ask-user-list": "My question",
+		"plugins-ask-goods-list": "Q&A section",
+		"plugins-ask-comments": "All Q&A",
+		"plugins-intellectstools-goods-comments": "Product evaluation",
+		"plugins-scanpay-index": "Scan code payment",
+		"plugins-scanpay-tips": "Payment results",
+		"plugins-thirdpartylogin-index": "Authorized login",
+		"plugins-magic-detail": "details",
+		"plugins-ordergoodsform-order": "Product Form",
+		"plugins-coin-user": "Virtual currency",
+		"plugins-coin-recharge": "Recharge",
+		"plugins-coin-convert": "conversion",
+		"plugins-coin-cash": "Withdrawal",
+		"plugins-coin-detail": "detail",
+		"plugins-coin-transfer-accounts-detail": "Transfer details",
+		"plugins-coin-transaction-detail": "Transaction details",
+		"plugins-coin-cash-detail": "Withdrawal details",
+		"plugins-coin-convert-detail": "Conversion details",
+		"plugins-coin-collection": "Collection",
+		"plugins-coin-recharge-pay": "Recharge payment",
+		"plugins-coin-recharge-detail": "Recharge details",
+		"plugins-coin-transfer": "Transfer",
+		"plugins-coin-transfer-list": "Transfer details",
+		"plugins-coin-transaction-list": "Transaction details",
+		"plugins-coin-cash-list": "Withdrawal details",
+		"plugins-coin-convert-list": "Conversion details",
+		"plugins-coin-recharge-list": "Recharge details",
+        "plugins-antifakecode-index": "Authentic inquiry",
+        "plugins-giftcard-index": "My gift card",
+        "plugins-giftcard-form": "Gift card redemption",
+        "plugins-givegift-goods": "Buying Gifts",
+        "plugins-givegift-receive": "Gift collection",
+        "plugins-givegift-gift": "My gift",
+        "plugins-givegift-code": "Gift Link",
+        "plugins-orderresources-orderannex": "Order Resources",
+        "plugins-hospital-patient": "Add/Edit Patient",
+        "plugins-hospital-patient-list": "Patient List",
+        "plugins-hospital-prescription": "Consultation and prescription"
+	},
+	"login": {
+		"login": {
+			"725312": "Account password login",
+			"tfl656": "Confirm Binding",
+			"483nho": "Return to previous page",
+			"31r6p2": "Mobile verification code",
+            "8fghjs": "Get your phone number",
+			"p3kxy2": "Get your phone number and log in with one click",
+			"54l805": "Bind existing account",
+			"q11t73": "Register an account and bind it",
+			"s51ed9": "Successfully logged in, please click to return to the previous page",
+			"e77788": "Login account will be automatically bound",
+			"1i4o86": "user",
+			"su75o5": "cancel",
+			"n2pv70": "Account",
+			"1p7843": "phone",
+			"p54kf1": "mailbox",
+			"3i05ly": "Temporarily closed login",
+			"nddg2x": "Read and agree",
+			"2v11we": "《Service Agreement》",
+			"l3r4vr": "And",
+			"myno2x": "《Privacy Policy》",
+			"i1deai": "Confirm login",
+			"t75ee8": "New User Registration",
+			"9d8gqi": "Retrieve password",
+			"tvl242": "Authorization to automatically log in",
+			"9q27d8": "Other login methods",
+			"t59dho": "Temporarily closed registration",
+			"hvunf8": "Confirm Registration",
+			"zy8tc4": "Log in now",
+			"7z29x2": "Confirm submission",
+			"b347k4": "Register Now",
+			"836o8e": "Confirm login authorization to provide you with better service",
+			"pgyv78": "There is an error in the basic data. If it is not automatically loaded, please manually click to load!",
+			"6fe6ra": "Load basic data",
+			"28k91h": "Mobile phone number",
+			"t3951j": "Verification code",
+			"qe8a37": "User name/phone/email",
+			"08fchn": "Login password",
+			"db1rf4": "E-mail",
+			"6yfr9g": "login/register",
+			"d178m0": "Mobile/email",
+			"9wx3ch": "Set login password",
+			"s665h5": "Obtain verification code",
+			"jw378f": "Authorized User Information",
+			"np9177": "Bind phone",
+			"tgsa4d": "Bind email",
+			"876tdf": "Bind account",
+			"87yui2": "Bind successful",
+			"158yg2": "Login with mobile verification code",
+			"r329eu": "Email verification code login",
+			"39hn6v": "Account password registration",
+			"z13km0": "Mobile verification code registration",
+			"jc0w0o": "Email verification code registration",
+			"8tmyuc": "Password retrieval",
+			"5p23c6": "Login successful",
+			"btu2c1": "Please agree to the agreement first",
+			"no8ts6": "Used to improve member info",
+			"3nmrg2": "privilege grant failed",
+            "tghjer": "Please obtain a mobile phone number",
+			"4c5n8o": "Please fill in your phone number",
+			"xak8g1": "Please fill in the email address",
+			"ku05ty": "Please fill in your phone or email address",
+			"7r5h37": "Please enter a valid verification code",
+			"24mvbh": "Please fill in the account number",
+			"s36mk5": "Sending",
+			"6881q7": "Sending",
+			"n24i5u": "surplus",
+			"4306xr": "second",
+			"6gojnd": "The internet has wandered off~",
+			"01xmab": "Please fill in the verification code",
+			"prqvf1": "Authorization ID cannot be empty",
+			"4ci850": "Processing",
+			"yvj88j": "Please enter your phone number",
+			"yo6x3p": "Please enter an email address",
+			"n7vh75": "Please enter an account",
+			"277w03": "Please enter the password",
+			"cesl5d": "Please enter the verification code",
+			"c5wa4u": "Logging in",
+			"g30ew7": "Registering",
+			"h0515x": "Please enter your phone or email address",
+			"wysg7k": "Please set password",
+			"4wc3hr": "Incorrect protocol type",
+			"x0nxxf": "Protocol URL address is incorrect",
+			"05h35f": "Loading",
+			"d76tgh": "If it is not automatically loaded, please manually click load!",
+			"li9573": "Login method not processed"
+		}
+	},
+	"user-order-detail": {
+		"user-order-detail": {
+			"346376": "Shipping Services",
+			"7lp6gw": "View Location",
+			"7f8p26": "Product Information",
+			"423rmr": "common",
+			"41ty94": "Total pieces",
+			"xcj552": "element",
+			"7xtnjt": "Unconfigured data",
+			"7dikfm": "Pickup info",
+            "0876xf": "Express delivery info",
+			"o38952": "Pickup code:",
+			"0f26j2": "Order Information",
+			"ct34n5": "Extended Data",
+			"y9woor": "Key Information",
+			"hpq62x": "The pickup code does not exist. Please contact the administrator",
+			"io6p5k": "Order Mode",
+			"n18sd2": "Order number",
+            "yghjkf": "Order Goods",
+			"yxwu8n": "Order Status",
+			"23qj7m": "Payment status",
+			"vg4jb1": "Order unit price",
+			"2y7l13": "Total order price",
+			"6ub2j0": "Discount amount",
+			"8b18q8": "Increase amount",
+			"516tlr": "Payment amount",
+			"0e1sfs": "Payment method",
+			"12d445": "Express delivery company",
+			"2byl8l": "Express tracking number",
+			"2b5fc8": "guest book ",
+			"h2c78h": "Creation time",
+			"9vivhl": "Confirmation time",
+			"wn83rn": "Payment time",
+			"1674dc": "Delivery time",
+			"0i938r": "Receiving time",
+			"1jpv4n": "Cancel time",
+			"8o2of3": "Closing time",
+			"5k6k56": "Parameter error",
+			"i876o3": "Incorrect address",
+            "567ygf": "service information",
+            "67ujfr": "Service duration",
+            "gsfw4d": "Service Name",
+            "6ygfew": "Service Mobile"
+		}
+	},
+	"setup": {
+		"setup": {
+			"x81v6d": "Replace phone",
+			"j6skqh": "Click to replace",
+			"dfg4wf": "Click to bind",
+			"r7jz13": "update language",
+			"42mba7": "Address",
+			"5eltza": "Click to manage",
+			"t60222": "Invoices",
+			"izg78g": "Click to go",
+			"377uwg": "Permission settings",
+			"5493ui": "Clear cache",
+			"f53166": "Click to clear",
+			"656fv1": "Service phone",
+			"f25wcx": "Click to call",
+			"11k15d": "Account cancel",
+			"48r261": "Logout and can't recover.",
+            "tghrf2": "About Us",
+			"07o10b": "Please bind your phone first",
+			"nwt4o1": "Please log in first",
+			"utnr7g": "Service phone",
+			"87ytgh": "Unbind",
+			"5u59b1": "Change email",
+			"v8438r": "Change password"
+		}
+	},
+	"article-category": {
+		"article-category": {
+			"gxra15": "View volume"
+		}
+	},
+	"article-detail": {
+		"article-detail": {
+			"728374": "Time:",
+			"j92ru0": "Browsing:",
+			"281s4a": "Previous article:",
+			"uq5814": "Next article:"
+		}
+	},
+	"buy": {
+		"buy": {
+			"70u2vy": "to",
+			"o7722q": "consult a map",
+			"876tgh": "shipping method",
+			"45ovhs": "Coupons",
+			"58rs1a": "Store Secondary Card",
+			"33fugm": "apply",
+			"4di4i2": "Points",
+			"q7jq76": "Quick input",
+			"wx78ju": "Total:",
+			"4884hk": "place order",
+			"2c3i88": "Do not use coupons",
+			"8vqfp3": "Do not use secondary cards",
+			"0pgsrm": "second",
+			"g2vt78": "Selected",
+			"inyxpx": "choice",
+			"l1c8q6": "Display type does not allow submission of orders",
+			"6rk813": "Please select a shipping address",
+			"wq7gnb": "Please select a pickup address",
+			"553mxo": "Please select a coupon",
+			"80y7sv": "Deduction",
+			"2rhko1": "Leave a message",
+			"718tux": "Enter my order",
+			"p7e91u": "Incorrect product info",
+			"4is2ak": "Enter store order",
+			"s7rr5s": "time",
+			"1fi842": "Select time",
+			"q8u066": "Please select a time",
+            "df3raf": "My Name",
+            "hjwerf": "My Phone",
+            "8fghje": "Please fill in your name and phone number",
+			"hw4l5m": "Optional coupons",
+			"5iuqow": "",
+			"4rb08b": "There are currently no available coupons available",
+			"3740ur": "Please select an address",
+			"71kidy": "Please select payment method",
+			"r79t77": "Submitting",
+			"31616e": "The current mode does not allow the use of addresses",
+			"g7dk3f": "Card type selection",
+			"0s1k23": "Active",
+			"ntm2z5": "All orders",
+			"b3dyo7": "lifelong",
+			"5lr84j": "Purchase duration not configured",
+			"5x86n3": "Member level not configured",
+			"bmueac": "Please select the duration of activation",
+			"64ml60": "Incorrect activation duration"
+		}
+	},
+	"agreement": {
+		"agreement": {
+			"w38e3v": "Dear user, in order to provide you with better service, we would like to offer you",
+			"hjn568": "Before using the mini program, you need to click on [Agree] and read the following agreement content to indicate that you fully understand, agree to, and understand the rules of the relevant agreement in this warm reminder. This includes providing a page display, product or service that better suits your needs in the location info you open, such as recommending products or related store and ranking info to you on the homepage.",
+			"iy7863": "Service User Agreement",
+			"jwi8n1": "Privacy Policy",
+			"062co8": "Disagree",
+			"60t34e": "agree"
+		}
+	},
+	"open-setting-location": {
+		"open-setting-location": {
+			"407106": "]Permissions",
+			"61wezw": "Enable corresponding permission services",
+			"6vev38": "Get[",
+			"lult41": "position info",
+			"65q4b3": "Open the settings page",
+			"hwn386": "Location selection failed"
+		}
+	},
+	"customview": {
+		"customview": {
+			"726k7y": "Enter product name to search for"
+		}
+	},
+	"error": {
+		"error": {
+			"u697ih": "Abnormal error"
+		}
+	},
+	"extraction-address": {
+		"extraction-address": {
+			"42v8tv": "Distance from you"
+		}
+	},
+	"goods-category": {
+		"goods-category": {
+			"ico62g": "Selected product",
+			"44f1ww": "Go settle",
+			"7e4m68": "No subcategory data",
+			"5pj8ip": "Please select the product first",
+			"x69aow": "All",
+			"at5p35": "sales volume",
+			"283ot0": "heat",
+			"g2u3lf": "price",
+			"5p4ksj": "new",
+			"gy7y0w": "Products of different specifications need to be reduced in the shopping cart",
+			"x46kbv": "The cart ID is incorrect",
+			"z1eh3v": "Restricted purchase",
+			"1ox23z": "Quantity unchanged",
+			"o6i1w2": "After picking for so long, do you really want to clear it?"
+		}
+	},
+	"goods-comment": {
+		"goods-comment": {
+			"dfmjxd": "Rate",
+			"1qh8s8": "There is currently no rating available"
+		}
+	},
+	"goods-detail": {
+		"goods-detail": {
+			"1s79t4": "inventory",
+			"w3jma9": "coupon",
+			"u401fi": "specifications",
+			"317jp2": "Related stores",
+            "dfge45": "Store Introduction",
+            "567uhg": "Store products",
+			"znz76d": "Evaluation",
+			"1rqkjt": "Positive review rate",
+			"6k7808": "I want to evaluate",
+			"k5u755": "Q&A",
+			"q8e577": "View all answers",
+			"7ulh8b": "Ask question",
+			"l7dzv2": "Product parameters",
+			"2j44o2": "Product details",
+			"27wudx": "No detailed data available at the moment",
+			"v2974w": "Guess you like it",
+			"0gx41x": "No parameter data",
+			"m3op38": "No wholesale info",
+			"96y691": "No coupon info available",
+			"gwwf19": "No relevant store info available",
+			"8ej346": "No relevant service info available",
+			"775ppk": "Limited time flash sale",
+			"35f378": "Suspend sales",
+			"6brk57": "Please select a specification",
+			"dco1sc": "Favor",
+			"bogx42": "price",
+			"3kdgjl": "Sales price",
+			"by7052": "Already ",
+			"tq1976": "The URL value is empty",
+			"uyghj2": "Copy value is empty",
+			"98v424": "Store data is incorrect",
+			"721e2h": "Event not processed（"
+		}
+	},
+	"goods-search": {
+		"goods-search": {
+			"j8o278": "Filter out",
+			"t9nikq": "Piece of data",
+			"pxk051": "clear",
+            "4eerty": "origin",
+			"6n8316": "brand",
+			"v6e5b7": "attribute"
+		}
+	},
+	"index": {
+		"index": {
+			"443683": "Ended",
+			"516559": "Activity rules",
+			"t8bll8": "",
+			"t8bll9": "News",
+			"s5r784": "Latest purchase",
+			"1c17n3": "Returned",
+			"75l3l2": "Unreturned",
+			"17vy72": "Missing tab data!",
+			"i78v36": "Returning to the store",
+			"lkld04": "Comment:",
+			"r6vv25": "Like:",
+			"6rsqp1": "All",
+			"pot64x": "Popular",
+			"8t4j95": "Recommended products",
+			"lk0i6c": "My coupon",
+			"p4872s": "Coupon Collection Center",
+			"tbo22p": "Join",
+			"z88r5s": "Get details of member points",
+			"b46kge": "Currently available",
+			"t26j9z": "integral",
+			"srd2ch": "original",
+			"u5642g": "Integral rule",
+			"qbi72m": "Got it",
+			"i73nwk": "Points details",
+			"f3l1xt": "Product exchange",
+			"4v5nq5": "exchange",
+			"t3d917": "Select location",
+			"c5273j": "Enter store name",
+			"1vf378": "Latest stores",
+			"1e582h": "Add notes",
+			"7w75zb": "confirm",
+			"6941e7": "Collection",
+			"t1o84g": "Please enter the consumption amount",
+			"872w3v": "We are about to start a robbery",
+			"399f6c": "Second price reduction",
+			"f69r4i": "The internet has deviated a bit~00home",
+			"slf50q": "Authorized login",
+			"rmv185": "If it is not my own operation, please ignore the application",
+			"n0vnl6": "Successfully logged in",
+			"63g4m1": "New Live"
+		}
+	},
+	"logout": {
+		"logout": {
+			"u10002": "Confirm cancellation",
+			"9vfzz4": "After account cancellation, it cannot be restored. Are you sure to continue?"
+		}
+	},
+	"paytips": {
+		"paytips": {
+			"679rxu": "Payment successful",
+			"jifuu8": "Go back to the homepage",
+			"d8m853": "Processing",
+			"6y488i": "Payment failed",
+			"e732we": "Payment canceled",
+			"13v11t": "Network connection error",
+			"u1153p": "Payment result unknown",
+			"6mpsl7": "User cancels payment",
+			"59u769": "Other abnormal errors"
+		}
+	},
+	"personal": {
+		"personal": {
+			"cw1d8p": "Avatar",
+			"gw8br3": "nickname",
+			"jibx42": "birthday",
+			"6m33c4": "Detailed address",
+			"x2fofv": "Gender",
+			"44112i": "Nickname of 1-16",
+			"85404s": "Please select your birthday",
+			"re674n": "Address can be up to 30 long"
+		}
+	},
+	"detail": {
+		"detail": {
+			"324777": "To",
+			"455787": "recommendation",
+			"b4f3nw": "Activity products",
+			"ans2p4": "More activities",
+			"5knxg6": "No related products available",
+			"kt41ki": "Message time:",
+			"e6ga1y": "browse",
+			"ng628i": "Administrator's reply",
+			"7rg4bb": "Reply time:",
+			"p7o522": "My question",
+			"6026t4": "save",
+			"32171c": "Invalid",
+			"27pmj3": "Buy Now",
+			"9624hp": "Select specifications",
+			"8618mj": "Please select the number",
+			"09e3bx": "Product specifications",
+			"40298g": "Section",
+			"5kbjoy": "Item unavailable",
+			"jsj3u8": "Please select at least",
+			"jksm81": "Items",
+			"1j6yxy": "Related products",
+			"e439j9": "Bowen",
+			"j5owf1": "There is currently no logistics info available",
+			"025362": "Co owned",
+			"0av5r9": "Related products",
+			"53m44k": "The label data does not exist",
+			"dor2v9": "Business hours:",
+			"688i26": "Map",
+			"r4124d": "Service:",
+			"54k10s": "Long press WeChat for consultation",
+			"vj4nom": "Long press line to consult",
+			"q42ger": "Product search",
+			"8q6345": "Please enter product keywords",
+			"rdxjvh": "Person sign in, total",
+			"15i191": "Integral, total",
+			"8ua11k": "organize a team",
+			"25x8ij": "Signed in",
+			"mvj266": "Sign in immediately",
+			"31lky7": "My check-in",
+			"p07k62": "today",
+			"96bwp0": "today",
+			"we522y": "not",
+			"mqmxbt": "Sign in and obtain",
+			"sx6u43": "Rule Description",
+			"6qk085": "Successful check-in",
+			"ndp2k3": "Congratulations on obtaining",
+			"7itw5w": "Use Now",
+			"6w8t3g": "day",
+			"xtcy73": "one",
+			"w2p2d9": "two",
+			"xt8596": "three",
+			"13s18l": "four",
+			"n5rm3q": "five",
+			"3d23mc": "six",
+			"73rb8q": "year",
+			"zill36": "month",
+			"y2217b": "Sign in",
+			"4u64dg": "Live streaming status",
+			"y2639j": "Start time",
+			"fa8h7j": "poster",
+			"eg25j9": "Enter live",
+			"86g7e1": "No WeChat app installed",
+			"9d3o6w": "Please open it in the WeChat mini program",
+			"6xvl35": "Generating",
+			"fn3w01": "release",
+			"4w20tq": "Operation type:",
+			"s101d1": "Number of operations:",
+			"e30wj1": "Original quantity:",
+			"jdour8": "Latest quantity:",
+			"7fhy2u": "View more details",
+			"yvmu0z": "account details "
+		}
+	},
+	"form": {
+		"form": {
+			"s14osm": "Add image（",
+			"2f52v3": "Anonymous publishing",
+			"4yd066": "Submit",
+			"qt0q5u": "Please provide a detailed description of the problem, and we will answer it as soon as possible!",
+			"bniyyt": "Handling errors",
+			"8l3ul5": "User not logged in",
+			"5v5bjs": "Please fill in the content",
+			"043a10": "Is it enabled",
+			"5hn8k3": "cover photo",
+			"xy87t8": "describe",
+			"kvr2i3": "SEO Title",
+			"l87ju1": "SEO keywords",
+			"5487bt": "SEO Description",
+			"4vku7u": "Post classification",
+			"4cbom4": "Please select",
+			"4h814w": "Pack up more",
+			"lfwj0g": "Expand more",
+			"2e5rv3": "Uploading, please wait a moment",
+			"v19gg8": "Please enter a title",
+			"gu3x97": "Please select a category",
+			"adiq70": "Please enter the content"
+		}
+	},
+	"goods-list": {
+		"goods-list": {
+			"27nkjm": "Questions from",
+			"00n7i3": "ask",
+			"rw12i7": "answer",
+			"278qr1": "View All",
+			"8y3cc7": "Answers",
+			"aem3e6": "Put away the answer",
+			"nr77jf": "There is currently no source of goods available"
+		}
+	},
+	"user-detail": {
+		"user-detail": {
+			"o92ral": "Question details",
+			"k5867n": "contacts",
+			"gfe703": "Contact phone number",
+			"uy6lrz": "title",
+			"7cufw6": "content",
+			"u411r2": "Reply content",
+			"teo6qd": "Reply time"
+		}
+	},
+	"search": {
+		"search": {
+			"723rbx": "Actually, searching is very simple ^ _ ^!",
+			"e415ir": "not begin",
+			"46g3i2": "Living",
+			"v60305": "Paused",
+			"660us5": "Actually, searching is very simple ^ _ ^!",
+			"ic9b89": "Please enter search keywords"
+		}
+	},
+	"user-list": {
+		"user-list": {
+			"yhvl2q": "Are you sure you want to delete this post?"
+		}
+	},
+	"shop": {
+		"shop": {
+			"4q9oe2": "Received"
+		}
+	},
+	"user": {
+		"user": {
+			"981200": "Rebate Overview",
+			"s3y4ji": "not used",
+			"pggs6s": "Used",
+			"528t26": "Expired",
+			"3ks1wi": "You currently do not have any coupons~",
+			"b5cnj1": "Pickup point",
+			"4rj120": "Superior user",
+			"567lwz": "modify",
+			"67y36w": "Basic statistics",
+			"rjye50": "people",
+			"q822fj": "Rebate statistics",
+			"xjxb2v": "Go promote",
+			"25f97u": "query",
+			"iynkpl": "Please enter user info to search first!",
+			"2344s8": "application",
+			"nk3cpq": "Enter user ID/first name/nickname/membership code/mobile phone/email",
+			"dcbt21": "custom",
+			"4141u2": "Searching",
+			"f5rny5": "Please search for users first",
+			"n4orgk": "Activate membership",
+			"k614v7": "Renewal of membership",
+			"65cc6z": "Continuous activation",
+			"76dcx6": "Promote customers",
+			"95s1ez": "Are you sure to continue with the renewal based on the original duration and fees?",
+			"mgx9x4": "freeze",
+			"424v6n": "Gifts",
+			"29f6n5": "Transfer",
+			"8752a4": "Withdrawal",
+			"91h03v": "Payment code",
+			"ki1nor": "Tel Service",
+			"2k0227": "Exit",
+			"3q4p8k": "Collection",
+			"57xw84": "Tracks",
+			"k78280": "Points",
+			"9u8e61": "Pay",
+			"66714e": "Shipping",
+			"aa1ri3": "Sales",
+			"67p34x": "balance"
+		}
+	},
+	"logistics": {
+		"logistics": {
+			"dxu6ql": "Delivery time:",
+			"5542tq": "Delivery has not started yet",
+			"895ug2": "Delivery time:",
+			"76q0ii": "Not yet delivered"
+		}
+	},
+	"order": {
+		"order": {
+			"725882": "Enter order number/recipient/recipient phone number",
+			"865029": "Abnormal cause",
+            "jhgfd1": "Shipping info",
+            "hbvwq4": "Receipt info",
+			"71n22h": "Single ID",
+			"232ygr": "Order number",
+			"7dxbm5": "Phone",
+			"ra8222": "Address",
+			"75ie9c": "details",
+			"021438": "Start delivery",
+			"ip4xo5": "Redelivery",
+			"51q275": "Complete delivery",
+			"fb6dge": "abnormal",
+			"46q2z7": "Upload photos",
+			"o11d44": "Up to upload",
+			"9cvj96": "Submission completed",
+			"eyir7g": "Submit exception",
+			"q4c8j0": "Description can be up to 200 characters long",
+			"g23kyj": "The reason for the anomaly can be up to 200 characters long",
+			"psi67g": "Unable to recover or continue after deletion?",
+			"s5cpq5": "Are you sure to start shipping the order?",
+			"13j20t": "In delivery",
+			"7ltibl": "Please upload photos",
+			"c69064": "Delivered",
+			"hun5n3": "Please fill in the reason",
+			"pjb15r": "Unpay",
+			"s8g966": "Paid",
+			"q820hx": "receive",
+			"15lr5l": "Completed",
+			"330m76": "Source terminal",
+			"p3scy0": "The avatar address is incorrect",
+			"o411h6": "Merge invoicing",
+			"15k32o": "Please select data first",
+			"3fr155": "The element parameter ID is incorrect",
+			"1i873j": "pay",
+			"1k98tk": "Canceled",
+			"6390gk": "Closed",
+			"vvxct1": "Opening order number",
+			"vjfki8": "Opening duration",
+			"pn78ns": "After cancellation, it cannot be restored. Are you sure you want to continue?",
+			"93j3zq": "No form data"
+		}
+	},
+	"order-detail": {
+		"order-detail": {
+			"9er1pc": "Basic info",
+			"36op8f": "Order number",
+            "ygvc34": "Merchant name",
+			"x3ge6c": "Order amount",
+			"v52n5r": "refund amount",
+			"8n1f72": "Product quantity",
+			"2443o1": "Delivery status",
+			"342sfz": "Delivery time",
+			"2dw4gd": "Completion time",
+			"r3bg45": "Complete description",
+			"521pp4": "Complete photos",
+			"u745i8": "Abnormal time",
+			"5fq8pr": "Dispatch time",
+			"21ift9": "Update time",
+			"9153qn": "Order time",
+			"pyw6xg": "User profile picture",
+			"2d766e": "User nickname",
+			"w78rgm": "Order time",
+			"rn4hhi": "type"
+		}
+	},
+	"extraction": {
+		"extraction": {
+			"suna53": "Apply Now",
+			"j0o47u": "The application info is currently under review",
+			"60601g": "Pickup point info",
+			"48rp75": "Edit Information",
+			"641gp7": "Pickup order statistics",
+			"wcv68q": "View pickup orders",
+			"53h4fj": "Pending",
+			"wq25fk": "Processed",
+			"864dtt": "The current status has also been terminated, and the data can be re edited and submitted for review.",
+			"11825x": "Application info review failed",
+			"w6hg74": "Reason:"
+		}
+	},
+	"extraction-apply": {
+		"extraction-apply": {
+			"u439pg": "Logo image",
+			"bflosr": "Suggest 300x300px",
+			"9t81k8": "alias",
+			"cy87k6": "Provinces cities and districts",
+			"liqbru": "Please select a province first",
+			"r4q86m": "Please select a city first",
+			"47v7m0": "geographical position",
+			"8831v6": "Please select a geographical location",
+			"5y2yzu": "Attention: Editing info will be re reviewed before it can take effect",
+			"wt1w0m": "The alias format can be up to 16 characters long",
+			"73efnt": "Contact format between 2-16 characters",
+			"qixk24": "Landline or mobile phone",
+			"gxo73a": "Detailed address format between 1 and 80 characters",
+			"s3h5o3": "Please select a province",
+			"4s4s15": "Please select a city",
+			"fk4gw5": "Please select district/county",
+			"4s229b": "Please bind your phone number first",
+			"m3xdif": "Please authorize user info first",
+			"h8f437": "Data acquisition failed",
+			"fo7y6c": "Province acquisition failed",
+			"b6qg7b": "City acquisition failed",
+			"5s5734": "District/County acquisition failed",
+			"q15b4n": "Please fill in the contact person",
+			"3or25c": "Please fill in the contact phone number",
+			"m99d2g": "Please select a province",
+			"03587o": "Please select a city",
+			"pt8436": "Please select a district or county",
+			"v1g617": "Please provide detailed address",
+			"rm14pu": "The data needs to be re reviewed before it can take effect"
+		}
+	},
+	"extraction-order": {
+		"extraction-order": {
+			"2y7lq1": "Picking up goods",
+			"3m038g": "Pickup code",
+			"xb4044": "search criteria",
+			"suo4oz": "Please enter the pickup code",
+			"kuqvlv": "Order number/pickup code",
+			"znufs8": "Please enter the pickup code",
+			"hbj4y7": "Incorrect operation data"
+		}
+	},
+	"extraction-switch": {
+		"extraction-switch": {
+			"w94x36": "distance",
+			"613b58": "Data error"
+		}
+	},
+	"introduce": {
+		"introduce": {
+			"017d67": "Level certificate",
+			"el4ib2": "Rebate ratio",
+			"syf66q": "First level",
+			"q4t9kl": "second level",
+			"e5os6e": "Level 3",
+			"d7kle4": "Level rules",
+			"5t5vzi": "Unconditional"
+		}
+	},
+	"map": {
+		"map": {
+			"ivy154": "Total number of orders placed",
+			"557z8x": "View orders"
+		}
+	},
+	"poster": {
+		"poster": {
+			"673605": "Click to copy the link address",
+			"rbdj4b": "Poster sharing",
+			"m54q3e": "After saving the poster, send it to WeChat friends/groups, QQ friends/groups, share it on social media, Weibo, etc. for promotion, and easily earn rebates!",
+			"b5i123": "View long press save",
+			"hk8c9p": "Regenerate",
+			"9y4bwq": "QR code sharing",
+			"h212v8": "After saving the QR code, send it to WeChat friends/groups, QQ friends/groups, share it on social media, Weibo, etc. for promotion, and easily earn rebates!",
+			"j3qv45": "View QR code, long press save",
+			"r534xd": "Link sharing",
+			"vn36y7": "Copy the following link, send it to WeChat friends/groups, QQ friends/groups, share it on social media, Weibo, etc. for promotion, and easily earn rebates!",
+			"eu3j21": "The promotional image address is incorrect"
+		}
+	},
+	"profit": {
+		"profit": {
+			"3c7zmg": "To be effective",
+			"67o785": "To be settled",
+			"l5knxu": "Settled",
+			"utg512": "Revenue amount",
+			"6a7t71": "Current level",
+			"19a8l6": "Order details",
+			"4r88cp": "Immediate settlement",
+			"8jqr78": "In effect",
+			"nk58v6": "Effective amount",
+			"vuvz6g": "Refund amount",
+			"5c7sof": "Order ID is incorrect",
+			"7y47sb": "Rebate amount"
+		}
+	},
+	"profit-detail": {
+		"profit-detail": {
+			"kn8yye": "Settlement status",
+			"x28rw5": "Order payment status",
+			"b7v892": "Add time",
+			"jkrvf3": "Settlement time",
+			"3jg81h": "Rebate rules"
+		}
+	},
+	"promotion-order": {
+		"promotion-order": {
+			"6rs63v": "Total GMV of newly added customers",
+			"iwa646": "Orders",
+			"2p5215": "Total GMV of orders"
+		}
+	},
+	"promotion-user": {
+		"promotion-user": {
+			"62c8m1": "mobile",
+			"i2rf31": "User orders",
+			"o6qi74": "Promote users",
+			"kx7595": "Consumed users",
+			"2ey5t1": "Unconsumed users",
+			"852zib": "New customers added",
+			"h8mx3e": "New customers (valid)",
+			"fvbq25": "New customers (need to repurchase)",
+			"2g7enc": "Consumer orders",
+			"32bf15": "Consumption amount",
+			"76748p": "Last order time",
+			"u43380": "Subordinate orders",
+			"8n4tr3": "Lower level consumption",
+			"1gc3ny": "Last order time for subordinates",
+			"3l1187": "Subordinate users",
+			"g5332w": "No order placed",
+			"8i641g": "Ordered"
+		}
+	},
+	"recommend-detail": {
+		"recommend-detail": {
+			"265vyu": "Starting purchase",
+			"2sis3v": "Inventory quantity"
+		}
+	},
+	"recommend-form": {
+		"recommend-form": {
+			"57zrl5": "icon",
+			"3vk50b": "Suggest 100 * 100px",
+			"5ws7m3": "Related products",
+			"q536vp": "remove",
+			"27goz3": "+Select product",
+			"6rlju7": "Current Display",
+			"q4qr64": "Title format: 1~60 characters",
+			"29au77": "Description format can be up to 200 characters long",
+			"203itn": "Category",
+			"h5v45f": "Please enter the product name",
+			"20m5gj": "Please search for data first!",
+			"7gc30l": "Classify All",
+			"yd3833": "Please fill in the title",
+			"31k41l": "Please select the product",
+			"e5k407": "Searching",
+			"145ci4": "Selection successful",
+			"ocg49p": "Selection list already exists"
+		}
+	},
+	"recommend-list": {
+		"recommend-list": {
+			"x74z3o": "commodity",
+			"78n1ly": "access",
+			"54d418": "After deletion, it cannot be restored. Are you sure to continue?",
+			"w9460o": "No"
+		}
+	},
+	"team": {
+		"team": {
+			"784249": "Registration time:",
+			"i040fg": "reverse",
+			"2ny6k1": "Order placement time:",
+			"2i4k79": "Whether to place an order:",
+			"3l538c": "Reset",
+			"pcaom3": "start time",
+			"iee9bp": "End time",
+			"6h2l64": "Joined at"
+		}
+	},
+	"visit-form": {
+		"visit-form": {
+			"0su017": "Visit content",
+			"6l81lz": "Visiting photos",
+			"e9r65a": "Visit content, up to 230 characters long",
+			"6f63it": "Please select a customer",
+			"5k455y": "Please fill in the visit details",
+			"56vk4m": "Please upload visit photos"
+		}
+	},
+	"visit-list": {
+		"visit-list": {
+			"q76du4": "Visit description",
+			"4z367h": "Visiting pictures"
+		}
+	},
+	"goods-comments": {
+		"goods-comments": {
+			"31ees6": "Product rating",
+			"6p942c": "Please enter your review",
+			"pe5p52": "Please select a rating",
+			"1wut9j": "Please enter a review",
+			"s65197": "Administrator's reply:",
+			"1p1r2e": "This product has not been reviewed yet~"
+		}
+	},
+	"invoice": {
+		"invoice": {
+			"p3dmd2": "Order invoicing",
+            "bh8yt3": "Recharge invoice",
+			"l3832z": "Business type",
+			"hoenw8": "Application type",
+			"j04kjc": "Invoice type",
+			"fvuc4p": "Invoice amount",
+			"y724c7": "Invoice header"
+		}
+	},
+	"invoice-detail": {
+		"invoice-detail": {
+			"s70kj4": "Application Information",
+			"1s2f0g": "Electronic invoice",
+			"4tu3v3": "You can click on the invoice name and copy it, then go to the browser to open the address and download the invoice.",
+			"rrfex6": "state",
+			"p73963": "Invoice content",
+			"41qbu6": "Name of the bank where the enterprise opens the account",
+			"3a9459": "Enterprise account opening",
+			"2g7t23": "Enterprise contact phone number",
+			"6k6sov": "Registered address of the enterprise",
+			"7159m0": "Recipient Name",
+			"f2222p": "Recipient's phone number",
+			"q8l3zj": "Recipient address",
+			"rpdwd3": "Reason for rejection",
+			"2000a0": "Express name"
+		}
+	},
+	"invoice-saveinfo": {
+		"invoice-saveinfo": {
+			"x8hhiv": "Unified social credit code or tax identification number for enterprises",
+			"t3i3e3": "Please select invoice type",
+			"k31t2s": "Please select the application type",
+			"i73t3c": "Please select invoice content",
+			"x461e0": "Invoice header, up to 200 characters long",
+			"924cag": "Unified social credit code or tax identification number for enterprises, with a maximum of 160 characters",
+			"ymvw6b": "Enterprise account opening bank name, up to 200 characters",
+			"664qc7": "Enterprise account opening, with a maximum of 160 characters",
+			"bbseo1": "Enterprise contact phone number 6-15 characters",
+			"85735j": "Registered address of the enterprise, with a maximum of 230 characters",
+			"gsc7dy": "The recipient's name format should be between 2 and 30 characters",
+			"bp8822": "Recipient's phone number is 6-15 characters long",
+			"u7h724": "Recipient address, up to 230 characters",
+			"d3qbe1": "Email, up to 60 characters",
+			"vaw647": "Remarks can be up to 230 characters long",
+			"89815t": "Invoicing",
+			"004t56": "Add",
+			"dl11n1": "The invoice amount must be greater than 0",
+			"r13p43": "Please fill in the invoice header, with a maximum of 200 characters",
+			"ws4wbb": "Please fill in the unified social credit code or tax identification number of the enterprise, with a maximum of 160 characters",
+			"87itn8": "Please fill in the name of the company's account opening bank, with a maximum of 200 characters",
+			"01lw93": "Please fill in the enterprise account number, with a maximum of 160 characters",
+			"414ihr": "Please fill in the company's contact phone number, which is 6-15 characters long",
+			"g3yh32": "Please fill in the registered address of the company, with a maximum of 230 characters",
+			"4xy6xi": "Please fill in the recipient's name format between 2 and 30 characters",
+			"quhnk0": "Please fill in the recipient's phone number, which should be 6-15 characters long",
+			"kq77u3": "Please provide the recipient's address, with a maximum of 230 characters"
+		}
+	},
+	"member-code": {
+		"member-code": {
+			"oc4x18": "If you encounter a scan failure, please turn the screen to the brightest position and scan the code again",
+			"26bu38": "Membership code",
+			"x58gqu": "Wallet payment code",
+			"yj6g3a": "Go log in",
+			"kx4yk8": "The membership code is empty"
+		}
+	},
+	"batchorder-list": {
+		"batchorder-list": {
+			"25sh5e": "In progress"
+		}
+	},
+	"frequencycard-list": {
+		"frequencycard-list": {
+			"cgy327": "Usage records",
+			"954ewh": "Effective",
+			"8x98g7": "suspend",
+			"5n3ums": "finish",
+			"n36x3w": "close",
+			"cx75t7": "Available times",
+			"3m1w12": "Used times",
+			"89t8am": "Starting time"
+		}
+	},
+	"frequencycard-used": {
+		"frequencycard-used": {
+			"538686": "Deduction frequency",
+			"xjmepo": "Description",
+			"aod4pc": "Operators"
+		}
+	},
+	"orderallot-detail": {
+		"orderallot-detail": {
+			"81jvw1": "Order type"
+		}
+	},
+	"orderallot-list": {
+		"orderallot-list": {
+			"w2w2w4": "Receiving goods",
+			"6m73j2": "batch",
+			"b13k5r": "Secondary card",
+			"w2t242": "logistics",
+			"285ir2": "In service",
+			"x5l17j": "Received",
+			"o3ouqv": "Please confirm that the goods have been received or completed, and cannot be restored after operation. Are you sure to continue?"
+		}
+	},
+	"tips": {
+		"tips": {
+			"0azfc3": "Total payment amount",
+			"579u02": "end page"
+		}
+	},
+	"design": {
+		"design": {
+			"882220": "To {shop. close_weekname}, {shop. open-time}}-",
+			"ay7m42": "Search All",
+			"21kak7": "Online Service",
+			"745kx2": "branch",
+			"wtx1l8": "View product categories",
+			"83occ4": "There is currently no data available",
+			"ses9m2": "Please enter the keywords of the product you are searching for",
+			"i7725u": "Search",
+			"gv16tj": "to"
+		}
+	},
+	"user-coming-list": {
+		"user-coming-list": {
+			"xkwnl8": "Reward points",
+			"sq4379": "Sign in time"
+		}
+	},
+	"user-qrcode-detail": {
+		"user-qrcode-detail": {
+			"b5ilz3": "Heaven, flip",
+			"22zc5y": "-{detail. specificed_time_reward. timeend}}, additional reward",
+			"18680z": "Double the reward for consecutive attendance",
+			"dupsnc": "continuity",
+			"c8e5of": "times",
+			"37bh73": "Additional rewards during designated time periods",
+			"6l7r99": "time interval",
+			"mjfygy": "Inviter Rewards",
+			"pb2e32": "Invitee rewards",
+			"do23j6": "Contact Name",
+			"5k2ibd": "Contact phone number",
+			"911a61": "Contact address"
+		}
+	},
+	"user-qrcode-saveinfo": {
+		"user-qrcode-saveinfo": {
+			"xa2k42": "Contact name format between 2 and 30 characters",
+			"e9ko33": "Contact phone number 6-15 characters",
+			"bbxaw6": "Contact address, up to 230 characters",
+			"jw2h8l": "Sign in code",
+			"84g5t6": "Please fill in the contact name format between 2 and 30 characters",
+			"1tilke": "Please fill in the contact phone number, which should be 6-15 characters long",
+			"5m2752": "Please fill in the contact address, with a maximum of 230 characters"
+		}
+	},
+	"cash-auth": {
+		"cash-auth": {
+			"b39a25": "Choose identity authentication method",
+			"582q6x": "Please select an authentication account",
+			"d318op": "Please enter the security verification code",
+			"0j8388": "Operation prompt",
+			"59iipw": "1. Please select“",
+			"8qcte7": "Bind email",
+			"t8y3r7": "'Or'",
+			"5wbuuy": "One way is to obtain the security verification code and input it correctly.",
+			"r569wz": "2. If you have not bound your phone or your email has expired, you can bind your phone and complete the verification by receiving SMS from your phone.",
+			"35837l": "3. If you have not bound your email or it has expired, you can bind your email and complete the verification by receiving the email.",
+			"q2a553": "4. Please input the verification code correctly below. If you cannot see it clearly, you can click on the image to replace it. After completing the input, proceed to the next step.",
+			"lh6bjr": "5. After receiving the security verification code, please complete the verification within 10 minutes.",
+			"ob4gn0": "6. After successful security verification, please complete the cash application within 30 minutes.",
+			"d2ng16": "Bind phone number",
+			"l2i4s8": "Current effective amount",
+			"27b4w5": "Minimum cash amount",
+			"2hc312": "Verification code format with 4 digits",
+			"5dcsbd": "Please choose the authentication method"
+		}
+	},
+	"cash-create": {
+		"cash-create": {
+			"qg404q": "Withdrawal amount",
+            "9ugssd": "Handling fees",
+			"5o1q52": "Gift amount cannot be withdrawn",
+			"iaw845": "Withdrawable amount",
+			"1dbkw2": "Available amount",
+			"162f7o": "Total amount of gifts",
+            "yu2raf": "Withdrawal method",
+			"5mmir5": "Payment platform",
+			"14n20v": "It is strongly recommended to give priority to filling in the names of the four state-owned banks (Bank of China, China Construction Bank, Industrial and Commercial Bank of China and Agricultural Bank of China). Please fill in the detailed names of the branches of the deposit banks. For virtual accounts such as Alipay, Tenpay and WeChat, you can fill in the corresponding names directly.",
+			"36756z": "Receiving account",
+			"748r3i": "Bank account or virtual account (Alipay, Tenpay, WeChat, etc.)",
+			"1xtff6": "Name of account holder",
+			"445m7n": "The real name of the account holder of the receiving account",
+			"858o54": "Security verification has timed out. Please verify again before proceeding",
+			"ke15x5": "Return to reapply for cash",
+			"cymbdz": "Withdrawal amount, minimum",
+			"27ky42": ", highest",
+			"u2rnlw": "The format of the payment platform is between 1 and 60 characters",
+			"s72t44": "The format of the receiving account should be between 1 and 60 characters",
+			"f4605e": "The format of the account holder's name is between 1 to 30 characters",
+			"6t7x9u": "Please fill in the cash amount",
+            "thjid2": "Please choose a withdrawal method",
+			"vbr59h": "Please fill in the payment platform",
+			"0mn186": "Please fill in the receiving account number",
+			"c7h4mu": "Please fill in the name of the account holder",
+			"724kn8": "Withdrawals cannot be lower than",
+			"duo0ts": "Withdrawal cannot be greater than",
+            "678iu2": "Estimated handling fee"
+		}
+	},
+	"payment-code": {
+		"payment-code": {
+			"b74qxe": "）Automatically refresh payment code in seconds"
+		}
+	},
+	"recharge": {
+		"recharge": {
+			"3shyx4": "Account balance",
+			"60k2v3": "Select recharge amount",
+			"qbw1x2": "money",
+			"x27b25": "Recharge Now",
+			"4fm61g": "Recharge instructions",
+			"otwkjn": "Recharge",
+			"23zwpz": "other",
+			"73f4v9": "Please enter the recharge amount",
+			"lh6k86": "Recharge address",
+			"e5rblc": "Coin charging network",
+			"eb6722": "Choose recharge coins",
+			"k1e7hs": "Other quantities",
+			"e8n7ul": "Recharge instructions:",
+			"0i541i": "Please enter the recharge quantity",
+			"5q02ar": "Please select or enter the recharge quantity"
+		}
+	},
+	"transfer": {
+		"transfer": {
+			"2q274j": "Transfer amount",
+			"9xe2bl": "My balance:",
+			"t53ary": "Please enter user ID/name/code/mobile phone/email",
+			"g22y5v": "Please enter the transfer amount",
+			"2bwh7h": "Please enter transfer remarks info",
+			"1aijp1": "Please enter the receiving account number",
+			"x4mzo9": "Please enter the correct receiving account",
+            "678uyg": "Transfer order number",
+			"4g21cu": "Payee",
+			"t36tk2": "Transfer remarks",
+			"b4m5p3": "Transfer currency",
+			"3i4h4z": "Transfer immediately",
+			"d15853": "Please enter the transfer currency"
+		}
+	},
+	"user-cash-detail": {
+		"user-cash-detail": {
+			"e8a3e8": "Withdrawal number",
+			"wyad6w": "Withdrawal status",
+			"j5s3u6": "Transfer platform",
+			"53k647": "Transfer Name",
+			"m556tl": "Transfer account",
+			"i308o1": "Payment amount",
+			"451xxt": "Payment time"
+		}
+	},
+	"user-recharge-detail": {
+		"user-recharge-detail": {
+			"ch84a8": "Recharge order number",
+			"dq5v2u": "Recharge status",
+			"7272ia": "Recharge amount"
+		}
+	},
+	"user-transfer-detail": {
+		"user-transfer-detail": {
+			"x17599": "Transfer time"
+		}
+	},
+	"wallet-log-detail": {
+		"wallet-log-detail": {
+			"tdf3wo": "Operation type",
+			"744os7": "Amount type",
+			"ruq60b": "Operation amount",
+			"4q7pfq": "Original amount",
+			"r814ne": "Latest amount",
+			"0ghn6g": "Change Description",
+			"i2kze7": "Operation time"
+		}
+	},
+	"user-address": {
+		"user-address": {
+			"e8qg73": "default",
+			"3i4x2r": "Add new address",
+			"1rwt3l": "Import System Address",
+			"7r29v8": "Consignee:",
+			"2nmsi1": "Contact phone number:",
+			"s150l6": "Shipping address:"
+		}
+	},
+	"user-address-save": {
+		"user-address-save": {
+			"231435": "label",
+			"620370": "The address ID is incorrect",
+			"5yhgps": "name",
+			"h8f148": "region",
+			"13rpdw": "Click to select geographical location",
+			"mb7cjx": "retrieval",
+			"4rc269": "address",
+			"s3o1p5": "Scan",
+			"42l857": "Address Pasting Board",
+			"g43klm": "default address",
+			"3w7r14": "ID card name",
+			"0y1vl6": "ID No",
+			"761ek6": "ID card photo",
+			"c811s5": "Please fill in the original ID card for shooting, with clear images",
+			"wii4sp": "Contact person 2~16",
+			"65507o": "Landline or mobile phone",
+			"he685s": "Number",
+			"vdkv32": "Detailed address of 1-80",
+			"b32r6v": "Paste the entire address segment, automatically split the name, phone number, and address",
+			"l6vjlm": "Please enter the label name",
+			"c73v42": "Please fill in your real name",
+			"c742c8": "Please fill in the ID number number",
+			"t1loj5": "home",
+			"6t396c": "company",
+			"34rqp8": "school",
+			"2pey0m": "Province info failed",
+			"7w01kd": "The form name type is incorrect",
+			"z687lv": "Please enter the address info first",
+			"lrlmxf": "Please fill in your ID card name",
+			"0x8i97": "Please fill in the ID card number",
+			"224l36": "Please upload a photo of the front of your ID card",
+			"glf52g": "Please upload a photo of the back of your ID card",
+			"wkfi45": "Please enter data"
+		}
+	},
+	"user-order": {
+		"user-order": {
+			"twc3r7": "comment",
+			"lp1v28": "Urge and urge",
+			"ht65c9": "Suborder",
+			"9l47b6": "form",
+            "fyuikn": "resources",
+			"3l2jr5": "buy-back",
+			"7571p2": "Merge payments",
+			"hp123x": "To be picked up",
+			"f5qqhu": "Successfully urged",
+			"a3c81d": "Add cart",
+			"5o756f": "Direct purchase"
+		}
+	},
+	"user-order-comments": {
+		"user-order-comments": {
+			"uboc44": "anonymous",
+			"r9r3h0": "Does the baby meet your expectations? Let's talk about its advantages and shortcomings in beauty",
+			"si255j": "Very poor",
+			"42b0x1": "difference",
+			"72mov3": "commonly",
+			"16cmv6": "good",
+			"e4i88f": "Very good",
+			"021i2d": "Your comment will be presented anonymously",
+			"h2ci83": "Your comment will be presented in the form of a nickname",
+			"34ne4c": "Please rate first",
+			"x6fwbf": "There are still no ratings left",
+			"8f303u": "Please fill in the comment content",
+			"39y6ym": "Comment content should be between 6 and 230 characters long",
+			"488j15": "Each comment image cannot exceed 3 images"
+		}
+	},
+	"user-orderaftersale": {
+		"user-orderaftersale": {
+			"10c251": "Returns",
+			"3wggcu": "To be confirmed",
+			"1kcn16": "To be returned",
+			"2kzi0t": "Pending review",
+			"1p5456": "Rejected"
+		}
+	},
+	"user-orderaftersale-detail": {
+		"user-orderaftersale-detail": {
+			"uuhf62": "Immediate return",
+			"00je4f": "Return address:",
+			"4y2c1l": "voucher",
+			"bprwq9": "Reason for refund",
+			"85pnkf": "Number of items",
+			"84upo4": "Quantity cannot be greater than",
+			"1252if": "Cannot be greater than",
+			"9p6b1y": "Refund instructions",
+			"4y9355": "Upload credentials",
+			"1l42ms": "Upload up to 3 images",
+			"21icul": "Please select the reason",
+			"9kvu52": "Please enter the refund amount",
+			"4f8u0c": "Refund instructions can be up to 200 characters long",
+			"6d14hq": "Please enter the courier name",
+			"8tt862": "Please enter the tracking number",
+			"50cm8m": "Refund type",
+			"17j4cy": "current state",
+			"r2oy43": "Reason for application",
+			"c53k23": "Return quantity",
+			"5t586p": "Refund method",
+			"bifwmx": "Return time",
+			"8n414b": "Review time",
+			"23v6rp": "Please select the operation type",
+			"dn3423": "Please select the quantity of returns",
+			"c9e2ms": "Please fill in the courier name",
+			"ld10pm": "Please fill in the courier tracking number"
+		}
+	},
+	"ask-comments": {
+		"ask-comments": {
+			"2zlnb5": "Comment（",
+			"du7rcv": "Like（",
+			"6l6vz7": "word",
+			"3fcnme": "Reply（",
+			"ymmd24": "Replies",
+			"dfhg54": "View more replies",
+			"5401r1": "Comments",
+			"4l77wt": "View more comments",
+			"8sjar6": "Reply@",
+			"m67961": "Looking forward to your speech",
+			"3o1rq6": "The maximum input character limit has been exceeded"
+		}
+	},
+	"ask-comments-goods": {
+		"ask-comments-goods": {
+			"xl51n6": "Answers",
+			"g6mc44": "If you have any questions, please ask other classmates~"
+		}
+	},
+	"binding-list": {
+		"binding-list": {
+			"kh7951": "buy",
+			"2u4v35": "Put it away",
+			"91d60h": "launch"
+		}
+	},
+	"bottom-line": {
+		"bottom-line": {
+			"44bct2": "I have a bottom line"
+		}
+	},
+	"cart": {
+		"cart": {
+			"v37ow8": "mall",
+			"09gl3g": "store",
+			"wb5465": "Go for a stroll",
+			"pxjwv8": "Select All",
+			"3kr74b": "on sale:",
+			"n76213": "Add:",
+			"4tbj4s": "detail",
+			"7gdej1": "Nearby stores",
+			"h63814": "No store info available",
+			"t41i4x": "Amount details",
+			"miti3i": "Items",
+			"9s0l57": "Co reduction",
+			"qh35gz": "Co addition",
+			"j8on74": "The cart is empty",
+			"31h34v": "Consult immediately",
+			"2wfu7o": "Please bind your phone number",
+			"3v6ulk": "After choosing for so long, do you really want to delete it?",
+			"8q2yej": "Please slide the data you want to operate on first",
+			"9g81jk": "Data does not exist",
+            "8tt78i": "Add to Favorites",
+            "87rfg3": "Cancel collection",
+			"346c25": "Collection successful",
+			"21051p": "Collection failed",
+			"3sy0mp": "Please select the product first"
+		}
+	},
+	"copyright": {
+		"copyright": {
+			"5g8tdz": "Powered by Xiaotao Chinese Store"
+		}
+	},
+	"coupon-card": {
+		"coupon-card": {
+			"j318xx": "There is currently no type parameter available",
+			"m9316y": "Go ahead and use it"
+		}
+	},
+	"goods-batch-buy": {
+		"goods-batch-buy": {
+			"9ectyf": "species",
+			"geq82x": "Amount:",
+			"ypby1k": "No relevant info available",
+			"7tp1tc": "Incorrect operation event type",
+			"dsfd98": "Out of stock"
+		}
+	},
+	"goods-buy": {
+		"goods-buy": {
+			"ufdm25": "Incorrect specification data",
+			"737wzz": "Purchase quantity",
+			"4maexq": "Incorrect operation event type（"
+		}
+	},
+	"nav-more": {
+		"nav-more": {
+			"h9g4b1": "Click to collapse"
+		}
+	},
+	"no-data": {
+		"no-data": {
+			"1u202v": "Temporarily no network connection",
+			"imw8f1": "Please check if the system settings ->cellular mobile network allow it【",
+			"q87572": "】APP uses cellular mobile network or wireless local area network"
+		}
+	},
+	"online-service": {
+		"online-service": {
+			"4l6k22": "Service"
+		}
+	},
+	"payment": {
+		"payment": {
+			"973g2e": "No payment info",
+			"z3y296": "Try clicking to pay",
+			"iu792d": "Payment details",
+			"25r53g": "Pay",
+			"058a46": "No payment method available",
+			"x6d585": "Please select the payment method first",
+			"011cj4": "Will the payment fee be deducted immediately after the operation, confirm to continue?",
+			"7ihx9u": "Incorrect payment method",
+			"e1f54e": "Requesting",
+			"vhx5dv": "Wrong payment type",
+			"597s8b": "The payment component interface cannot be empty",
+			"t4d687": "Payment service not configured",
+			"bv637f": "Payment undefined",
+			"4dszme": "Please use real machine operation, or the basic version of the mini program is too low!",
+			"k2i010": "After successful payment, please do not make duplicate payments. If the order status is not successful, please contact customer service for assistance",
+			"2rw3qh": "The payment method has not been adapted yet",
+			"sdfs31": "Has the payment been completed?"
+		}
+	},
+	"realstore-cart": {
+		"realstore-cart": {
+			"v437n6": "Do you have any purchased items?",
+			"6bmc34": "Switch",
+			"d1kk7x": "Please select the order type",
+			"2dc65q": "Please add the product first",
+			"50lf68": "Loading",
+			"b27ln3": "Add cart",
+			"47h2a0": "Request failed, please try again!",
+			"miv944": "start",
+			"20epzm": "Product data incorrect",
+			"8tzr7l": "Incorrect store info",
+            "87tty2": "Choice store",
+            "76rfgh": "Choose another store",
+            "r67uyg": "Enter store"
+		}
+	},
+	"share-popup": {
+		"share-popup": {
+			"h04xiy": "One click sharing with friends and group chat",
+			"rhs2c5": "One click sharing with WeChat friends and group chat",
+			"mv9l10": "One click sharing to WeChat Moments",
+			"f08y38": "One click share to WeChat favorites",
+			"1242w9": "One click sharing to QQ friends and spaces",
+			"1oh013": "Click to copy the address and share it with friends or group chat",
+			"dcp2qu": "Generate posters and share them on social media, friends, and group chats"
+		}
+	},
+	"user-qrcode": {
+		"user-qrcode": {
+			"8p57v3": "Team up check-in"
+		}
+	},
+	"switch": {
+		"switch": {
+			"924s7v": "open",
+			"g142o6": "shut",
+			"447u86": "prompt",
+			"8w5ok6": "Are you sure you want to adjust it to {0}?"
+		}
+	},
+	"time-select": {
+		"time-select": {
+			"8k5rr7": "Sunday",
+			"17353c": "Monday",
+			"40rmq4": "Tuesday",
+			"q35g41": "Wednesday",
+			"v213l8": "Thursday",
+			"8q3q2x": "Friday",
+			"9605m5": "Saturday",
+			"h7l2xj": "Daily（",
+			"cq522p": "Today（",
+			"ub264m": "Tomorrow（"
+		}
+	},
+	"upload": {
+		"upload": {
+			"b33f08": "Upload"
+		}
+	},
+	"user-base": {
+		"user-base": {
+			"g5663y": "Get your",
+            "913g4e": "Get users",
+            "yujeaf": "Improve personal information, mainly used to provide users with a recognizable user center interface",
+			"o19lj3": "Enter a nickname of 1-16 characters",
+			"8u9on2": "Alipay users",
+			"t8i9l4": "Baidu users",
+			"0imw74": "Headline users",
+			"27q5af": "QQ users",
+			"211pk4": "Kwai users",
+			"5x8o43": "WeChat users",
+			"gzc3y4": "Please upload your profile picture",
+			"lro9u7": "Please fill in your nickname"
+		}
+	},
+	"user-cash": {
+		"user-cash": {
+			"3v1gzc": "Unpay",
+			"t7gtu0": "Paid",
+			"x47iu3": "Fail Pay"
+		}
+	},
+	"user-recharge": {
+		"user-recharge": {
+			"8y9dki": "Go pay"
+		}
+	},
+	"wallet-log": {
+		"wallet-log": {
+			"9p865e": "reduce",
+			"1nm6c2": "increase"
+		}
+	},
+	"shopxo-uniapp": {
+		"app": {
+			"47b5d1": "Xiaotao Chinese Store",
+			"5a7r0v": "One click login with local phone number",
+			"33k281": "I have read and agree",
+			"8l688n": "And log in with your local phone number",
+			"28r5dr": "Service Agreement",
+			"lb493k": "Privacy Policy",
+			"ch1pd2": "Failed to call up the local phone number component",
+			"5y1c52": "The event value format is incorrect",
+			"t754n6": "Prompt message is empty alert",
+			"iq66pg": "Please copy the address to the webpage map for viewing!",
+			"v2j475": "Incorrect coordinates",
+			"3m1gbe": "Uuid cache failed",
+			"1244fe": "Unknown data",
+			"r5ts62": "Copy successful",
+			"r539kf": "Copy content is empty",
+			"qm8548": "The image address is empty",
+			"gbiac6": "Please open authorization",
+			"3eqv71": "Please go to the mini program to use the complete service",
+			"08cg8y": "The customer service address is incorrect",
+			"0gwt7z": "Clear successful",
+			"87yghj": "Logout successful",
+			"di6v5t": "Please obtain authorization first",
+			"nu5058": "Geographic location selection is not supported!",
+			"4v6q86": "No location selected",
+            "tghyu3": "current location"
+		}
+	},
+	"password": {
+		"password": {
+			"338433": "Please confirm the new password",
+			"xyekjf": "Confirm modifications",
+			"4e24j1": "Please enter the current password",
+			"1lwiaz": "Please enter a new password",
+			"3pp6t7": "Confirm new password"
+		}
+	},
+	"cash": {
+		"cash": {
+			"zmhf3n": "Withdrawable currency",
+			"f6p4hm": "Withdrawal quantity",
+			"6oc6e7": "All withdrawals",
+			"ucg8e2": "Withdrawal address",
+			"h9i16y": "Withdrawal network",
+			"1g49wo": "No network data",
+			"42b37m": "Apply for withdrawal",
+			"i1f373": "Please enter the withdrawal address",
+			"g05p4g": "Please enter withdrawal note info",
+			"en6vsa": "Network data is empty, please contact customer service!",
+			"w01qjc": "Please enter the withdrawal quantity"
+		}
+	},
+	"cash-list": {
+		"cash-list": {
+			"e6pffe": "Withdrawal number:",
+			"2w20g2": "Platform:",
+			"23ii8s": "Recharge network:",
+			"714g2h": "Recharge address:",
+			"1o8838": "Withdrawal currency:",
+			"s7l616": "Account type",
+			"t66tu3": "Withdrawal type",
+			"311tt2": "Network type",
+			"n74r94": "account",
+			"2g251t": "network",
+			"8hrc73": "Are you sure to delete this withdrawal order"
+		}
+	},
+	"collection": {
+		"collection": {
+			"856g12": "copy",
+			"9p43lu": "Scan to initiate a transfer to the other party. Please verify your account carefully before confirming the transfer!"
+		}
+	},
+	"convert": {
+		"convert": {
+			"o56h58": "Balance:",
+			"4kcix6": "convert now",
+			"327y2v": "Transfer out and receive selection cannot be the same",
+			"vyjy7s": "Please enter the conversion currency"
+		}
+	},
+	"convert-list": {
+		"convert-list": {
+			"733518": "Transfer to account:",
+			"8813rd": "Conversion order number:",
+			"c374ec": "Transfer out balance:",
+			"6mxu85": "Transfer out account:",
+			"6347mw": "Latest Currency:",
+			"9oy325": "Remarks:",
+			"q48666": "Initiate account",
+			"47646p": "Receiving account"
+		}
+	},
+	"recharge-list": {
+		"recharge-list": {
+			"6b9399": "Recharge order number:",
+			"epd531": "Recharged coins:",
+			"l5g8m1": "Are you sure to delete this recharge order"
+		}
+	},
+	"recharge-pay": {
+		"recharge-pay": {
+			"lutmsv": "Payment voucher",
+			"1a5vqk": "(Upload up to 10 images)",
+			"wu49vk": "Payment remarks",
+			"95pfkd": "Please enter a note",
+			"v5fok8": "Please upload the voucher"
+		}
+	},
+	"transaction-list": {
+		"transaction-list": {
+			"1mf6wj": "Currency type:",
+			"2w1o1l": "Operation currency:",
+			"jgx0cf": "Original currency:",
+			"7cv11k": "Description:",
+			"cu39n5": "Currency type"
+		}
+	},
+	"transfer-list": {
+		"transfer-list": {
+			"69rnx6": "Transfer order number:",
+			"4aj248": "Payee:",
+			"m2r55k": "Transfer currency:",
+			"9g8lyb": "Transfer remarks:"
+		}
+	},
+	"user-goods-comments": {
+		"user-goods-comments": {
+			"58804r": "Is it displayed",
+			"jnk6da": "Do you want to reply",
+			"yyjemb": "Anonymous or not",
+			"0nhrj0": "Comment content"
+		}
+	},
+    "giftcard-index": {
+    	"giftcard-index": {
+            "87ytyh": "Card type",
+    		"hfg2fg": "Cami key",
+    		"fyjnsd": "Card security data",
+            "87yyj3": "Redemption time",
+            "8tfgh2": "Card exchange",
+            "6redfg": "Use data",
+            "fu3rf1": "Please enter the card password key"
+    	}
+    },
+    "givegift-gift": {
+        "givegift-gift": {
+            "8yghjd": "Unlimited collection",
+            "567uye": "Message reminder",
+            "rtyu33": "Message prompt, maximum format of 200 characters",
+            "34rrr3": "Leave a message for Ta to express gratitude!"
+        }
+    }
+}
\ No newline at end of file
diff --git a/locale/index.js b/locale/index.js
new file mode 100644
index 0000000..7b1392a
--- /dev/null
+++ b/locale/index.js
@@ -0,0 +1,18 @@
+import VueI18n from 'vue-i18n';
+import Vue from 'vue';
+
+import zh from './zh.json';
+import en from './en.json';
+
+let i18nConfig = {
+    locale: uni.getLocale(),
+    silentTranslationWarn: true,
+    messages: {
+        "zh": zh,
+        "en": en
+    }
+}
+Vue.use(VueI18n)
+const i18n = new VueI18n(i18nConfig)
+Vue.prototype._i18n = i18n
+export default i18n
diff --git a/locale/zh.json b/locale/zh.json
new file mode 100644
index 0000000..947e55d
--- /dev/null
+++ b/locale/zh.json
@@ -0,0 +1,1917 @@
+{
+	"language": {
+		"zh": "简体中文",
+		"en": "英语"
+	},
+	"common": {
+		"home": "首页",
+		"category": "分类",
+		"cart": "购物车",
+		"my": "我的",
+		"confirm": "确认",
+		"cancel": "取消",
+		"not_yet": "暂不",
+		"save": "保存",
+		"add": "新增",
+        "copy": "复制",
+		"del": "删除",
+        "del_record": "删除记录",
+        "del_success": "删除成功",
+        "del_fail": "删除失败",
+		"edit": "编辑",
+        "link": "链接",
+        "gift": "礼物",
+        "image": "图片",
+        "video": "视频",
+        "file": "文件",
+		"more": "更多",
+		"more_null": "更 多",
+        "view_more": "查看更多",
+		"search": "搜索",
+		"num": "数量",
+		"order": "订单",
+		"service": "服务",
+		"please_input": "请输入",
+		"settlement": "结算",
+		"confirm_sub": "确认提交",
+        "submit_payment": "提交支付",
+        "my_want_receive": "我要领取",
+		"clear": "清空",
+		"all": "全部",
+		"share": "分享",
+		"return": "返回",
+		"view_text": "查看",
+        "detail_text": "详情",
+        "refresh_text": "刷新",
+        "yes_text": "是",
+        "no_text": "否",
+        "place_order_text": "下单",
+		"processing_in_text": "处理中...",
+		"loading_in_text": "加载中...",
+		"upload_in_text": "上传中...",
+		"auth_in_text": "授权中...",
+		"login_in_text": "登录中...",
+		"sending_in_text": "发送中...",
+        "payment_in_text": "支付中...",
+		"sending": "发送中",
+		"warm_tips": "温馨提示",
+		"no_relevant_data_tips": "没有相关数据",
+		"internet_error_tips": "网络开小差了哦~",
+		"sub_error_retry_tips": "提交失败，请重试！",
+		"not_more_list_data_tips": "无更多列表数据",
+		"scan_name": "扫一扫",
+		"not_have_name": "没有",
+        "note": "备注",
+        "recommend_code_name": "推荐码",
+        "now_update_text": "立即更新",
+        "already_latest_text": "已是最新",
+        "to_update_text": "去更新",
+        "to_star_text": "去评分",
+        "use_time": "使用时间",
+        "add_time": "添加时间",
+        "upd_time": "更新时间",
+        "receive_time": "接收时间",
+		"service_time": "服务时间",
+		"apply_time": "申请时间",
+        "verification_text": "核销码",
+        "verification_message": "请输入核销码",
+        "verification_mobile_message": "请输入核销码或手机",
+        "unique_message": "唯一标识为空",
+        "not_supported_scan_tips": "H5网页不支持扫码",
+        "copy_link": "复制链接"
+	},
+    "client": {
+        "weixin": "微信",
+        "alipay": "支付宝",
+        "baidu": "百度",
+        "qq": "QQ",
+        "toutiao": "头条/抖音",
+        "kuaishou": "快手"
+    },
+	"pages": {
+		"goods-category": "商品分类",
+		"cart": "购物车",
+		"user": "用户中心",
+		"cart-page": "购物车",
+		"buy": "订单确认",
+		"web-view": "",
+		"login": "登录",
+		"paytips": "安全支付",
+		"goods-search": "商品搜索",
+        "goods-search-start": "商品搜索",
+		"goods-detail": "商品详情",
+		"goods-comment": "商品评价",
+		"user-address": "我的地址",
+		"user-address-save": "地址编辑",
+		"user-order": "我的订单",
+		"user-order-detail": "订单详情",
+		"user-order-comments": "订单评价",
+		"user-favor": "商品收藏",
+		"user-goods-comments": "商品评论",
+		"user-goods-comments-form": "商品编辑",
+		"message": "消息",
+		"user-integral": "积分明细",
+		"user-goods-browse": "我的足迹",
+		"user-orderaftersale": "退款/售后",
+		"user-orderaftersale-detail": "订单售后",
+		"extraction-address": "自提地址",
+		"common-open-setting-location": "",
+		"common-agreement": "",
+		"customview-customview": "自定义页面",
+		"design": "",
+        "diy": "",
+		"error": "温馨提示",
+		"article-category": "所有文章",
+		"article-detail": "文章详情",
+		"setup": "设置",
+		"personal": "个人资料",
+		"password": "密码修改",
+		"logout": "账号注销",
+        "about": "关于我们",
+		"plugins-seckill-index": "限时秒杀",
+		"plugins-coupon-index": "领券中心",
+        "plugins-coupon-detail": "优惠券",
+		"plugins-coupon-shop": "店铺领券中心",
+		"plugins-coupon-user": "我的卡券",
+		"plugins-membershiplevelvip-index": "会员VIP",
+		"plugins-membershiplevelvip-buy": "开通会员",
+		"plugins-membershiplevelvip-user": "我的会员",
+		"plugins-membershiplevelvip-order": "开通订单",
+		"plugins-membershiplevelvip-order-detail": "订单详情",
+		"plugins-membershiplevelvip-profit": "收益明细",
+		"plugins-membershiplevelvip-profit-detail": "收益详情",
+		"plugins-membershiplevelvip-poster": "推广奖励",
+		"plugins-membershiplevelvip-team": "我的团队",
+		"plugins-membershiplevelvip-member-code": "会员码",
+		"plugins-distribution-user": "我的分销",
+		"plugins-distribution-order": "分销订单",
+		"plugins-distribution-order-detail": "订单详情",
+		"plugins-distribution-profit": "收益明细",
+		"plugins-distribution-profit-detail": "收益详情",
+		"plugins-distribution-team": "我的团队",
+		"plugins-distribution-map": "客户分布",
+		"plugins-distribution-recommend-list": "我的推荐宝",
+		"plugins-distribution-recommend-detail": "推荐宝详情",
+		"plugins-distribution-recommend-form": "推荐宝添加/编辑",
+		"plugins-distribution-poster": "推广奖励",
+		"plugins-distribution-extraction": "取货点",
+		"plugins-distribution-extraction-apply": "取货点信息",
+		"plugins-distribution-extraction-order": "取货订单",
+		"plugins-distribution-extraction-switch": "取货点切换",
+		"plugins-distribution-introduce": "等级介绍",
+		"plugins-distribution-promotion-user": "推广用户",
+		"plugins-distribution-promotion-order": "推广订单",
+		"plugins-distribution-visit-list": "客户拜访",
+		"plugins-distribution-visit-form": "客户拜访新增/编辑",
+		"plugins-wallet-user": "我的钱包",
+		"plugins-wallet-recharge": "充值",
+		"plugins-wallet-cash-auth": "余额提现",
+		"plugins-wallet-cash-create": "余额提现",
+		"plugins-wallet-wallet-log-detail": "明细详情",
+		"plugins-wallet-user-recharge-detail": "充值详情",
+		"plugins-wallet-user-cash-detail": "提现详情",
+		"plugins-wallet-user-transfer-detail": "转账详情",
+		"plugins-wallet-payment-code": "钱包付款码",
+		"plugins-wallet-transfer": "转账",
+		"plugins-excellentbuyreturntocash-profit": "优购返现明细",
+		"plugins-excellentbuyreturntocash-profit-detail": "优购返现详情",
+		"plugins-weixinliveplayer-index": "直播",
+		"plugins-weixinliveplayer-search": "直播列表",
+		"plugins-weixinliveplayer-detail": "直播详情",
+		"plugins-exchangerate-currency": "货币切换",
+		"plugins-invoice-invoice": "开票列表",
+		"plugins-invoice-invoice-detail": "发票详情",
+		"plugins-invoice-invoice-saveinfo": "开票编辑",
+		"plugins-invoice-order": "订单开票",
+        "plugins-invoice-recharge": "充值开票",
+		"plugins-signin-user": "签到",
+		"plugins-signin-detail": "签到",
+		"plugins-signin-user-qrcode-detail": "签到码详情",
+		"plugins-signin-user-qrcode-saveinfo": "签到码编辑",
+		"plugins-signin-user-coming-list": "用户签到",
+		"plugins-points-index": "积分商城",
+		"plugins-points-scan": "扫码领积分",
+		"plugins-brand-index": "品牌",
+		"plugins-shop-index": "所有店铺",
+		"plugins-shop-detail": "店铺首页",
+		"plugins-shop-search": "店铺商品搜索",
+		"plugins-shop-design": "",
+		"plugins-shop-favor": "店铺收藏",
+		"plugins-shop-license": "工商资质",
+        "plugins-shop-check": "订单核销",
+		"plugins-activity-index": "所有活动",
+		"plugins-activity-detail": "活动详情",
+		"plugins-label-detail": "标签详情",
+		"plugins-blog-index": "博客",
+		"plugins-blog-search": "博文搜索",
+		"plugins-blog-detail": "博文详情",
+		"plugins-blog-comments": "评论列表",
+		"plugins-blog-user-list": "我的帖子",
+		"plugins-blog-form": "发布博文",
+		"plugins-express-detail": "物流详情",
+		"plugins-realstore-index": "门店",
+		"plugins-realstore-search": "门店搜索",
+		"plugins-realstore-detail": "门店详情",
+		"plugins-realstore-favor": "门店收藏",
+		"plugins-realstore-orderallot-list": "门店订单",
+		"plugins-realstore-orderallot-detail": "门店订单详情",
+		"plugins-realstore-batchorder-list": "批次订单",
+		"plugins-realstore-frequencycard-list": "次卡",
+		"plugins-realstore-frequencycard-used": "次卡使用记录",
+        "plugins-realstore-check": "订单核销",
+		"plugins-binding-index": "组合搭配",
+		"plugins-binding-detail": "组合搭配详情",
+		"plugins-delivery-order": "配送订单",
+		"plugins-delivery-order-detail": "订单详情",
+		"plugins-delivery-logistics": "物流信息",
+		"plugins-ask-index": "问答",
+		"plugins-ask-detail": "问答详情",
+		"plugins-ask-form": "我要提问",
+		"plugins-ask-user-detail": "提问详情",
+		"plugins-ask-user-list": "我的提问",
+		"plugins-ask-goods-list": "问答专区",
+		"plugins-ask-comments": "全部问答",
+		"plugins-intellectstools-goods-comments": "商品评价",
+		"plugins-scanpay-index": "扫码付款",
+		"plugins-scanpay-tips": "支付结果",
+		"plugins-thirdpartylogin-index": "授权登录",
+		"plugins-magic-detail": "详情",
+		"plugins-ordergoodsform-order": "商品表单",
+		"plugins-coin-user": "虚拟币",
+		"plugins-coin-recharge": "充值",
+		"plugins-coin-recharge-pay": "充值支付",
+		"plugins-coin-convert": "转换",
+		"plugins-coin-cash": "提现",
+		"plugins-coin-detail": "明细",
+		"plugins-coin-transfer": "转账",
+		"plugins-coin-transfer-list": "转账明细",
+		"plugins-coin-transaction-list": "交易明细",
+		"plugins-coin-cash-list": "提现明细",
+		"plugins-coin-convert-list": "转换明细",
+		"plugins-coin-recharge-list": "充值明细",
+		"plugins-coin-collection": "收款",
+        "plugins-antifakecode-index": "正品查询",
+        "plugins-giftcard-index": "我的礼品卡",
+        "plugins-giftcard-form": "礼品卡兑换",
+        "plugins-givegift-goods": "购买礼品",
+        "plugins-givegift-receive": "礼品领取",
+        "plugins-givegift-gift": "我的送礼",
+        "plugins-givegift-code": "礼品链接",
+        "plugins-orderresources-orderannex": "订单资源",
+        "plugins-hospital-patient": "就诊人添加/编辑",
+        "plugins-hospital-patient-list": "就诊人列表",
+        "plugins-hospital-prescription": "问诊开方"
+	},
+	"login": {
+		"login": {
+			"725312": "账号密码登录",
+			"tfl656": "确认绑定",
+			"483nho": "返回上一页",
+			"31r6p2": "手机验证码",
+            "8fghjs": "获取手机号码",
+			"p3kxy2": "获取手机号码一键登录",
+			"54l805": "绑定已有账号",
+			"q11t73": "注册账号并绑定",
+			"s51ed9": "已成功登录、请点击返回上一页",
+			"e77788": "登录帐号将自动绑定",
+			"1i4o86": "用户",
+			"n2pv70": "账号",
+			"1p7843": "手机",
+			"p54kf1": "邮箱",
+			"3i05ly": "暂时关闭了登录",
+			"nddg2x": "阅读并同意",
+			"2v11we": "《服务协议》",
+			"l3r4vr": "与",
+			"myno2x": "《隐私权政策》",
+			"i1deai": "确认登录",
+			"t75ee8": "新用户注册",
+			"9d8gqi": "找回密码",
+			"tvl242": "授权自动登录",
+			"9q27d8": "其他登录方式",
+			"t59dho": "暂时关闭了注册",
+			"hvunf8": "确认注册",
+			"zy8tc4": "立即登录",
+			"b347k4": "立即注册",
+			"836o8e": "确认登录授权，为您提供更优质的服务",
+			"pgyv78": "基础数据加载中...",
+			"d76tgh": "如未自动加载则请手动点击加载！",
+			"6fe6ra": "加载基础数据",
+			"28k91h": "手机号码",
+			"t3951j": "验证码",
+			"qe8a37": "用户名/手机/邮箱",
+			"08fchn": "登录密码",
+			"db1rf4": "电子邮箱",
+			"6yfr9g": "登录/注册",
+			"d178m0": "手机/邮箱",
+			"9wx3ch": "设置登录密码",
+			"s665h5": "获取验证码",
+			"jw378f": "授权用户信息",
+			"np9177": "绑定手机",
+			"tgsa4d": "绑定邮箱",
+			"876tdf": "绑定账户",
+			"87yui2": "绑定成功",
+			"158yg2": "手机验证码登录",
+			"r329eu": "邮箱验证码登录",
+			"39hn6v": "账号密码注册",
+			"z13km0": "手机验证码注册",
+			"jc0w0o": "邮箱验证码注册",
+			"8tmyuc": "密码找回",
+			"5p23c6": "登录成功",
+			"btu2c1": "请先同意协议",
+			"no8ts6": "用于完善会员资料",
+			"3nmrg2": "授权失败",
+            "tghjer": "请获取手机号码",
+			"4c5n8o": "请填写手机号码",
+			"xak8g1": "请填写电子邮箱",
+			"ku05ty": "请填写手机或邮箱",
+			"7r5h37": "请输入有效验证码",
+			"24mvbh": "请填写账号",
+			"n24i5u": "剩余",
+			"4306xr": "秒",
+			"01xmab": "请填写验证码",
+			"prqvf1": "授权id不能为空",
+			"yvj88j": "请输入手机号码",
+			"yo6x3p": "请输入电子邮箱",
+			"n7vh75": "请输入账号",
+			"277w03": "请输入密码",
+			"cesl5d": "请输入验证码",
+			"c5wa4u": "登录中...",
+			"g30ew7": "注册中...",
+			"h0515x": "请输入手机或邮箱",
+			"wysg7k": "请设置密码",
+			"4wc3hr": "协议类型有误",
+			"x0nxxf": "协议url地址有误",
+			"li9573": "登录方式未处理"
+		}
+	},
+	"user-order-detail": {
+		"user-order-detail": {
+			"346376": "出货服务",
+			"7lp6gw": "查看位置",
+			"7f8p26": "商品信息",
+			"423rmr": "共",
+			"41ty94": "件 合计",
+			"7xtnjt": "未配置数据",
+			"7dikfm": "取货信息",
+            "0876xf": "快递信息",
+			"o38952": "取货码：",
+			"0f26j2": "订单信息",
+			"ct34n5": "扩展数据",
+			"y9woor": "密钥信息",
+			"hpq62x": "取货码不存在、请联系管理员",
+			"io6p5k": "订单模式",
+			"n18sd2": "订单编号",
+            "yghjkf": "订单商品",
+			"yxwu8n": "订单状态",
+			"23qj7m": "支付状态",
+			"vg4jb1": "订单单价",
+			"2y7l13": "订单总价",
+			"6ub2j0": "优惠金额",
+			"8b18q8": "增加金额",
+			"516tlr": "支付金额",
+			"0e1sfs": "支付方式",
+			"12d445": "快递公司",
+			"2byl8l": "快递单号",
+			"2b5fc8": "用户留言",
+			"h2c78h": "创建时间",
+			"9vivhl": "确认时间",
+			"wn83rn": "支付时间",
+			"1674dc": "发货时间",
+			"0i938r": "收货时间",
+			"1jpv4n": "取消时间",
+			"8o2of3": "关闭时间",
+			"5k6k56": "参数有误",
+			"i876o3": "地址有误",
+            "567ygf": "服务信息",
+            "67ujfr": "服务时长",
+            "gsfw4d": "服务人姓名",
+            "6ygfew": "服务人手机"
+		}
+	},
+	"setup": {
+		"setup": {
+			"x81v6d": "更换手机",
+			"j6skqh": "点击更换",
+			"dfg4wf": "点击绑定",
+			"r7jz13": "修改语言",
+			"42mba7": "地址管理",
+			"5eltza": "点击管理",
+			"t60222": "发票管理",
+			"izg78g": "点击前往",
+			"377uwg": "权限设置",
+			"5493ui": "清除缓存",
+			"f53166": "点击清除",
+			"656fv1": "客服电话",
+			"f25wcx": "点击拨打",
+			"11k15d": "账号注销",
+			"48r261": "注销后无法恢复",
+            "tghrf2": "关于我们",
+			"07o10b": "请先绑定手机",
+			"nwt4o1": "请先登录",
+			"utnr7g": "客服电话有误",
+			"87ytgh": "解绑",
+			"5u59b1": "更换邮箱",
+			"v8438r": "更换密码"
+		}
+	},
+	"article-category": {
+		"article-category": {
+			"gxra15": "浏览量"
+		}
+	},
+	"article-detail": {
+		"article-detail": {
+			"728374": "时间：",
+			"j92ru0": "浏览：",
+			"281s4a": "上一篇：",
+			"uq5814": "下一篇："
+		}
+	},
+	"buy": {
+		"buy": {
+			"70u2vy": " 至 ",
+			"o7722q": "查看地图",
+			"876tgh": "运送方式",
+			"45ovhs": "优惠劵",
+			"58rs1a": "门店次卡",
+			"33fugm": "使用",
+			"4di4i2": "个积分",
+			"q7jq76": "快捷输入",
+			"wx78ju": "合计：",
+			"4884hk": "提交订单",
+			"2c3i88": "不使用优惠劵",
+			"8vqfp3": "不使用次卡",
+			"0pgsrm": "次",
+			"g2vt78": "已选",
+			"inyxpx": "选择",
+			"l1c8q6": "展示型不允许提交订单",
+			"6rk813": "请选择收货地址",
+			"wq7gnb": "请选择取货地址",
+			"553mxo": "请选择优惠券",
+			"80y7sv": "抵扣",
+			"2rhko1": "留言",
+			"718tux": "进入我的订单",
+			"p7e91u": "商品信息有误",
+			"4is2ak": "进入门店订单",
+			"s7rr5s": "时间",
+			"1fi842": "选择时间",
+			"q8u066": "请选择时间",
+            "df3raf": "我的姓名",
+            "hjwerf": "我的电话",
+            "8fghje": "请填写姓名和电话",
+			"hw4l5m": "可选优惠劵",
+			"5iuqow": "张",
+			"4rb08b": "暂无可用优惠劵",
+			"3740ur": "请选择地址",
+			"71kidy": "请选择支付方式",
+			"r79t77": "提交中...",
+			"31616e": "当前模式不允许使用地址",
+			"g7dk3f": "卡种选择",
+			"0s1k23": "立即开通",
+			"ntm2z5": "所有订单",
+			"b3dyo7": "终身",
+			"5lr84j": "购买时长未配置",
+			"5x86n3": "未配置会员等级",
+			"bmueac": "请选择开通时长",
+			"64ml60": "开通时长有误"
+		}
+	},
+	"agreement": {
+		"agreement": {
+			"w38e3v": "尊敬的用户、为了向您提供更优质的服务，在您使用",
+			"hjn568": "小程序前，您需要通过点击【同意】并阅读以下协议内容以表示您充分知悉、理解并同意本温馨提示的相关协议的各项规则，包括我们会在您开启的位置信息提供更契合您需求的页面展示、产品或服务，比如首页向您推荐商品或相关门店及排行榜信息。",
+			"iy7863": "服务用户协议》",
+			"jwi8n1": "隐私权政策》",
+			"062co8": "不同意",
+			"60t34e": "同意"
+		}
+	},
+	"open-setting-location": {
+		"open-setting-location": {
+			"407106": "]权限",
+			"61wezw": "开启相应的权限服务",
+			"6vev38": "获取[",
+			"lult41": "位置信息",
+			"65q4b3": "打开设置页",
+			"hwn386": "位置选择失败"
+		}
+	},
+	"customview": {
+		"customview": {
+			"726k7y": "输入商品名称搜索"
+		}
+	},
+	"error": {
+		"error": {
+			"u697ih": "异常错误"
+		}
+	},
+	"extraction-address": {
+		"extraction-address": {
+			"42v8tv": "距您"
+		}
+	},
+	"goods-category": {
+		"goods-category": {
+			"ico62g": "已选商品",
+			"44f1ww": "去结算",
+			"7e4m68": "没有子分类数据",
+			"5pj8ip": "请先选购商品",
+			"x69aow": "综合",
+			"at5p35": "销量",
+			"283ot0": "热度",
+			"g2u3lf": "价格",
+			"5p4ksj": "最新",
+			"gy7y0w": "不同规格的商品需在购物车减购",
+			"x46kbv": "购物车id有误",
+			"z1eh3v": "限购",
+			"1ox23z": "数量未改变",
+			"o6i1w2": "挑了这么久，真的要清空吗？"
+		}
+	},
+	"goods-comment": {
+		"goods-comment": {
+			"dfmjxd": "综合评分",
+			"1qh8s8": "暂无评分"
+		}
+	},
+	"goods-detail": {
+		"goods-detail": {
+			"1s79t4": "库存",
+			"w3jma9": "优惠券",
+			"u401fi": "规格",
+			"317jp2": "相关门店",
+            "dfge45": "门店介绍",
+            "567uhg": "门店商品",
+			"znz76d": "商品评价",
+			"1rqkjt": "好评率",
+			"6k7808": "我要评价",
+			"k5u755": "问答",
+			"q8e577": "查看全部回答",
+			"7ulh8b": "我要提问",
+			"l7dzv2": "商品参数",
+			"2j44o2": "商品详情",
+			"27wudx": "暂无详情数据",
+			"v2974w": "猜你喜欢",
+			"0gx41x": "无参数数据",
+			"m3op38": "无批发信息",
+			"96y691": "无优惠券信息",
+			"gwwf19": "无相关门店信息",
+			"8ej346": "无相关服务信息",
+			"775ppk": "限时秒杀",
+			"35f378": "暂停销售",
+			"6brk57": "请选择规格",
+			"dco1sc": "收藏",
+			"bogx42": "售价",
+			"3kdgjl": "销售价",
+			"by7052": "已",
+			"tq1976": "url值为空",
+            "uyghj2": "复制值为空",
+			"98v424": "门店数据有误",
+			"721e2h": "事件未处理("
+		}
+	},
+	"goods-search": {
+		"goods-search": {
+			"j8o278": "筛选出",
+			"t9nikq": "条数据",
+			"pxk051": "清除",
+            "4eerty": "产地",
+			"6n8316": "品牌",
+			"v6e5b7": "属性"
+		}
+	},
+	"index": {
+		"index": {
+			"443683": "已结束",
+			"516559": "活动规则",
+			"t8bll8": "最新",
+			"t8bll9": "资讯",
+			"s5r784": "最新购买",
+			"1c17n3": "已回",
+			"75l3l2": "未回",
+			"17vy72": "缺失tab数据！",
+			"i78v36": "回到店铺",
+			"lkld04": "评论:",
+			"r6vv25": "点赞:",
+			"6rsqp1": "所有",
+			"pot64x": "热门",
+			"8t4j95": "推荐商品",
+			"lk0i6c": "我的优惠券",
+			"p4872s": "领券中心",
+			"tbo22p": "加入会员",
+			"z88r5s": "获知会员积分详情",
+			"b46kge": "当前可用",
+			"t26j9z": "积分",
+			"srd2ch": "原始",
+			"u5642g": "积分规则",
+			"qbi72m": "知道了",
+			"i73nwk": "积分明细",
+			"f3l1xt": "商品兑换",
+			"4v5nq5": "兑换",
+			"t3d917": "选择位置",
+			"c5273j": "输入门店名称",
+			"1vf378": "最新门店",
+			"1e582h": "添加备注",
+			"7w75zb": "确定",
+			"6941e7": "收款",
+			"t1o84g": "请输入消费金额",
+			"872w3v": "即将开抢",
+			"399f6c": "秒杀价",
+			"f69r4i": "网络开小差了哦~00home",
+			"slf50q": "授权登录",
+			"rmv185": "若非本人操作，请忽略申请",
+			"n0vnl6": "已登录成功",
+			"63g4m1": "最新直播"
+		}
+	},
+	"logout": {
+		"logout": {
+			"u10002": "确认注销",
+			"9vfzz4": "账号注销后不可恢复、确定继续吗？"
+		}
+	},
+	"paytips": {
+		"paytips": {
+			"679rxu": "支付成功",
+			"jifuu8": "回到首页",
+			"d8m853": "正在处理中",
+			"6y488i": "支付失败",
+			"e732we": "已取消支付",
+			"13v11t": "网络连接出错",
+			"u1153p": "支付结果未知",
+			"6mpsl7": "用户取消支付",
+			"59u769": "其它异常错误"
+		}
+	},
+	"personal": {
+		"personal": {
+			"cw1d8p": "头像",
+			"gw8br3": "昵称",
+			"jibx42": "生日",
+			"6m33c4": "详细地址",
+			"x2fofv": "性别",
+			"44112i": "昵称1~16个字符",
+			"85404s": "请选择生日",
+			"re674n": "详细地址最多30个字符"
+		}
+	},
+	"detail": {
+		"detail": {
+			"324777": "至",
+			"455787": "推荐",
+			"b4f3nw": "活动商品",
+			"ans2p4": "更多活动",
+			"5knxg6": "没有相关商品",
+			"kt41ki": "留言时间:",
+			"e6ga1y": "浏览",
+			"ng628i": "管理员回复",
+			"7rg4bb": "回复时间:",
+			"p7o522": "我的提问",
+			"6026t4": "节省",
+			"32171c": "已失效",
+			"27pmj3": "立即购买",
+			"9624hp": "选择规格",
+			"8618mj": "请选择第",
+			"09e3bx": "个商品规格",
+			"40298g": "第",
+			"5kbjoy": "个商品不可用",
+			"jsj3u8": "请至少选择",
+			"jksm81": "个商品",
+			"1j6yxy": "相关商品",
+			"e439j9": "博文",
+			"j5owf1": "暂无物流信息",
+			"025362": "共有",
+			"0av5r9": "条相关商品",
+			"53m44k": "标签数据不存在",
+			"dor2v9": "营业时间：",
+			"688i26": "导航",
+			"r4124d": "客服：",
+			"54k10s": "长按微信咨询",
+			"vj4nom": "长按line咨询",
+			"q42ger": "商品搜索",
+			"8q6345": "请输入商品关键字",
+			"rdxjvh": "人签到，共",
+			"15i191": "积分，共",
+			"8ua11k": "组队",
+			"25x8ij": "已签到",
+			"mvj266": "立即签到",
+			"31lky7": "我的签到",
+			"p07k62": "今天",
+			"96bwp0": "今日",
+			"we522y": "未",
+			"mqmxbt": "签到，获得",
+			"sx6u43": "规则说明",
+			"6qk085": "签到成功",
+			"ndp2k3": "恭喜您获得",
+			"7itw5w": "立即使用",
+			"6w8t3g": "日",
+			"xtcy73": "一",
+			"w2p2d9": "二",
+			"xt8596": "三",
+			"13s18l": "四",
+			"n5rm3q": "五",
+			"3d23mc": "六",
+			"73rb8q": "年",
+			"zill36": "月",
+			"y2217b": "签到",
+			"4u64dg": "直播状态",
+			"y2639j": "开播时间",
+			"fa8h7j": "海报",
+			"eg25j9": "进入直播",
+			"86g7e1": "未安装微信APP",
+			"9d3o6w": "请在微信小程序中打开",
+			"6xvl35": "生成中...",
+			"fn3w01": "发布",
+			"4w20tq": "操作类型：",
+			"s101d1": "操作数量：",
+			"e30wj1": "原始数量：",
+			"jdour8": "最新数量：",
+			"7fhy2u": "查看更多明细",
+			"yvmu0z": "账户详情"
+		}
+	},
+	"form": {
+		"form": {
+			"s14osm": "添加图片(",
+			"2f52v3": "匿名发布",
+			"4yd066": "提交",
+			"qt0q5u": "请详细描述问题，我们将尽快为您解答！",
+			"bniyyt": "处理错误",
+			"8l3ul5": "用户未登录",
+			"5v5bjs": "请填写内容",
+			"043a10": "是否启用",
+			"5hn8k3": "封面图片",
+			"xy87t8": "描述",
+			"kvr2i3": "SEO标题",
+			"l87ju1": "SEO关键字",
+			"5487bt": "SEO描述",
+			"4vku7u": "帖子分类",
+			"4cbom4": "请选择",
+			"4h814w": "收起更多",
+			"lfwj0g": "展开更多",
+			"2e5rv3": "上传中请稍后",
+			"v19gg8": "请输入标题",
+			"gu3x97": "请选择分类",
+			"adiq70": "请输入内容"
+		}
+	},
+	"goods-list": {
+		"goods-list": {
+			"27nkjm": "的提问",
+			"00n7i3": "问",
+			"rw12i7": "答",
+			"278qr1": "查看全部",
+			"8y3cc7": "个回答",
+			"aem3e6": "收起回答",
+			"nr77jf": "暂无货源"
+		}
+	},
+	"user-detail": {
+		"user-detail": {
+			"o92ral": "提问详情",
+			"k5867n": "联系人",
+			"gfe703": "联系电话",
+			"uy6lrz": "标题",
+			"7cufw6": "内容",
+			"u411r2": "回复内容",
+			"teo6qd": "回复时间"
+		}
+	},
+	"search": {
+		"search": {
+			"723rbx": "其实搜索很简单^_^ !",
+			"e415ir": "未开始",
+			"46g3i2": "直播中",
+			"v60305": "暂停中",
+			"660us5": "其实搜索很简单 ^_^!",
+			"ic9b89": "请输入搜索关键字"
+		}
+	},
+	"user-list": {
+		"user-list": {
+			"yhvl2q": "确定要删除这条帖子吗？"
+		}
+	},
+	"shop": {
+		"shop": {
+			"4q9oe2": "已领取"
+		}
+	},
+	"user": {
+		"user": {
+			"981200": "返利概况",
+			"s3y4ji": "未使用",
+			"pggs6s": "已使用",
+			"528t26": "已过期",
+			"3ks1wi": "您暂无优惠券哦～",
+			"b5cnj1": "取货点",
+			"4rj120": "上级用户",
+			"567lwz": "修改",
+			"67y36w": "基础统计",
+			"rjye50": "人",
+			"q822fj": "返佣统计",
+			"xjxb2v": "去推广",
+			"25f97u": "查询",
+			"iynkpl": "请先输入用户信息搜索！",
+			"2344s8": "申请",
+			"nk3cpq": "输入用户ID/名/昵称/会员码/手机/邮箱",
+			"dcbt21": "自定义",
+			"4141u2": "查询中...",
+			"f5rny5": "请先搜索用户",
+			"n4orgk": "开通会员",
+			"k614v7": "续费会员",
+			"65cc6z": "连续开通",
+			"76dcx6": "推广客户",
+			"95s1ez": "按照原时长和费用续费，确定继续吗？",
+			"mgx9x4": "冻结",
+			"424v6n": "赠送",
+			"29f6n5": "转账",
+			"8752a4": "提现",
+			"91h03v": "付款码",
+			"ki1nor": "电话客服",
+			"2k0227": "退出账号",
+			"3q4p8k": "商品收藏",
+			"57xw84": "我的足迹",
+			"k78280": "我的积分",
+			"9u8e61": "待付款",
+			"66714e": "待发货",
+			"aa1ri3": "退款/售后",
+			"67p34x": "余额"
+		}
+	},
+	"logistics": {
+		"logistics": {
+			"dxu6ql": "配送时间：",
+			"5542tq": "未开始配送",
+			"895ug2": "送达时间：",
+			"76q0ii": "还没有送达"
+		}
+	},
+	"order": {
+		"order": {
+			"725882": "输入订单号/收件人/收件电话",
+            "865029": "异常原因",
+            "jhgfd1": "发货信息",
+            "hbvwq4": "收货信息",
+			"71n22h": "单ID",
+			"232ygr": "单号",
+			"7dxbm5": "电话",
+			"ra8222": "地址",
+			"75ie9c": "详情",
+			"021438": "开始配送",
+			"ip4xo5": "再次配送",
+			"51q275": "完成配送",
+			"fb6dge": "异常",
+			"46q2z7": "上传照片",
+			"o11d44": "最多上传",
+			"9cvj96": "提交完成",
+			"eyir7g": "提交异常",
+			"q4c8j0": "描述最多200个字符",
+			"g23kyj": "异常原因最多200个字符",
+			"psi67g": "删除后不可恢复、继续吗？",
+			"s5cpq5": "确定开始配送订单吗？",
+			"13j20t": "配送中",
+			"7ltibl": "请上传照片",
+			"c69064": "已配送",
+			"hun5n3": "请填写原因",
+			"pjb15r": "待支付",
+			"s8g966": "已支付",
+			"q820hx": "待收货",
+			"15lr5l": "已完成",
+			"330m76": "来源终端",
+			"p3scy0": "头像地址有误",
+			"o411h6": "合并开票",
+			"15k32o": "请先选择数据",
+			"3fr155": "元素参数id有误",
+			"1i873j": "支付",
+			"1k98tk": "已取消",
+			"6390gk": "已关闭",
+			"vvxct1": "开通单号",
+			"vjfki8": "开通时长",
+			"pn78ns": "取消后不可恢复，确定继续吗?",
+			"93j3zq": "无表单数据"
+		}
+	},
+	"order-detail": {
+		"order-detail": {
+			"9er1pc": "基础信息",
+			"36op8f": "订单号",
+            "ygvc34": "商户名称",
+			"x3ge6c": "订单金额",
+			"v52n5r": "退款金额",
+			"8n1f72": "商品数量",
+			"2443o1": "配送状态",
+			"342sfz": "配送时间",
+			"2dw4gd": "完成时间",
+			"r3bg45": "完成描述",
+			"521pp4": "完成照片",
+			"u745i8": "异常时间",
+			"5fq8pr": "派单时间",
+			"9153qn": "订单时间",
+			"pyw6xg": "用户头像",
+			"2d766e": "用户昵称",
+			"w78rgm": "下单时间",
+			"rn4hhi": "类型"
+		}
+	},
+	"extraction": {
+		"extraction": {
+			"suna53": "立即申请",
+			"j0o47u": "申请信息正在审核中...",
+			"60601g": "取货点信息",
+			"48rp75": "编辑信息",
+			"641gp7": "取货订单统计",
+			"wcv68q": "查看取货订单",
+			"53h4fj": "待处理",
+			"wq25fk": "已处理",
+			"864dtt": "当前状态也解约，可重新编辑数据提交审核。",
+			"11825x": "申请信息审核失败",
+			"w6hg74": "原因："
+		}
+	},
+	"extraction-apply": {
+		"extraction-apply": {
+			"u439pg": "logo图片",
+			"bflosr": "建议300x300px",
+			"9t81k8": "别名",
+			"cy87k6": "省市区",
+			"liqbru": "请先选择省份",
+			"r4q86m": "请先选择城市",
+			"47v7m0": "地理位置",
+			"8831v6": "请选择地理位置",
+			"5y2yzu": "注意：编辑信息将重新审核后方可生效",
+			"wt1w0m": "别名格式最多 16 个字符",
+			"73efnt": "联系人格式 2~16 个字符之间",
+			"qixk24": "座机 或 手机",
+			"gxo73a": "详细地址格式 1~80 个字符之间",
+			"s3h5o3": "请选择省",
+			"4s4s15": "请选择市",
+			"fk4gw5": "请选择区/县",
+			"4s229b": "请先绑定手机号码",
+			"m3xdif": "请先授权用户信息",
+			"h8f437": "获取数据失败",
+			"fo7y6c": "省份获取失败",
+			"b6qg7b": "城市获取失败",
+			"5s5734": "区/县获取失败",
+			"q15b4n": "请填写联系人",
+			"3or25c": "请填写联系电话",
+			"m99d2g": "请选择省份",
+			"03587o": "请选择城市",
+			"pt8436": "请选择区县",
+			"v1g617": "请填写详细地址",
+			"rm14pu": "数据需重新审核后方可生效"
+		}
+	},
+	"extraction-order": {
+		"extraction-order": {
+			"2y7lq1": "取货",
+			"3m038g": "取货码",
+			"xb4044": "搜索条件",
+			"suo4oz": "请输入取货码",
+			"kuqvlv": "订单号/取货码",
+			"znufs8": "请输入取件码",
+			"hbj4y7": "操作数据有误"
+		}
+	},
+	"extraction-switch": {
+		"extraction-switch": {
+			"w94x36": "距离",
+			"613b58": "数据有误"
+		}
+	},
+	"introduce": {
+		"introduce": {
+			"017d67": "等级证书",
+			"el4ib2": "返佣比例",
+			"syf66q": "一级",
+			"q4t9kl": "二级",
+			"e5os6e": "三级",
+			"d7kle4": "等级规则",
+			"5t5vzi": "无条件"
+		}
+	},
+	"map": {
+		"map": {
+			"ivy154": "下单总数",
+			"557z8x": "查看订单"
+		}
+	},
+	"poster": {
+		"poster": {
+			"673605": "点击复制链接地址",
+			"rbdj4b": "海报分享",
+			"m54q3e": "保存海报后，发送给微信好友/群、QQ好友/群，分享到分朋友圈，微博等进行推广，轻轻松松赚返利！",
+			"b5i123": "查看长按保存",
+			"hk8c9p": "生成",
+			"9y4bwq": "二维码分享",
+			"h212v8": "保存二维码后，发送给微信好友/群、QQ好友/群，分享到分朋友圈，微博等进行推广，轻轻松松赚返利！",
+			"j3qv45": "查看二维码长按保存",
+			"r534xd": "链接分享",
+			"vn36y7": "复制以下链接，发送给微信好友/群、QQ好友/群，分享到分朋友圈，微博等进行推广，轻轻松松赚返利！",
+			"eu3j21": "宣传图片地址有误"
+		}
+	},
+	"profit": {
+		"profit": {
+			"3c7zmg": "待生效",
+			"67o785": "待结算",
+			"l5knxu": "已结算",
+			"utg512": "收益金额",
+			"6a7t71": "当前级别",
+			"19a8l6": "订单详情",
+			"4r88cp": "立即结算",
+			"8jqr78": "生效中",
+			"nk58v6": "有效金额",
+			"vuvz6g": "返现金额",
+			"5c7sof": "订单id有误",
+			"7y47sb": "返佣金额"
+		}
+	},
+	"profit-detail": {
+		"profit-detail": {
+			"kn8yye": "结算状态",
+			"x28rw5": "订单支付状态",
+			"jkrvf3": "结算时间",
+			"3jg81h": "返佣规则"
+		}
+	},
+	"promotion-order": {
+		"promotion-order": {
+			"6rs63v": "新增客户总GMV",
+			"iwa646": "订单总数",
+			"2p5215": "订单总GMV"
+		}
+	},
+	"promotion-user": {
+		"promotion-user": {
+			"62c8m1": "电话",
+			"i2rf31": "用户订单",
+			"o6qi74": "推广用户",
+			"kx7595": "已消费用户",
+			"2ey5t1": "未消费用户",
+			"852zib": "新增客户",
+			"h8mx3e": "新增客户(有效)",
+			"fvbq25": "新增客户(需复购)",
+			"2g7enc": "消费订单",
+			"32bf15": "消费金额",
+			"76748p": "最后下单时间",
+			"u43380": "下级订单",
+			"8n4tr3": "下级消费",
+			"1gc3ny": "下级最后下单时间",
+			"3l1187": "下级用户",
+			"g5332w": "未下单",
+			"8i641g": "已下单"
+		}
+	},
+	"recommend-detail": {
+		"recommend-detail": {
+			"265vyu": "起购",
+			"2sis3v": "库存数量"
+		}
+	},
+	"recommend-form": {
+		"recommend-form": {
+			"57zrl5": "图标",
+			"3vk50b": "建议100*100px",
+			"5ws7m3": "关联商品",
+			"q536vp": "移除",
+			"27goz3": "+ 选择商品",
+			"6rlju7": "当前展示",
+			"q4qr64": "标题格式1~60个字符",
+			"29au77": "描述格式最多200个字符",
+			"203itn": "商品分类",
+			"h5v45f": "请输入商品名称",
+			"20m5gj": "请先搜索数据！",
+			"7gc30l": "全部分类",
+			"yd3833": "请填写标题",
+			"31k41l": "请选择商品",
+			"e5k407": "搜索中...",
+			"145ci4": "选择成功",
+			"ocg49p": "已存在选择列表"
+		}
+	},
+	"recommend-list": {
+		"recommend-list": {
+			"x74z3o": "商品",
+			"78n1ly": "访问",
+			"54d418": "删除后不可恢复，确定继续吗?",
+			"w9460o": "不了"
+		}
+	},
+	"team": {
+		"team": {
+			"784249": "注册时间：",
+			"i040fg": "反向",
+			"2ny6k1": "下单时间：",
+			"2i4k79": "是否下单：",
+			"3l538c": "重置",
+			"pcaom3": "开始时间",
+			"iee9bp": "结束时间",
+			"6h2l64": "加入时间"
+		}
+	},
+	"visit-form": {
+		"visit-form": {
+			"0su017": "拜访内容",
+			"6l81lz": "拜访照片",
+			"e9r65a": "拜访内容,最多230个字符",
+			"6f63it": "请选择客户",
+			"5k455y": "请填写拜访内容",
+			"56vk4m": "请上传拜访照片"
+		}
+	},
+	"visit-list": {
+		"visit-list": {
+			"q76du4": "拜访描述",
+			"4z367h": "拜访图片"
+		}
+	},
+	"goods-comments": {
+		"goods-comments": {
+			"31ees6": "商品评分",
+			"6p942c": "请输入您的评价",
+			"pe5p52": "请选择评分",
+			"1wut9j": "请输入评价",
+			"s65197": "管理员回复：",
+			"1p1r2e": "此商品暂时还没有评价哦~"
+		}
+	},
+	"invoice": {
+		"invoice": {
+			"p3dmd2": "订单开票",
+            "bh8yt3": "充值开票",
+			"l3832z": "业务类型",
+			"hoenw8": "申请类型",
+			"j04kjc": "发票类型",
+			"fvuc4p": "发票金额",
+			"y724c7": "发票抬头"
+		}
+	},
+	"invoice-detail": {
+		"invoice-detail": {
+			"s70kj4": "申请信息",
+			"1s2f0g": "电子发票",
+			"4tu3v3": "可点击发票名称复制后、到浏览器打开地址下载发票。",
+			"rrfex6": "状态",
+			"p73963": "发票内容",
+			"41qbu6": "企业开户行名称",
+			"3a9459": "企业开户帐号",
+			"2g7t23": "企业联系电话",
+			"6k6sov": "企业注册地址",
+			"7159m0": "收件人姓名",
+			"f2222p": "收件人电话",
+			"q8l3zj": "收件人地址",
+			"rpdwd3": "拒绝原因",
+			"2000a0": "快递名称"
+		}
+	},
+	"invoice-saveinfo": {
+		"invoice-saveinfo": {
+			"x8hhiv": "企业统一社会信用代码或纳税识别号",
+			"t3i3e3": "请选择发票类型",
+			"k31t2s": "请选择申请类型",
+			"i73t3c": "请选择发票内容",
+			"x461e0": "发票抬头、最多200个字符",
+			"924cag": "企业统一社会信用代码或纳税识别号、最多160个字符",
+			"ymvw6b": "企业开户行名称、最多200个字符",
+			"664qc7": "企业开户帐号、最多160个字符",
+			"bbseo1": "企业联系电话 6~15 个字符",
+			"85735j": "企业注册地址、最多230个字符",
+			"gsc7dy": "收件人姓名格式 2~30 个字符之间",
+			"bp8822": "收件人电话 6~15 个字符",
+			"u7h724": "收件人地址、最多230个字符",
+			"d3qbe1": "电子邮箱、最多60个字符",
+			"vaw647": "备注最多230个字符",
+			"89815t": "开票",
+			"004t56": "添加",
+			"dl11n1": "发票金额必须大于0",
+			"r13p43": "请填写发票抬头、最多200个字符",
+			"ws4wbb": "请填写企业统一社会信用代码或纳税识别号、最多160个字符",
+			"87itn8": "请填写企业开户行名称、最多200个字符",
+			"01lw93": "请填写企业开户帐号、最多160个字符",
+			"414ihr": "请填写企业联系电话 6~15 个字符",
+			"g3yh32": "请填写企业注册地址、最多230个字符",
+			"4xy6xi": "请填写收件人姓名格式 2~30 个字符之间",
+			"quhnk0": "请填写收件人电话 6~15 个字符",
+			"kq77u3": "请填写收件人地址、最多230个字符"
+		}
+	},
+	"member-code": {
+		"member-code": {
+			"oc4x18": "如遇到扫码失败请将屏幕调至最亮重新扫码",
+			"26bu38": "会员码",
+			"x58gqu": "钱包付款码",
+			"yj6g3a": "去登录",
+			"kx4yk8": "会员码为空"
+		}
+	},
+	"batchorder-list": {
+		"batchorder-list": {
+			"25sh5e": "进行中"
+		}
+	},
+	"frequencycard-list": {
+		"frequencycard-list": {
+			"cgy327": "使用记录",
+			"954ewh": "有效",
+			"8x98g7": "暂停",
+			"5n3ums": "结束",
+			"n36x3w": "关闭",
+			"cx75t7": "可用次数",
+			"3m1w12": "已用次数",
+			"89t8am": "起始时间"
+		}
+	},
+	"frequencycard-used": {
+		"frequencycard-used": {
+			"538686": "扣除次数",
+			"xjmepo": "描述说明",
+			"aod4pc": "操作人员"
+		}
+	},
+	"orderallot-detail": {
+		"orderallot-detail": {
+			"81jvw1": "订单类型"
+		}
+	},
+	"orderallot-list": {
+		"orderallot-list": {
+			"w2w2w4": "收货",
+			"6m73j2": "批次",
+			"b13k5r": "次卡",
+			"w2t242": "物流",
+			"285ir2": "服务中",
+			"x5l17j": "已接收",
+			"o3ouqv": "请确认已收到货物或已完成，操作后不可恢复，确定继续吗?"
+		}
+	},
+	"tips": {
+		"tips": {
+			"0azfc3": "支付总额",
+			"579u02": "退出页面"
+		}
+	},
+	"design": {
+		"design": {
+			"882220": "至{{shop.close_week_name}}，{{shop.open_time}}-",
+			"ay7m42": "搜全站",
+			"21kak7": "在线客服",
+			"745kx2": "分",
+			"wtx1l8": "查看商品分类",
+			"83occ4": "暂无数据",
+			"ses9m2": "请输入您搜索的商品关键字",
+			"i7725u": "搜本店",
+			"gv16tj": "至"
+		}
+	},
+	"user-coming-list": {
+		"user-coming-list": {
+			"xkwnl8": "奖励积分",
+			"sq4379": "签到时间"
+		}
+	},
+	"user-qrcode-detail": {
+		"user-qrcode-detail": {
+			"b5ilz3": "天，翻",
+			"22zc5y": " - {{ detail.specified_time_reward.time_end }}，额外奖励 ",
+			"18680z": "连续签到翻倍奖励",
+			"dupsnc": "连续",
+			"c8e5of": "倍",
+			"37bh73": "指定时段额外奖励",
+			"6l7r99": "时段",
+			"mjfygy": "邀请人奖励",
+			"pb2e32": "受邀人奖励",
+			"do23j6": "联系人姓名",
+			"5k2ibd": "联系人电话",
+			"911a61": "联系人地址"
+		}
+	},
+	"user-qrcode-saveinfo": {
+		"user-qrcode-saveinfo": {
+			"xa2k42": "联系人姓名格式 2~30 个字符之间",
+			"e9ko33": "联系人电话 6~15 个字符",
+			"bbxaw6": "联系人地址、最多230个字符",
+			"jw2h8l": "签到码",
+			"84g5t6": "请填写联系人姓名格式 2~30 个字符之间",
+			"1tilke": "请填写联系人电话 6~15 个字符",
+			"5m2752": "请填写联系人地址、最多230个字符"
+		}
+	},
+	"cash-auth": {
+		"cash-auth": {
+			"b39a25": "选择身份认证方式",
+			"582q6x": "请选择认证账号",
+			"d318op": "请输入安全验证码",
+			"0j8388": "操作提示",
+			"59iipw": "1. 请选择 “",
+			"8qcte7": "绑定邮箱",
+			"t8y3r7": "“ 或 ”",
+			"5wbuuy": "“ 方式其一作为安全校验码的获取方式并正确输入。",
+			"r569wz": "2. 如果您未绑定手机或者邮箱已失效，可以绑定手机后通过接收手机短信完成验证。",
+			"35837l": "3. 如果您未绑定邮箱或者已失效，可以绑定邮箱后通过接收邮件完成验证。",
+			"q2a553": "4. 请正确输入下方图形验证码，如看不清可点击图片进行更换，输入完成后进行下一步操作。",
+			"lh6bjr": "5. 收到安全验证码后，请在10分钟内完成验证。",
+			"ob4gn0": "6. 安全验证成功后，请在30分钟内完成提现申请。",
+			"d2ng16": "绑定手机号码",
+			"l2i4s8": "当前有效金额",
+			"27b4w5": "提现最低金额",
+			"2hc312": "验证码格式 4 位数字",
+			"5dcsbd": "请选择认证方式"
+		}
+	},
+	"cash-create": {
+		"cash-create": {
+			"qg404q": "提现金额",
+            "9ugssd": "手续费",
+			"5o1q52": "赠送金额不可提现",
+			"iaw845": "可提现金额",
+			"1dbkw2": "可用金额",
+			"162f7o": "赠送总额",
+			"yu2raf": "提现方式",
+            "5mmir5": "收款平台",
+			"14n20v": "强烈建议优先填写国有4大银行(中国银行、中国建设银行、中国工商银行和中国农业银行) 请填写详细的开户银行分行名称，虚拟账户如支付宝、财付通、微信 直接填写 相应的名称 即可。",
+			"36756z": "收款账号",
+			"748r3i": "银行账号或虚拟账号(支付宝、财付通、微信等账号)",
+			"1xtff6": "开户人姓名",
+			"445m7n": "收款账号的开户人真实姓名",
+			"858o54": "安全验证已超时，请重新验证再操作",
+			"ke15x5": "返回重新申请提现",
+			"cymbdz": "提现金额，最低",
+			"27ky42": "，最高",
+			"u2rnlw": "收款平台格式 1~60 个字符之间",
+			"s72t44": "收款账号格式 1~60 个字符之间",
+			"f4605e": "开户人姓名格式 1~30 个字符之间",
+			"6t7x9u": "请填写提现金额",
+            "thjid2": "请选择提现方式",
+			"vbr59h": "请填写收款平台",
+			"0mn186": "请填写收款账号",
+			"c7h4mu": "请填写开户人姓名",
+			"724kn8": "提现不能低于",
+			"duo0ts": "提现不能大于",
+            "678iu2": "预计手续费"
+		}
+	},
+	"payment-code": {
+		"payment-code": {
+			"b74qxe": ")秒后自动刷新付款码"
+		}
+	},
+	"recharge": {
+		"recharge": {
+			"3shyx4": "账号余额",
+			"60k2v3": "选择充值金额",
+			"qbw1x2": "金额",
+			"x27b25": "立即充值",
+			"4fm61g": "充值说明",
+			"otwkjn": "充值",
+			"23zwpz": "其他",
+			"73f4v9": "请输入充值金额",
+			"lh6k86": "充币地址",
+			"e5rblc": "充币网络",
+			"eb6722": "选择充值币",
+			"k1e7hs": "其他数量",
+			"e8n7ul": "充值说明：",
+			"0i541i": "请输入充值数量",
+			"5q02ar": "请选择或输入充值数量"
+		}
+	},
+	"transfer": {
+		"transfer": {
+			"2q274j": "转账金额",
+			"9xe2bl": "我的余额：",
+			"t53ary": "请输入用户ID/名/码/手机/邮箱",
+			"g22y5v": "请输入转账金额",
+			"2bwh7h": "请输入转账备注信息",
+			"1aijp1": "请输入收款账号",
+			"x4mzo9": "请输入正确的收款账号",
+            "678uyg": "转账单号",
+			"4g21cu": "收款人",
+			"t36tk2": "转账备注",
+			"b4m5p3": "转账币",
+			"3i4h4z": "立即转账",
+			"d15853": "请输入转账币"
+		}
+	},
+	"user-cash-detail": {
+		"user-cash-detail": {
+			"e8a3e8": "提现单号",
+			"wyad6w": "提现状态",
+			"j5s3u6": "转账平台",
+			"53k647": "转账姓名",
+			"m556tl": "转账账户",
+			"i308o1": "打款金额",
+			"451xxt": "打款时间"
+		}
+	},
+	"user-recharge-detail": {
+		"user-recharge-detail": {
+			"ch84a8": "充值单号",
+			"dq5v2u": "充值状态",
+			"7272ia": "充值金额"
+		}
+	},
+	"user-transfer-detail": {
+		"user-transfer-detail": {
+			"x17599": "转账时间"
+		}
+	},
+	"wallet-log-detail": {
+		"wallet-log-detail": {
+			"tdf3wo": "操作类型",
+			"744os7": "金额类型",
+			"ruq60b": "操作金额",
+			"4q7pfq": "原始金额",
+			"r814ne": "最新金额",
+			"0ghn6g": "变更说明",
+			"i2kze7": "操作时间"
+		}
+	},
+	"user-address": {
+		"user-address": {
+			"e8qg73": "默认",
+			"3i4x2r": "添加新地址",
+			"1rwt3l": "导入系统地址",
+			"7r29v8": "收货人：",
+			"2nmsi1": "联系电话：",
+			"s150l6": "收货地址："
+		}
+	},
+	"user-address-save": {
+		"user-address-save": {
+			"231435": "标签",
+			"620370": "地址ID有误",
+			"5yhgps": "姓名",
+			"h8f148": "地区",
+			"13rpdw": "点击选择地理位置",
+			"mb7cjx": "检索",
+			"4rc269": "地址",
+			"s3o1p5": "识别",
+			"42l857": "地址粘贴板",
+			"g43klm": "设为默认地址",
+			"3w7r14": "身份证姓名",
+			"0y1vl6": "身份证号码",
+			"761ek6": "身份证照片",
+			"c811s5": "请填使用身份证原件进行拍摄，图片清晰",
+			"wii4sp": "联系人2~16个字符",
+			"65507o": "座机或手机",
+			"he685s": "地址编号",
+			"vdkv32": "详细地址1~80个字符",
+			"b32r6v": "粘贴整段地址，自动拆分姓名、电话及地址",
+			"l6vjlm": "请输入标签名称",
+			"c73v42": "请填写真实姓名",
+			"c742c8": "请填写身份证号",
+			"t1loj5": "家",
+			"6t396c": "公司",
+			"34rqp8": "学校",
+			"2pey0m": "省份信息失败",
+			"7w01kd": "表单名称类型有误",
+			"z687lv": "请先输入地址信息",
+			"lrlmxf": "请填写身份证姓名",
+			"0x8i97": "请填写身份证号码",
+			"224l36": "请上传身份证正面照片",
+			"glf52g": "请上传身份证背面照片",
+			"wkfi45": "请输入数据"
+		}
+	},
+	"user-order": {
+		"user-order": {
+			"twc3r7": "评论",
+			"lp1v28": "催催",
+			"ht65c9": "子单",
+			"9l47b6": "表单",
+            "fyuikn": "资源",
+			"3l2jr5": "回购",
+			"7571p2": "合并支付",
+			"hp123x": "待取货",
+			"f5qqhu": "催促成功",
+			"a3c81d": "加购物车",
+			"5o756f": "直接购买"
+		}
+	},
+	"user-order-comments": {
+		"user-order-comments": {
+			"uboc44": "匿名",
+			"r9r3h0": "宝贝满足你的期待吗？说说它的优点和美中不足的地方吧",
+			"si255j": "非常差",
+			"42b0x1": "差",
+			"72mov3": "一般",
+			"16cmv6": "好",
+			"e4i88f": "非常好",
+			"021i2d": "你写的评论会以匿名的形式展现",
+			"h2ci83": "你写的评论会以昵称的形式展现",
+			"34ne4c": "请先评分",
+			"x6fwbf": "还有未评分",
+			"8f303u": "请填写评论内容",
+			"39y6ym": "评论内容 6~230 个字符之间",
+			"488j15": "每项评论图片不能超过3张"
+		}
+	},
+	"user-orderaftersale": {
+		"user-orderaftersale": {
+			"10c251": "退货",
+			"3wggcu": "待确认",
+			"1kcn16": "待退货",
+			"2kzi0t": "待审核",
+			"1p5456": "已拒绝"
+		}
+	},
+	"user-orderaftersale-detail": {
+		"user-orderaftersale-detail": {
+			"uuhf62": "立即退货",
+			"00je4f": "退货地址：",
+			"4y2c1l": "凭证",
+			"bprwq9": "退款原因",
+			"85pnkf": "商品件数",
+			"84upo4": "数量不能大于",
+			"1252if": "不能大于",
+			"9p6b1y": "退款说明",
+			"4y9355": "上传凭证",
+			"1l42ms": "最多上传3张图片",
+			"21icul": "请选择原因",
+			"9kvu52": "请输入退款金额",
+			"4f8u0c": "退款说明最多200个字符",
+			"6d14hq": "请输入快递名称",
+			"8tt862": "请输入快递单号",
+			"50cm8m": "退款类型",
+			"17j4cy": "当前状态",
+			"r2oy43": "申请原因",
+			"c53k23": "退货数量",
+			"5t586p": "退款方式",
+			"bifwmx": "退货时间",
+			"8n414b": "审核时间",
+			"23v6rp": "请选择操作类型",
+			"dn3423": "请选择退货数量",
+			"c9e2ms": "请填写快递名称",
+			"ld10pm": "请填写快递单号"
+		}
+	},
+	"ask-comments": {
+		"ask-comments": {
+			"2zlnb5": "评论(",
+			"du7rcv": "点赞(",
+			"6l6vz7": "字",
+			"3fcnme": "回复(",
+			"ymmd24": "条回复",
+			"dfhg54": "查看更多回复",
+			"5401r1": "条评论",
+			"4l77wt": "查看更多评论",
+			"8sjar6": "回复 @",
+			"m67961": "期待您的发言...",
+			"3o1rq6": "已超过最大输入字符限制"
+		}
+	},
+	"ask-comments-goods": {
+		"ask-comments-goods": {
+			"xl51n6": "条回答",
+			"g6mc44": "有疑问就问问其他同学吧～"
+		}
+	},
+	"binding-list": {
+		"binding-list": {
+			"kh7951": "购买",
+			"2u4v35": "收起",
+			"91d60h": "展开"
+		}
+	},
+	"bottom-line": {
+		"bottom-line": {
+			"44bct2": "我是有底线的"
+		}
+	},
+	"cart": {
+		"cart": {
+			"v37ow8": "商城",
+			"09gl3g": "门店",
+			"wb5465": "去逛逛",
+			"pxjwv8": "全选",
+			"3kr74b": "优惠:",
+			"n76213": "增加:",
+			"4tbj4s": "查看明细",
+			"7gdej1": "附近门店",
+			"h63814": "无门店信息",
+			"t41i4x": "金额明细",
+			"miti3i": "件商品",
+			"9s0l57": "共减",
+			"qh35gz": "共加",
+			"j8on74": "购物车空空如也",
+			"31h34v": "立即咨询",
+			"2wfu7o": "请绑定手机号码",
+			"3v6ulk": "挑了这么久，真的要删除吗？",
+			"8q2yej": "请先滑动要操作的数据",
+			"9g81jk": "数据不存在",
+            "8tt78i": "加入收藏",
+			"87rfg3": "取消收藏",
+            "346c25": "收藏成功",
+			"21051p": "收藏失败",
+			"3sy0mp": "请先选择商品"
+		}
+	},
+	"coupon-card": {
+		"coupon-card": {
+			"j318xx": "暂无type参数",
+			"m9316y": "去使用"
+		}
+	},
+	"goods-batch-buy": {
+		"goods-batch-buy": {
+			"9ectyf": "种",
+			"geq82x": "金额：",
+			"ypby1k": "无相关信息",
+			"7tp1tc": "操作事件类型有误",
+			"dsfd98": "无库存"
+		}
+	},
+	"goods-buy": {
+		"goods-buy": {
+			"ufdm25": "规格数据有误",
+			"737wzz": "购买数量",
+			"4maexq": "操作事件类型有误("
+		}
+	},
+	"nav-more": {
+		"nav-more": {
+			"h9g4b1": "点击收起"
+		}
+	},
+	"no-data": {
+		"no-data": {
+			"1u202v": "暂时无网络连接",
+			"imw8f1": "请您检查是否系统设置-＞蜂窝移动网络中是否允许【",
+			"q87572": "】APP使用蜂窝移动网络或无线局域网"
+		}
+	},
+	"online-service": {
+		"online-service": {
+			"4l6k22": "客服"
+		}
+	},
+	"payment": {
+		"payment": {
+			"973g2e": "无支付信息",
+			"z3y296": "尝试点击去支付",
+			"iu792d": "付款详情",
+			"25r53g": "立即付款",
+			"058a46": "没有支付方式",
+			"x6d585": "请先选择支付方式",
+			"011cj4": "操作后将立即扣除支付费用、确认继续吗？",
+			"7ihx9u": "支付方式有误",
+			"e1f54e": "请求中...",
+			"vhx5dv": "支付类型有误",
+			"597s8b": "支付组件接口不能为空",
+			"t4d687": "支付服务未配置",
+			"bv637f": "支付未定义",
+			"4dszme": "请使用真机操作、或小程序基础版本太低！",
+			"k2i010": "支付成功后、请不要重复支付、如果订单状态未成功请联系客服处理",
+			"2rw3qh": "支付方式还未适配",
+			"sdfs31": "是否已完成支付？"
+		}
+	},
+	"realstore-cart": {
+		"realstore-cart": {
+			"v437n6": "没有已加购的商品？",
+			"6bmc34": "切换",
+			"d1kk7x": "请选择下单类型",
+			"2dc65q": "请先加购商品",
+			"50lf68": "加载中",
+			"b27ln3": "加入购物车",
+			"47h2a0": "请求失败，请重试！",
+			"miv944": "起步",
+			"20epzm": "商品数据有误",
+			"8tzr7l": "门店信息有误",
+            "87tty2": "选择门店",
+            "76rfgh": "选择其他门店",
+            "r67uyg": "进入门店"
+		}
+	},
+	"share-popup": {
+		"share-popup": {
+			"h04xiy": "一键分享给好友、群聊",
+			"rhs2c5": "一键分享给微信好友、群聊",
+			"mv9l10": "一键分享给微信朋友圈",
+			"f08y38": "一键分享到微信收藏夹",
+			"1242w9": "一键分享到QQ好友、空间",
+			"1oh013": "点击复制地址分享给好友、群聊",
+			"dcp2qu": "生成海报，分享到朋友圈、好友及群聊"
+		}
+	},
+	"user-qrcode": {
+		"user-qrcode": {
+			"8p57v3": "组队签到"
+		}
+	},
+	"switch": {
+		"switch": {
+			"924s7v": "开",
+			"g142o6": "关",
+			"447u86": "提示",
+			"8w5ok6": "您确定要将其调整为{0}吗？"
+		}
+	},
+	"time-select": {
+		"time-select": {
+			"8k5rr7": "周日",
+			"17353c": "周一",
+			"40rmq4": "周二",
+			"q35g41": "周三",
+			"v213l8": "周四",
+			"8q3q2x": "周五",
+			"9605m5": "周六",
+			"h7l2xj": "日(",
+			"cq522p": "今天(",
+			"ub264m": "明天("
+		}
+	},
+	"upload": {
+		"upload": {
+			"b33f08": "上传图片"
+		}
+	},
+	"user-base": {
+		"user-base": {
+			"g5663y": "获取您的",
+			"913g4e": "获取用户",
+            "yujeaf": "完善个人资料，主要用于向用户提供 具有辨识度的用户中心界面",
+			"o19lj3": "输入昵称1~16个字符",
+			"8u9on2": "支付宝用户",
+			"t8i9l4": "百度用户",
+			"0imw74": "头条用户",
+			"27q5af": "QQ用户",
+			"211pk4": "快手用户",
+			"5x8o43": "微信用户",
+			"gzc3y4": "请上传头像",
+			"lro9u7": "请填写昵称"
+		}
+	},
+	"user-cash": {
+		"user-cash": {
+			"3v1gzc": "未打款",
+			"t7gtu0": "已打款",
+			"x47iu3": "打款失败"
+		}
+	},
+	"user-recharge": {
+		"user-recharge": {
+			"8y9dki": "去支付"
+		}
+	},
+	"wallet-log": {
+		"wallet-log": {
+			"9p865e": "减少",
+			"1nm6c2": "增加"
+		}
+	},
+	"shopxo-uniapp": {
+		"app": {
+			"5a7r0v": "本机号码一键登录",
+			"33k281": "我已阅读并同意",
+			"8l688n": "并使用本机号码登录",
+			"28r5dr": "服务协议",
+			"lb493k": "隐私权政策",
+			"ch1pd2": "本机号码组件调起失败",
+			"5y1c52": "事件值格式有误",
+			"t754n6": "提示信息为空 alert",
+			"iq66pg": "请复制地址到网页地图中查看！",
+			"v2j475": "坐标有误",
+			"3m1gbe": "uuid缓存失败",
+			"1244fe": "未知数据",
+			"r5ts62": "复制成功",
+			"r539kf": "复制内容为空",
+			"qm8548": "图片地址为空",
+			"gbiac6": "请打开授权",
+			"3eqv71": "请前往小程序使用完整服务",
+			"08cg8y": "客服地址有误",
+			"0gwt7z": "清除成功",
+			"87yghj": "退出成功",
+			"di6v5t": "请先获取授权",
+			"nu5058": "不支持地理位置选择！",
+			"4v6q86": "未选择位置",
+            "tghyu3": "当前位置"
+		}
+	},
+	"password": {
+		"password": {
+			"338433": "请确认新密码",
+			"xyekjf": "确认修改",
+			"4e24j1": "请输入当前密码",
+			"1lwiaz": "请输入新密码",
+			"3pp6t7": "确认新密码"
+		}
+	},
+	"cash": {
+		"cash": {
+			"zmhf3n": "可提现币",
+			"f6p4hm": "提现数量",
+			"6oc6e7": "全部提现",
+			"ucg8e2": "提币地址",
+			"h9i16y": "提币网络",
+			"1g49wo": "无网络数据",
+			"42b37m": "申请提现",
+			"i1f373": "请输入提币地址",
+			"g05p4g": "请输入提现备注信息",
+			"en6vsa": "网络数据为空、请联系客服！",
+			"w01qjc": "请输入提现数量"
+		}
+	},
+	"cash-list": {
+		"cash-list": {
+			"e6pffe": "提现单号：",
+			"2w20g2": "平台：",
+			"23ii8s": "充值网络：",
+			"714g2h": "充值地址：",
+			"1o8838": "提现币：",
+			"s7l616": "账户种类",
+			"t66tu3": "提现类型",
+			"311tt2": "网络类型",
+			"n74r94": "账户",
+			"2g251t": "网络",
+			"8hrc73": "确定删除这条提现订单吗"
+		}
+	},
+	"collection": {
+		"collection": {
+			"856g12": "复制",
+			"9p43lu": "扫一扫向对方发起转账，请核对认真账户后再确认转账！"
+		}
+	},
+	"convert": {
+		"convert": {
+			"o56h58": "余额:",
+			"4kcix6": "立即转换",
+			"327y2v": "转出和接收选择不能相同",
+			"vyjy7s": "请输入转换币"
+		}
+	},
+	"convert-list": {
+		"convert-list": {
+			"733518": "转入账户：",
+			"8813rd": "转换单号：",
+			"c374ec": "转出余额：",
+			"6mxu85": "转出账户：",
+			"6347mw": "最新币：",
+			"9oy325": "备注：",
+			"q48666": "发起账户",
+			"47646p": "接收账户"
+		}
+	},
+	"recharge-list": {
+		"recharge-list": {
+			"6b9399": "充值单号：",
+			"epd531": "充值币：",
+			"l5g8m1": "确定删除这条充值订单吗"
+		}
+	},
+	"recharge-pay": {
+		"recharge-pay": {
+			"lutmsv": "支付凭证",
+			"1a5vqk": "（最多上传10张图）",
+			"wu49vk": "支付备注",
+			"95pfkd": "请输入备注",
+			"v5fok8": "请上传凭证"
+		}
+	},
+	"transaction-list": {
+		"transaction-list": {
+			"1mf6wj": "币类型：",
+			"2w1o1l": "操作币：",
+			"jgx0cf": "原始币：",
+			"7cv11k": "描述：",
+			"cu39n5": "币类型"
+		}
+	},
+	"transfer-list": {
+		"transfer-list": {
+			"69rnx6": "转账单号：",
+			"4aj248": "收款人：",
+			"m2r55k": "转账币：",
+			"9g8lyb": "转账备注："
+		}
+	},
+	"user-goods-comments": {
+		"user-goods-comments": {
+			"58804r": "是否显示",
+			"jnk6da": "是否回复",
+			"yyjemb": "是否匿名",
+			"0nhrj0": "评论内容"
+		}
+	},
+    "giftcard-index": {
+    	"giftcard-index": {
+    		"87ytyh": "卡密类型",
+            "hfg2fg": "卡密key",
+    		"fyjnsd": "卡密数据",
+            "87yyj3": "兑换时间",
+            "8tfgh2": "卡密兑换",
+            "6redfg": "使用数据",
+            "fu3rf1": "请输入卡密key"
+    	}
+    },
+    "givegift-gift": {
+    	"givegift-gift": {
+    		"8yghjd": "不限领取",
+            "567uye": "留言提示",
+    		"rtyu33": "留言提示,格式最多200个字符",
+            "34rrr3": "给Ta留言表示感谢！"
+    	}
+    }
+}
\ No newline at end of file
diff --git a/main.js b/main.js
new file mode 100644
index 0000000..3ee9879
--- /dev/null
+++ b/main.js
@@ -0,0 +1,25 @@
+import Vue from 'vue';
+import App from './App';
+
+// 全局mixins
+import base from './common/js/common/base';
+import share from './common/js/common/share';
+
+// 多语言引入并初始化
+import i18n from './locale/index'
+
+// 全局icon组件
+import iconfont from './components/iconfont/iconfont.vue'
+Vue.component("iconfont", iconfont);
+
+Vue.mixin(base);
+Vue.mixin(share);
+
+Vue.config.productionTip = false;
+App.mpType = 'app';
+
+const app = new Vue({
+    i18n,
+    ...App
+});
+app.$mount();
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 0000000..9240948
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,259 @@
+{
+    "name" : "ShopXO",
+    "appid" : "__UNI__50E3C11",
+    "description" : "ShopXO开源商城、MIT协议、可商用、可二次开发、满足99%电商运营需求",
+    "versionName" : "1.0.0",
+    "versionCode" : 100,
+    "transformPx" : false,
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {
+            "Payment" : {},
+            "Barcode" : {},
+            "OAuth" : {},
+            "Maps" : {},
+            "Geolocation" : {},
+            "Share" : {},
+            "VideoPlayer" : {},
+            "Camera" : {}
+        },
+        "distribute" : {
+            "android" : {
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "targetSdkVersion" : 30,
+                "minSdkVersion" : 23
+            },
+            "ios" : {
+                "dSYMs" : false,
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "获取用户手机相册用于提供相册图片素材",
+                    "NSPhotoLibraryAddUsageDescription" : "将图片保存至手机相册",
+                    "NSCameraUsageDescription" : "获取用户手机相册用于快捷拍照功能",
+                    "NSLocationWhenInUseUsageDescription" : "该应用需要您的地理位置，以便为你提供当前位置信息",
+                    "NSLocationAlwaysUsageDescription" : "该应用需要您的地理位置，以便为你提供当前位置信息",
+                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "该应用需要持续获取用户地理位置，以便为您提供实时的位置信息"
+                }
+            },
+            "sdkConfigs" : {
+                "payment" : {
+                    "alipay" : {
+                        "__platform__" : [ "ios", "android" ]
+                    },
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wx3bac19ff90c0a976",
+                        "UniversalLinks" : "https://d1.shopxo.vip/.well-known/"
+                    },
+                    "paypal" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "returnURL_ios" : "com.shopxo.mm://paypal",
+                        "returnURL_android" : "com.shopxo.mm://paypal"
+                    }
+                },
+                "ad" : {},
+                "oauth" : {
+                    "univerify" : {},
+                    "apple" : {},
+                    "weixin" : {
+                        "appid" : "wx3bac19ff90c0a976",
+                        "appsecret" : "91f132b39c5c575fe61b04993c57c734",
+                        "UniversalLinks" : "https://d1.shopxo.vip/.well-known/"
+                    },
+                    "qq" : {
+                        "appid" : "102076195",
+                        "UniversalLinks" : "https://d1.shopxo.vip/.well-known/"
+                    },
+                    "google" : {
+                        "clientid" : "510187709509-fq3t5grcfh81t4ub491tiadrtfjbaes1.apps.googleusercontent.com"
+                    }
+                },
+                "maps" : {
+                    "amap" : {
+                        "name" : "amapu9VF72Gg",
+                        "appkey_ios" : "f55e9099897821681f5c74051e4527bd",
+                        "appkey_android" : "ebe9f1d84f8ceb8b3c4ba6ead2bfa78b"
+                    }
+                },
+                "geolocation" : {
+                    "system" : {
+                        "__platform__" : [ "ios", "android" ]
+                    }
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx3bac19ff90c0a976",
+                        "UniversalLinks" : "https://d1.shopxo.vip/.well-known/"
+                    },
+                    "qq" : {
+                        "appid" : "102076195",
+                        "UniversalLinks" : "https://d1.shopxo.vip/.well-known/"
+                    }
+                },
+                "push" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            },
+            "splashscreen" : {
+                "useOriginalMsgbox" : true
+            }
+        }
+    },
+    "quickapp" : {},
+    "mp-weixin" : {
+        "requiredPrivateInfos" : [
+            "chooseLocation",
+            "getLocation",
+            "chooseAddress",
+            "onLocationChange",
+            "startLocationUpdate",
+            "startLocationUpdateBackground"
+        ],
+        "appid" : "wxda7779770f53e901",
+        "setting" : {
+            "urlCheck" : false,
+            "es6" : true,
+            "minified" : true,
+            "ignoreDevUnusedFiles" : false,
+            "ignoreUploadUnusedFiles" : false
+        },
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "你的位置将用于小程序中相应业务位置服务使用"
+            }
+        },
+        "__usePrivacyCheck__" : true,
+        "plugins" : {
+            // 腾讯地图路线规划插件（需要到小程序后台设置->第三方设置->插件管理里面添加【腾讯位置服务路线规划】插件，教程 https://mp.weixin.qq.com/wxopen/plugindevdoc?appid=wx50b5593e81dd937a）
+            // "routePlan" : {
+            //     "version" : "1.0.19",
+            //     "provider" : "wx50b5593e81dd937a"
+            // },
+            // 直播（需要到小程序后台设置->第三方设置->插件管理里面添加【小程序直播组件】插件，教程 https://mp.weixin.qq.com/wxopen/pluginbasicprofile?action=intro&appid=wx2b03c6e691cd7370）
+            // "live-player-plugin" : {
+            //     "version" : "1.3.5",
+            //     "provider" : "wx2b03c6e691cd7370"
+            // }
+        }
+    },
+    "mp-alipay" : {
+        "usingComponents" : true,
+        "appid" : "2021001173639600"
+    },
+    "mp-baidu" : {
+        "usingComponents" : true,
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false
+        }
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true,
+        "appid" : "ttfb628ddf6458b04f",
+        "setting" : {
+            "urlCheck" : false
+        }
+    },
+    "networkTimeout" : {
+        "request" : 10000,
+        "downloadFile" : 10000
+    },
+    "mp-qq" : {
+        "appid" : "1110736292",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "你的位置将用于小程序中相应业务位置服务使用"
+            }
+        }
+    },
+    "mp-kuaishou" : {
+        "appid" : "ks669910446353970565"
+    },
+    "h5" : {
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "56SBZ-PCC3G-US2QM-IXYFE-4DE5H-GRBDK"
+                }
+            }
+        },
+        "devServer" : {
+            "https" : false,
+            "port" : 8082
+        },
+        "router" : {
+            "mode" : "hash",
+            "base" : "./"
+        },
+        "title" : "ShopXO",
+        "template" : "template.h5.html"
+    },
+    "vueVersion" : "2",
+    "locale" : "auto"
+}
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
new file mode 100644
index 0000000..c57de32
--- /dev/null
+++ b/node_modules/.package-lock.json
@@ -0,0 +1,12 @@
+{
+  "name": "shopxo-uniapp",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "node_modules/jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
+    }
+  }
+}
diff --git a/node_modules/jweixin-module/README.md b/node_modules/jweixin-module/README.md
new file mode 100644
index 0000000..7c91d7b
--- /dev/null
+++ b/node_modules/jweixin-module/README.md
@@ -0,0 +1,30 @@
+# jweixin-module
+
+微信JS-SDK
+
+## 安装
+
+### NPM
+
+```shell
+npm install jweixin-module --save
+```
+
+### UMD
+
+```http
+https://unpkg.com/jweixin-module/out/index.js
+```
+
+## 使用
+
+```js
+var jweixin = require('jweixin-module')
+jweixin.ready(function(){
+    // TODO
+});
+```
+
+## 完整API
+
+>[微信JS-SDK说明文档](https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115)
diff --git a/node_modules/jweixin-module/lib/index.js b/node_modules/jweixin-module/lib/index.js
new file mode 100644
index 0000000..1b5014b
--- /dev/null
+++ b/node_modules/jweixin-module/lib/index.js
@@ -0,0 +1 @@
+!function(e,n){"function"==typeof define&&(define.amd||define.cmd)?define(function(){return n(e)}):n(e,!0)}(window,function(o,e){if(!o.jWeixin){var n,c={config:"preVerifyJSAPI",onMenuShareTimeline:"menu:share:timeline",onMenuShareAppMessage:"menu:share:appmessage",onMenuShareQQ:"menu:share:qq",onMenuShareWeibo:"menu:share:weiboApp",onMenuShareQZone:"menu:share:QZone",previewImage:"imagePreview",getLocation:"geoLocation",openProductSpecificView:"openProductViewWithPid",addCard:"batchAddCard",openCard:"batchViewCard",chooseWXPay:"getBrandWCPayRequest",openEnterpriseRedPacket:"getRecevieBizHongBaoRequest",startSearchBeacons:"startMonitoringBeacons",stopSearchBeacons:"stopMonitoringBeacons",onSearchBeacons:"onBeaconsInRange",consumeAndShareCard:"consumedShareCard",openAddress:"editAddress"},a=function(){var e={};for(var n in c)e[c[n]]=n;return e}(),i=o.document,t=i.title,r=navigator.userAgent.toLowerCase(),s=navigator.platform.toLowerCase(),d=!(!s.match("mac")&&!s.match("win")),u=-1!=r.indexOf("wxdebugger"),l=-1!=r.indexOf("micromessenger"),p=-1!=r.indexOf("android"),f=-1!=r.indexOf("iphone")||-1!=r.indexOf("ipad"),m=(n=r.match(/micromessenger\/(\d+\.\d+\.\d+)/)||r.match(/micromessenger\/(\d+\.\d+)/))?n[1]:"",g={initStartTime:L(),initEndTime:0,preVerifyStartTime:0,preVerifyEndTime:0},h={version:1,appId:"",initTime:0,preVerifyTime:0,networkType:"",isPreVerifyOk:1,systemType:f?1:p?2:-1,clientVersion:m,url:encodeURIComponent(location.href)},v={},S={_completes:[]},y={state:0,data:{}};O(function(){g.initEndTime=L()});var I=!1,_=[],w={config:function(e){B("config",v=e);var t=!1!==v.check;O(function(){if(t)M(c.config,{verifyJsApiList:C(v.jsApiList),verifyOpenTagList:C(v.openTagList)},function(){S._complete=function(e){g.preVerifyEndTime=L(),y.state=1,y.data=e},S.success=function(e){h.isPreVerifyOk=0},S.fail=function(e){S._fail?S._fail(e):y.state=-1};var t=S._completes;return t.push(function(){!function(){if(!(d||u||v.debug||m<"6.0.2"||h.systemType<0)){var i=new Image;h.appId=v.appId,h.initTime=g.initEndTime-g.initStartTime,h.preVerifyTime=g.preVerifyEndTime-g.preVerifyStartTime,w.getNetworkType({isInnerInvoke:!0,success:function(e){h.networkType=e.networkType;var n="https://open.weixin.qq.com/sdk/report?v="+h.version+"&o="+h.isPreVerifyOk+"&s="+h.systemType+"&c="+h.clientVersion+"&a="+h.appId+"&n="+h.networkType+"&i="+h.initTime+"&p="+h.preVerifyTime+"&u="+h.url;i.src=n}})}}()}),S.complete=function(e){for(var n=0,i=t.length;n<i;++n)t[n]();S._completes=[]},S}()),g.preVerifyStartTime=L();else{y.state=1;for(var e=S._completes,n=0,i=e.length;n<i;++n)e[n]();S._completes=[]}}),w.invoke||(w.invoke=function(e,n,i){o.WeixinJSBridge&&WeixinJSBridge.invoke(e,x(n),i)},w.on=function(e,n){o.WeixinJSBridge&&WeixinJSBridge.on(e,n)})},ready:function(e){0!=y.state?e():(S._completes.push(e),!l&&v.debug&&e())},error:function(e){m<"6.0.2"||(-1==y.state?e(y.data):S._fail=e)},checkJsApi:function(e){M("checkJsApi",{jsApiList:C(e.jsApiList)},(e._complete=function(e){if(p){var n=e.checkResult;n&&(e.checkResult=JSON.parse(n))}e=function(e){var n=e.checkResult;for(var i in n){var t=a[i];t&&(n[t]=n[i],delete n[i])}return e}(e)},e))},onMenuShareTimeline:function(e){P(c.onMenuShareTimeline,{complete:function(){M("shareTimeline",{title:e.title||t,desc:e.title||t,img_url:e.imgUrl||"",link:e.link||location.href,type:e.type||"link",data_url:e.dataUrl||""},e)}},e)},onMenuShareAppMessage:function(n){P(c.onMenuShareAppMessage,{complete:function(e){"favorite"===e.scene?M("sendAppMessage",{title:n.title||t,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""}):M("sendAppMessage",{title:n.title||t,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""},n)}},n)},onMenuShareQQ:function(e){P(c.onMenuShareQQ,{complete:function(){M("shareQQ",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareWeibo:function(e){P(c.onMenuShareWeibo,{complete:function(){M("shareWeiboApp",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareQZone:function(e){P(c.onMenuShareQZone,{complete:function(){M("shareQZone",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},updateTimelineShareData:function(e){M("updateTimelineShareData",{title:e.title,link:e.link,imgUrl:e.imgUrl},e)},updateAppMessageShareData:function(e){M("updateAppMessageShareData",{title:e.title,desc:e.desc,link:e.link,imgUrl:e.imgUrl},e)},startRecord:function(e){M("startRecord",{},e)},stopRecord:function(e){M("stopRecord",{},e)},onVoiceRecordEnd:function(e){P("onVoiceRecordEnd",e)},playVoice:function(e){M("playVoice",{localId:e.localId},e)},pauseVoice:function(e){M("pauseVoice",{localId:e.localId},e)},stopVoice:function(e){M("stopVoice",{localId:e.localId},e)},onVoicePlayEnd:function(e){P("onVoicePlayEnd",e)},uploadVoice:function(e){M("uploadVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadVoice:function(e){M("downloadVoice",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},translateVoice:function(e){M("translateVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},chooseImage:function(e){M("chooseImage",{scene:"1|2",count:e.count||9,sizeType:e.sizeType||["original","compressed"],sourceType:e.sourceType||["album","camera"]},(e._complete=function(e){if(p){var n=e.localIds;try{n&&(e.localIds=JSON.parse(n))}catch(e){}}},e))},getLocation:function(e){},previewImage:function(e){M(c.previewImage,{current:e.current,urls:e.urls},e)},uploadImage:function(e){M("uploadImage",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadImage:function(e){M("downloadImage",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},getLocalImgData:function(e){!1===I?(I=!0,M("getLocalImgData",{localId:e.localId},(e._complete=function(e){if(I=!1,0<_.length){var n=_.shift();wx.getLocalImgData(n)}},e))):_.push(e)},getNetworkType:function(e){M("getNetworkType",{},(e._complete=function(e){e=function(e){var n=e.errMsg;e.errMsg="getNetworkType:ok";var i=e.subtype;if(delete e.subtype,i)e.networkType=i;else{var t=n.indexOf(":"),o=n.substring(t+1);switch(o){case"wifi":case"edge":case"wwan":e.networkType=o;break;default:e.errMsg="getNetworkType:fail"}}return e}(e)},e))},openLocation:function(e){M("openLocation",{latitude:e.latitude,longitude:e.longitude,name:e.name||"",address:e.address||"",scale:e.scale||28,infoUrl:e.infoUrl||""},e)},getLocation:function(e){M(c.getLocation,{type:(e=e||{}).type||"wgs84"},(e._complete=function(e){delete e.type},e))},hideOptionMenu:function(e){M("hideOptionMenu",{},e)},showOptionMenu:function(e){M("showOptionMenu",{},e)},closeWindow:function(e){M("closeWindow",{},e=e||{})},hideMenuItems:function(e){M("hideMenuItems",{menuList:e.menuList},e)},showMenuItems:function(e){M("showMenuItems",{menuList:e.menuList},e)},hideAllNonBaseMenuItem:function(e){M("hideAllNonBaseMenuItem",{},e)},showAllNonBaseMenuItem:function(e){M("showAllNonBaseMenuItem",{},e)},scanQRCode:function(e){M("scanQRCode",{needResult:(e=e||{}).needResult||0,scanType:e.scanType||["qrCode","barCode"]},(e._complete=function(e){if(f){var n=e.resultStr;if(n){var i=JSON.parse(n);e.resultStr=i&&i.scan_code&&i.scan_code.scan_result}}},e))},openAddress:function(e){M(c.openAddress,{},(e._complete=function(e){e=function(e){return e.postalCode=e.addressPostalCode,delete e.addressPostalCode,e.provinceName=e.proviceFirstStageName,delete e.proviceFirstStageName,e.cityName=e.addressCitySecondStageName,delete e.addressCitySecondStageName,e.countryName=e.addressCountiesThirdStageName,delete e.addressCountiesThirdStageName,e.detailInfo=e.addressDetailInfo,delete e.addressDetailInfo,e}(e)},e))},openProductSpecificView:function(e){M(c.openProductSpecificView,{pid:e.productId,view_type:e.viewType||0,ext_info:e.extInfo},e)},addCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],a={card_id:r.cardId,card_ext:r.cardExt};i.push(a)}M(c.addCard,{card_list:i},(e._complete=function(e){var n=e.card_list;if(n){for(var i=0,t=(n=JSON.parse(n)).length;i<t;++i){var o=n[i];o.cardId=o.card_id,o.cardExt=o.card_ext,o.isSuccess=!!o.is_succ,delete o.card_id,delete o.card_ext,delete o.is_succ}e.cardList=n,delete e.card_list}},e))},chooseCard:function(e){M("chooseCard",{app_id:v.appId,location_id:e.shopId||"",sign_type:e.signType||"SHA1",card_id:e.cardId||"",card_type:e.cardType||"",card_sign:e.cardSign,time_stamp:e.timestamp+"",nonce_str:e.nonceStr},(e._complete=function(e){e.cardList=e.choose_card_info,delete e.choose_card_info},e))},openCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],a={card_id:r.cardId,code:r.code};i.push(a)}M(c.openCard,{card_list:i},e)},consumeAndShareCard:function(e){M(c.consumeAndShareCard,{consumedCardId:e.cardId,consumedCode:e.code},e)},chooseWXPay:function(e){M(c.chooseWXPay,V(e),e)},openEnterpriseRedPacket:function(e){M(c.openEnterpriseRedPacket,V(e),e)},startSearchBeacons:function(e){M(c.startSearchBeacons,{ticket:e.ticket},e)},stopSearchBeacons:function(e){M(c.stopSearchBeacons,{},e)},onSearchBeacons:function(e){P(c.onSearchBeacons,e)},openEnterpriseChat:function(e){M("openEnterpriseChat",{useridlist:e.userIds,chatname:e.groupName},e)},launchMiniProgram:function(e){M("launchMiniProgram",{targetAppId:e.targetAppId,path:function(e){if("string"==typeof e&&0<e.length){var n=e.split("?")[0],i=e.split("?")[1];return n+=".html",void 0!==i?n+"?"+i:n}}(e.path),envVersion:e.envVersion},e)},openBusinessView:function(e){M("openBusinessView",{businessType:e.businessType,queryString:e.queryString||"",envVersion:e.envVersion},(e._complete=function(n){if(p){var e=n.extraData;if(e)try{n.extraData=JSON.parse(e)}catch(e){n.extraData={}}}},e))},miniProgram:{navigateBack:function(e){e=e||{},O(function(){M("invokeMiniProgramAPI",{name:"navigateBack",arg:{delta:e.delta||1}},e)})},navigateTo:function(e){O(function(){M("invokeMiniProgramAPI",{name:"navigateTo",arg:{url:e.url}},e)})},redirectTo:function(e){O(function(){M("invokeMiniProgramAPI",{name:"redirectTo",arg:{url:e.url}},e)})},switchTab:function(e){O(function(){M("invokeMiniProgramAPI",{name:"switchTab",arg:{url:e.url}},e)})},reLaunch:function(e){O(function(){M("invokeMiniProgramAPI",{name:"reLaunch",arg:{url:e.url}},e)})},postMessage:function(e){O(function(){M("invokeMiniProgramAPI",{name:"postMessage",arg:e.data||{}},e)})},getEnv:function(e){O(function(){e({miniprogram:"miniprogram"===o.__wxjs_environment})})}}},T=1,k={};return i.addEventListener("error",function(e){if(!p){var n=e.target,i=n.tagName,t=n.src;if("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i)if(-1!=t.indexOf("wxlocalresource://")){e.preventDefault(),e.stopPropagation();var o=n["wx-id"];if(o||(o=T++,n["wx-id"]=o),k[o])return;k[o]=!0,wx.ready(function(){wx.getLocalImgData({localId:t,success:function(e){n.src=e.localData}})})}}},!0),i.addEventListener("load",function(e){if(!p){var n=e.target,i=n.tagName;n.src;if("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i){var t=n["wx-id"];t&&(k[t]=!1)}}},!0),e&&(o.wx=o.jWeixin=w),w}function M(n,e,i){o.WeixinJSBridge?WeixinJSBridge.invoke(n,x(e),function(e){A(n,e,i)}):B(n,i)}function P(n,i,t){o.WeixinJSBridge?WeixinJSBridge.on(n,function(e){t&&t.trigger&&t.trigger(e),A(n,e,i)}):B(n,t||i)}function x(e){return(e=e||{}).appId=v.appId,e.verifyAppId=v.appId,e.verifySignType="sha1",e.verifyTimestamp=v.timestamp+"",e.verifyNonceStr=v.nonceStr,e.verifySignature=v.signature,e}function V(e){return{timeStamp:e.timestamp+"",nonceStr:e.nonceStr,package:e.package,paySign:e.paySign,signType:e.signType||"SHA1"}}function A(e,n,i){"openEnterpriseChat"!=e&&"openBusinessView"!==e||(n.errCode=n.err_code),delete n.err_code,delete n.err_desc,delete n.err_detail;var t=n.errMsg;t||(t=n.err_msg,delete n.err_msg,t=function(e,n){var i=e,t=a[i];t&&(i=t);var o="ok";if(n){var r=n.indexOf(":");"confirm"==(o=n.substring(r+1))&&(o="ok"),"failed"==o&&(o="fail"),-1!=o.indexOf("failed_")&&(o=o.substring(7)),-1!=o.indexOf("fail_")&&(o=o.substring(5)),"access denied"!=(o=(o=o.replace(/_/g," ")).toLowerCase())&&"no permission to execute"!=o||(o="permission denied"),"config"==i&&"function not exist"==o&&(o="ok"),""==o&&(o="fail")}return n=i+":"+o}(e,t),n.errMsg=t),(i=i||{})._complete&&(i._complete(n),delete i._complete),t=n.errMsg||"",v.debug&&!i.isInnerInvoke&&alert(JSON.stringify(n));var o=t.indexOf(":");switch(t.substring(o+1)){case"ok":i.success&&i.success(n);break;case"cancel":i.cancel&&i.cancel(n);break;default:i.fail&&i.fail(n)}i.complete&&i.complete(n)}function C(e){if(e){for(var n=0,i=e.length;n<i;++n){var t=e[n],o=c[t];o&&(e[n]=o)}return e}}function B(e,n){if(!(!v.debug||n&&n.isInnerInvoke)){var i=a[e];i&&(e=i),n&&n._complete&&delete n._complete,console.log('"'+e+'",',n||"")}}function L(){return(new Date).getTime()}function O(e){l&&(o.WeixinJSBridge?e():i.addEventListener&&i.addEventListener("WeixinJSBridgeReady",e,!1))}});
\ No newline at end of file
diff --git a/node_modules/jweixin-module/package.json b/node_modules/jweixin-module/package.json
new file mode 100644
index 0000000..df011ca
--- /dev/null
+++ b/node_modules/jweixin-module/package.json
@@ -0,0 +1,26 @@
+{
+    "name": "jweixin-module",
+    "version": "1.6.0",
+    "description": "微信JS-SDK",
+    "main": "lib/index.js",
+    "scripts": {},
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
+    },
+    "keywords": [
+        "wxjssdk",
+        "weixin",
+        "jweixin",
+        "wechat",
+        "jssdk",
+        "wx"
+    ],
+    "author": "Shengqiang Guo",
+    "license": "ISC",
+    "bugs": {
+        "url": "https://github.com/zhetengbiji/jweixin-module/issues"
+    },
+    "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
+    "devDependencies": {}
+}
diff --git a/pages.json b/pages.json
new file mode 100644
index 0000000..a1711b7
--- /dev/null
+++ b/pages.json
@@ -0,0 +1,1774 @@
+{
+    "pages": [
+        {
+            "path": "pages/index/index",
+            "style": {
+                // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
+                "navigationStyle": "custom",
+                // #endif
+                // #ifdef MP-ALIPAY
+                "transparentTitle": "always",
+                "titlePenetrate": "YES",
+                // #endif
+                "enablePullDownRefresh": true,
+                "navigationBarTitleText": ""
+            }
+        },
+        {
+            "path": "pages/goods-category/goods-category",
+            "style": {
+                // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
+                "navigationStyle": "custom",
+                // #endif
+                // #ifdef MP-ALIPAY
+                "transparentTitle": "always",
+                "titlePenetrate": "YES",
+                // 该页不显示滚动条
+                "scrollIndicator": "none",
+                // #endif
+                "enablePullDownRefresh": false,
+                // 禁止页面下拉
+                "disableScroll": true,
+                "navigationBarTitleText": ""
+            }
+        },
+        {
+            "path": "pages/cart/cart",
+            "style": {
+                // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
+                "navigationStyle": "custom",
+                // #endif
+                // #ifdef MP-ALIPAY
+                "transparentTitle": "always",
+                "titlePenetrate": "YES",
+                // 该页不显示滚动条
+                "scrollIndicator": "none",
+                // #endif
+                "enablePullDownRefresh": false,
+                // 禁止页面下拉
+                "disableScroll": true,
+                "navigationBarTitleText": ""
+            }
+        },
+        {
+            "path": "pages/user/user",
+            "style": {
+                // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
+                "navigationStyle": "custom",
+                // #endif
+                // #ifdef MP-ALIPAY
+                "transparentTitle": "always",
+                "titlePenetrate": "YES",
+                // #endif
+                "enablePullDownRefresh": true,
+                "navigationBarTitleText": ""
+            }
+        },
+        {
+            "path": "pages/diy/diy",
+            "style": {
+                // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
+                "navigationStyle": "custom",
+                // #endif
+                // #ifdef MP-ALIPAY
+                "transparentTitle": "always",
+                "titlePenetrate": "YES",
+                // #endif
+                "enablePullDownRefresh": true,
+                "navigationBarTitleText": ""
+            }
+        }
+    ],
+    "subPackages": [
+        {
+            "root": "pages/goods-detail",
+            "pages": [
+                {
+                    "path": "goods-detail",
+                    "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/login",
+            "pages": [
+                {
+                    "path": "login",
+                    "style": {
+                        "enablePullDownRefresh": false,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/cart-page",
+            "pages": [
+                {
+                    "path": "cart-page",
+                    "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "always",
+                        "titlePenetrate": "YES",
+                        // 该页不显示滚动条
+                        "scrollIndicator": "none",
+                        // #endif
+                        "enablePullDownRefresh": false,
+                        // 禁止页面下拉
+                        "disableScroll": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/buy",
+            "pages": [
+                {
+                    "path": "buy",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/goods-search",
+            "pages": [
+                {
+                    "path": "goods-search",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/goods-search-start",
+            "pages": [
+                {
+                    "path": "goods-search-start",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/goods-comment",
+            "pages": [
+                {
+                    "path": "goods-comment",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/user-address",
+            "pages": [
+                {
+                    "path": "user-address",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/user-address-save",
+            "pages": [
+                {
+                    "path": "user-address-save",
+                    "style": {
+                        "enablePullDownRefresh": false,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/user-order",
+            "pages": [
+                {
+                    "path": "user-order",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/user-order-detail",
+            "pages": [
+                {
+                    "path": "user-order-detail",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/user-order-comments",
+            "pages": [
+                {
+                    "path": "user-order-comments",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/user-favor",
+            "pages": [
+                {
+                    "path": "user-favor",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/user-goods-comments",
+            "pages": [
+                {
+                    "path": "user-goods-comments",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/user-goods-comments-form",
+            "pages": [
+                {
+                    "path": "user-goods-comments-form",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/message",
+            "pages": [
+                {
+                    "path": "message",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/user-integral",
+            "pages": [
+                {
+                    "path": "user-integral",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/user-goods-browse",
+            "pages": [
+                {
+                    "path": "user-goods-browse",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/user-orderaftersale",
+            "pages": [
+                {
+                    "path": "user-orderaftersale",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/user-orderaftersale-detail",
+            "pages": [
+                {
+                    "path": "user-orderaftersale-detail",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/extraction-address",
+            "pages": [
+                {
+                    "path": "extraction-address",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/common/open-setting-location",
+            "pages": [
+                {
+                    "path": "open-setting-location",
+                    "style": {
+                        // #ifndef MP-TOUTIAO
+                        "navigationStyle": "custom",
+                        // #endif
+                        "enablePullDownRefresh": false
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/customview",
+            "pages": [
+                {
+                    "path": "customview",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/design",
+            "pages": [
+                {
+                    "path": "design",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/web-view",
+            "pages": [
+                {
+                    "path": "web-view",
+                    "style": {
+                        "enablePullDownRefresh": false,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/paytips",
+            "pages": [
+                {
+                    "path": "paytips",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/error",
+            "pages": [
+                {
+                    "path": "error",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/article-category",
+            "pages": [
+                {
+                    "path": "article-category",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/article-detail",
+            "pages": [
+                {
+                    "path": "article-detail",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/setup",
+            "pages": [
+                {
+                    "path": "setup",
+                    "style": {
+                        "enablePullDownRefresh": false,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/personal",
+            "pages": [
+                {
+                    "path": "personal",
+                    "style": {
+                        "enablePullDownRefresh": false,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/logout",
+            "pages": [
+                {
+                    "path": "logout",
+                    "style": {
+                        "enablePullDownRefresh": false,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/password",
+            "pages": [
+                {
+                    "path": "password",
+                    "style": {
+                        "enablePullDownRefresh": false,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/about",
+            "pages": [
+                {
+                    "path": "about",
+                    "style": {
+                        "enablePullDownRefresh": false,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/seckill",
+            "pages": [
+                {
+                    "path": "index/index",
+                    "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/coupon",
+            "pages": [
+                {
+                    "path": "index/index",
+                    "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "detail/detail",
+                    "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": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "buy/buy",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "user/user",
+                    "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
+                        "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": "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": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
+                        "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": ""
+                    }
+                },
+                {
+                    "path": "promotion-user/promotion-user",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "promotion-order/promotion-order",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "visit-list/visit-list",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "visit-form/visit-form",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/wallet",
+            "pages": [
+                {
+                    "path": "user/user",
+                    "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "recharge/recharge",
+                    "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
+                        "enablePullDownRefresh": false,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "cash-auth/cash-auth",
+                    "style": {
+                        "enablePullDownRefresh": false,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "cash-create/cash-create",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "wallet-log-detail/wallet-log-detail",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "user-recharge-detail/user-recharge-detail",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "user-cash-detail/user-cash-detail",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "user-transfer-detail/user-transfer-detail",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "payment-code/payment-code",
+                    "style": {
+                        "enablePullDownRefresh": false,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "transfer/transfer",
+                    "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": "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": ""
+                    }
+                },
+                {
+                    "path": "recharge/recharge",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/signin",
+            "pages": [
+                {
+                    "path": "user/user",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "detail/detail",
+                    "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
+                        "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": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "scan/scan",
+                    "style": {
+                        "enablePullDownRefresh": false,
+                        "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": {
+                        "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": ""
+                    }
+                },
+                {
+                    "path": "check/check",
+                    "style": {
+                        "enablePullDownRefresh": false,
+                        "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": ""
+                    }
+                },
+                {
+                    "path": "user-list/user-list",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "form/form",
+                    "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": false,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "detail/detail",
+                    "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
+                        "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": ""
+                    }
+                },
+                {
+                    "path": "check/check",
+                    "style": {
+                        "enablePullDownRefresh": false,
+                        "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": false,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "order-detail/order-detail",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "logistics/logistics",
+                    "style": {
+                        "enablePullDownRefresh": false,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/ask",
+            "pages": [
+                {
+                    "path": "index/index",
+                    "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "detail/detail",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "form/form",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "user-detail/user-detail",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "user-list/user-list",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "goods-list/goods-list",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "comments/comments",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/intellectstools",
+            "pages": [
+                {
+                    "path": "goods-comments/goods-comments",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/scanpay",
+            "pages": [
+                {
+                    "path": "index/index",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "tips/tips",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/thirdpartylogin",
+            "pages": [
+                {
+                    "path": "index/index",
+                    "style": {
+                        "disableScroll": true,
+                        "enablePullDownRefresh": false,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/magic",
+            "pages": [
+                {
+                    "path": "detail/detail",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/ordergoodsform",
+            "pages": [
+                {
+                    "path": "order/order",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/coin",
+            "pages": [
+                {
+                    "path": "user/user",
+                    "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "recharge/recharge",
+                    "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "recharge-pay/recharge-pay",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "convert/convert",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "cash/cash",
+                    "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "detail/detail",
+                    "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "transfer/transfer",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "transfer-list/transfer-list",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "transaction-list/transaction-list",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "cash-list/cash-list",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "convert-list/convert-list",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "recharge-list/recharge-list",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "collection/collection",
+                    "style": {
+                        "enablePullDownRefresh": false,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/antifakecode",
+            "pages": [
+                {
+                    "path": "index/index",
+                    "style": {
+                        "enablePullDownRefresh": false,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/givegift",
+            "pages": [
+                {
+                    "path": "goods/goods",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "gift/gift",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "code/code",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "receive/receive",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/giftcard",
+            "pages": [
+                {
+                    "path": "index/index",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "form/form",
+                    "style": {
+                        "enablePullDownRefresh": false,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/orderresources",
+            "pages": [
+                {
+                    "path": "orderannex/orderannex",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/form",
+            "pages": [
+                {
+                    "path": "check/check",
+                    "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
+                        "enablePullDownRefresh": false,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/allocation",
+            "pages": [
+                {
+                    "path": "cashier/cashier",
+                    "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
+                        "enablePullDownRefresh": false,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/hospital",
+            "pages": [
+                {
+                    "path": "prescription/prescription",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "patient/patient",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                },
+                {
+                    "path": "patient-list/patient-list",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
+        }
+    ],
+    "preloadRule": {
+        "pages/index/index": {
+            "network": "all",
+            "packages": ["pages/goods-detail"]
+        }
+    },
+    "globalStyle": {
+        "navigationBarTitleText": "ShopXO",
+        "navigationBarTextStyle": "black",
+        "navigationBarBackgroundColor": "#ffffff",
+        "backgroundColor": "#f8f8f8",
+        "backgroundColorBottom": "#f8f8f8"
+    },
+    "tabBar": {
+        "color": "transparent",
+        "borderStyle": "white",
+        "selectedColor": "transparent",
+        "backgroundColor": "transparent",
+        "list": [
+            {
+                "pagePath": "pages/index/index"
+            },
+            {
+                "pagePath": "pages/goods-category/goods-category"
+            },
+            {
+                "pagePath": "pages/cart/cart"
+            },
+            {
+                "pagePath": "pages/user/user"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/pages/about/about.css b/pages/about/about.css
new file mode 100644
index 0000000..63851b7
--- /dev/null
+++ b/pages/about/about.css
@@ -0,0 +1,4 @@
+.logo {
+    width: 160rpx;
+    height: 160rpx;
+}
\ No newline at end of file
diff --git a/pages/about/about.vue b/pages/about/about.vue
new file mode 100644
index 0000000..126e0c0
--- /dev/null
+++ b/pages/about/about.vue
@@ -0,0 +1,92 @@
+<template>
+    <view :class="theme_view">
+        <view class="padding-main tc">
+            <view class="bg-white border-radius-main padding-main">
+                <view class="padding-vertical-xxl">
+                    <!-- logo -->
+                    <image class="logo circle br-f5 padding-sm dis-block auto margin-top-xl" :src="logo" mode="aspectFill"></image>
+                    <!-- 名称 -->
+                    <view class="margin-top-sm text-size">{{title}}</view>
+                    <!-- app管理 -->
+                    <component-app-admin ref="app_admin"></component-app-admin>
+                    <!-- 简介 -->
+                    <view class="margin-top-xxxxl cr-base text-size-sm">{{describe}}</view>
+                    <!-- 协议 -->
+                    <view class="margin-top-xxxxl padding-vertical-xxxxl">
+                        <text class="cp cr-blue margin-right" data-value="userregister" @tap="agreement_event">{{ $t('login.login.2v11we') }}</text>
+                        <text class="cp cr-blue margin-left" data-value="userprivacy" @tap="agreement_event">{{ $t('login.login.myno2x') }}</text>
+                    </view>
+                </view>
+            </view>
+            <view class="margin-top cr-grey-c">Copyright 2018-{{year}} by {{title}}</view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common" :propIsAppAdmin="false"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentAppAdmin from '@/components/app-admin/app-admin';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                logo: app.globalData.get_application_logo_square(),
+                title: app.globalData.get_application_title(),
+                describe: app.globalData.get_application_describe(),
+                year: (new Date()).getFullYear(),
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentAppAdmin
+        },
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // app管理
+            if ((this.$refs.app_admin || null) != null) {
+                this.$refs.app_admin.init();
+            }
+        },
+
+        methods: {
+            // 协议事件
+            agreement_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value == null) {
+                    app.globalData.showToast(this.$t('login.login.4wc3hr'));
+                    return false;
+                }
+            
+                // 是否存在协议 url 地址
+                var key = 'agreement_' + value + '_url';
+                var url = app.globalData.get_config('config.' + key) || null;
+                if (url == null) {
+                    app.globalData.showToast(this.$t('login.login.x0nxxf'));
+                    return false;
+                }
+            
+                // 打开 webview
+                app.globalData.open_web_view(url);
+            },
+        }
+    };
+</script>
+<style>
+    @import './about.css';
+</style>
\ No newline at end of file
diff --git a/pages/article-category/article-category.css b/pages/article-category/article-category.css
new file mode 100644
index 0000000..842d67e
--- /dev/null
+++ b/pages/article-category/article-category.css
@@ -0,0 +1,8 @@
+.data-list .item-cover .cover {
+    width: 180rpx;
+    height: 180rpx;
+}
+.data-list .item-cover .base-right,
+.data-list .item-cover .base-right-bottom{
+    width: calc(100% - 200rpx);
+}
\ No newline at end of file
diff --git a/pages/article-category/article-category.vue b/pages/article-category/article-category.vue
new file mode 100644
index 0000000..6782b41
--- /dev/null
+++ b/pages/article-category/article-category.vue
@@ -0,0 +1,284 @@
+<template>
+    <view :class="theme_view">
+        <!-- 分类 -->
+        <scroll-view v-if="(category_list || null) != null && category_list.length > 0" class="nav-base scroll-view-horizontal bg-white oh" scroll-x="true">
+            <view :class="'item cr-grey dis-inline-block padding-horizontal-main ' + (nav_active_value == 0 ? 'cr-main' : '')" @tap="nav_event" data-value="0">{{$t('common.all')}}</view>
+            <block v-for="(item, index) in category_list" :key="index">
+                <view :class="'item cr-grey dis-inline-block padding-horizontal-main ' + (nav_active_value == item.id ? 'cr-main' : '')" @tap="nav_event" :data-value="item.id">{{ item.name }}</view>
+            </block>
+        </scroll-view>
+
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="(data_list || null) != null && data_list.length > 0" class="data-list padding-horizontal-main padding-top-main oh">
+                <block v-for="(item, index) in data_list" :key="index">
+                    <view :data-value="item.url" @tap="url_event" class="item padding-main border-radius-main bg-white oh cp spacing-mb">
+                        <view v-if="(item.cover || null) != null" class="oh pr item-cover">
+                            <image :src="item.cover" mode="aspectFit" class="radius fl cover"></image>
+                            <view class="base-right fr">
+                                <view class="fw-b single-text text-size" :style="(item.title_color || null) != null ? 'color:' + item.title_color + ' !important;' : ''">{{ item.title }}</view>
+                                <view v-if="(item.describe || null) != null" class="cr-base margin-top-sm multi-text text-size-sm">{{item.describe}}</view>
+                                <view class="pa right-0 bottom-0 base-right-bottom cr-grey text-size-xs">
+                                    <text class="fl">{{ item.add_time }}</text>
+                                    <text class="fr">{{$t('article-category.article-category.gxra15')}}{{ item.access_count }}</text>
+                                </view>
+                            </view>
+                        </view>
+                        <block v-else>
+                            <view class="fw-b single-text text-size" :style="(item.title_color || null) != null ? 'color:' + item.title_color + ' !important;' : ''">{{ item.title }}</view>
+                            <view class="cr-grey oh text-size-xs margin-top-sm">
+                                <text class="fl">{{ item.add_time }}</text>
+                                <text class="fr">{{$t('article-category.article-category.gxra15')}}{{ item.access_count }}</text>
+                            </view>
+                        </block>
+                    </view>
+                </block>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                params: null,
+                category_list: [],
+                nav_active_value: 0,
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+                nav_active_value: params.id || 0,
+            });
+
+            // 数据加载
+            this.get_data();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            // 初始化
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url("index", "article"),
+                    method: "POST",
+                    data: {},
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                category_list: data.category_list || [],
+                            });
+
+                            // 基础自定义分享
+                            this.setData({
+                                share_info: {
+                                    path: "/pages/article-category/article-category",
+                                    query: "id=" + this.nav_active_value,
+                                },
+                            });
+
+                            // 获取列表数据
+                            this.get_data_list(1);
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+
+                        // 分享菜单处理
+                        app.globalData.page_share_handle(this.share_info);
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 获取数据列表
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({ data_is_loading: 1 });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("datalist", "article"),
+                    method: "POST",
+                    data: {
+                        page: this.data_page,
+                        id: this.nav_active_value || 0,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            if (data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: data.total,
+                                    data_page_total: data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_is_loading: 0,
+                                });
+                                if (this.data_page <= 1) {
+                                    this.setData({
+                                        data_list: [],
+                                        data_bottom_line_status: false,
+                                    });
+                                }
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                                data_is_loading: 0,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_active_value: e.currentTarget.dataset.value || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import "./article-category.css";
+</style>
diff --git a/pages/article-detail/article-detail.css b/pages/article-detail/article-detail.css
new file mode 100644
index 0000000..119e42c
--- /dev/null
+++ b/pages/article-detail/article-detail.css
@@ -0,0 +1,3 @@
+.last-next-data .item {
+    width: calc(100% - 120rpx);
+}
\ No newline at end of file
diff --git a/pages/article-detail/article-detail.vue b/pages/article-detail/article-detail.vue
new file mode 100644
index 0000000..916f25f
--- /dev/null
+++ b/pages/article-detail/article-detail.vue
@@ -0,0 +1,162 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data || null) != null" class="padding-main">
+            <view class="padding-main border-radius-main bg-white spacing-mb">
+                <view class="fw-b text-size-xl">{{ data.title }}</view>
+                <view class="cr-grey margin-top-lg oh br-t padding-top-main">
+                    <view class="fl">
+                        <text>{{$t('article-detail.article-detail.728374')}}</text>
+                        <text>{{ data.add_time }}</text>
+                    </view>
+                    <view class="fr">
+                        <text class="margin-left-xxxl">{{$t('article-detail.article-detail.j92ru0')}}</text>
+                        <text>{{ data.access_count }}</text>
+                    </view>
+                </view>
+            </view>
+            <view class="padding-main border-radius-main bg-white oh web-html-content spacing-mb">
+                <mp-html :content="data.content" />
+            </view>
+
+            <!-- 上一篇、下一篇 -->
+            <view v-if="(last_next || null) != null" class="last-next-data spacing-mb">
+                <view v-if="(last_next.last || null) != null">
+                    <text class="cr-grey va-m">{{$t('article-detail.article-detail.281s4a')}}</text>
+                    <text :data-value="last_next.last.url" @tap="url_event" class="dis-inline-block va-m cr-blue cp item">{{ last_next.last.title }}</text>
+                </view>
+                <view v-if="(last_next.next || null) != null" class="margin-top-sm">
+                    <text class="cr-grey va-m">{{$t('article-detail.article-detail.uq5814')}}</text>
+                    <text :data-value="last_next.next.url" @tap="url_event" class="dis-inline-block va-m cr-blue cp item">{{ last_next.next.title }}</text>
+                </view>
+            </view>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                data_bottom_line_status: false,
+                params: null,
+                data: null,
+                last_next: null,
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+
+            // 数据加载
+            this.get_data();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        methods: {
+            // 初始化
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url("detail", "article"),
+                    method: "POST",
+                    data: {
+                        id: this.params.id || 0,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        var data = res.data.data;
+                        if (res.data.code == 0 && (data.data || null) != null) {
+                            var article = data.data;
+                            this.setData({
+                                data_bottom_line_status: true,
+                                data_list_loding_status: 3,
+                                data: article,
+                                last_next: data.last_next || null,
+                            });
+
+                            // 基础自定义分享
+                            this.setData({
+                                share_info: {
+                                    title: this.data.seo_title || this.data.title,
+                                    desc: this.data.seo_desc,
+                                    path: "/pages/article-detail/article-detail",
+                                    query: "id=" + this.data.id,
+                                    img: this.data.share_images || this.data.cover,
+                                },
+                            });
+
+                            // 标题
+                            uni.setNavigationBarTitle({ title: article.title });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+
+                        // 分享菜单处理
+                        app.globalData.page_share_handle(this.share_info);
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import "./article-detail.css";
+</style>
diff --git a/pages/buy/buy.css b/pages/buy/buy.css
new file mode 100644
index 0000000..46dd7a0
--- /dev/null
+++ b/pages/buy/buy.css
@@ -0,0 +1,255 @@
+/**
+* 地址
+*/
+.address-base,
+.address-detail {
+    padding-right: 40rpx;
+    ;
+}
+.address-detail .text {
+    width: calc(100% - 40rpx);
+}
+.address-alias,
+.goods-group-alias,
+.goods-group-map-submit {
+    padding: 0 15rpx;
+    line-height: 40rpx;
+}
+
+/**
+* 商品
+*/
+.goods-group-icon {
+    width: 30rpx;
+    height: 30rpx;
+}
+.goods-group-title {
+    font-weight: bold;
+    vertical-align: middle;
+}
+.goods-group-alias {
+    border: 1px solid #3bb4f2;
+    color: #3bb4f2;
+}
+.goods-image {
+    width: 168rpx;
+    height: 168rpx;
+    margin-right: 20rpx;
+}
+.buy-number {
+    right: 0;
+    bottom: 0;
+}
+.goods-base {
+    min-height: 168rpx;
+    margin-left: 180rpx;
+}
+
+/**
+* 导航
+*/
+.bottom-fixed .nav-base {
+    width: 60%;
+}
+.bottom-fixed .nav-submit {
+    width: 40%;
+}
+.bottom-fixed .nav-submit .btn {
+    height: 70rpx;
+    line-height: 70rpx;
+}
+
+/**
+* 支付方式
+*/
+.payment-list .item-content {
+    padding: 20rpx 0;
+}
+.payment-list .item-content .icon {
+    width: 40rpx;
+    height: 40rpx !important;
+}
+.pay-tips {
+    height: 32rpx;
+    line-height: 32rpx;
+    display: inline-block;
+    position: absolute;
+    top: 12rpx;
+    color: #fff;
+    padding: 0 12rpx;
+    border-radius: 16rpx 0 16rpx 0;
+    font-size: 20rpx;
+    background: #D8D8D8 linear-gradient(107deg, #FC6F31 0%, #E22C08 100%);
+}
+
+/**
+* 扩展数据
+*/
+.extension-list {
+    background-color: #ffffeb;
+    border: 1px solid #ffe2cf;
+}
+.extension-list .item:not(:last-child) {
+    border-bottom: 1px dashed #ffe2cf;
+}
+.extension-list .item .text-tips {
+    color: #ff8f44;
+}
+
+/**
+* 留言
+*/
+.content-textarea-container .content {
+    height: 100rpx;
+}
+.content-textarea-container .textarea-view,
+.content-textarea-container .textarea {
+    height: 100% !important;
+}
+.content-textarea-container .textarea {
+    padding: 5rpx 0;
+}
+
+/**
+* 销售+自提 模式选择
+*/
+.buy-site-model .item {
+    padding: 25rpx 0;
+    width: 50%;
+}
+.buy-site-model.count-3 .item {
+    width: 33.33%;
+}
+.buy-site-model.count-4 .item {
+    width: 25%;
+}
+.buy-site-model.count-5 .item {
+    width: 20%;
+}
+
+/**
+ * 数据列表项
+ */
+.buy-data-item,
+.buy-data-item .right-value {
+    line-height: 80rpx;
+}
+.buy-data-item .right-value {
+    width: calc(100% - 260rpx);
+}
+.buy-data-item .right-value .right-value-content {
+    width: calc(100% - 32rpx);
+}
+
+/*
+* 插件样式区域
+*/
+/*
+* 优惠劵
+*/
+.plugins-coupon-popup {
+    padding-top: 20rpx;
+}
+.plugins-coupon-popup .close {
+    margin-right: 20rpx;
+}
+.plugins-coupon-container {
+    max-height: 80vh;
+    overflow-y: scroll;
+    overflow-x: hidden;
+}
+.plugins-coupon-container .item,
+.plugins-coupon-container .v-right,
+.plugins-coupon-container .v-right .circle {
+    height: 230rpx;
+}
+.plugins-coupon-container .not-use-tips {
+    color: #f7b240;
+    font-size: 32rpx;
+}
+
+/*
+* 积分
+*/
+.plugins-points-buy-container {
+    padding: 20rpx;
+}
+.plugins-points-buy-container .select .sales-price {
+    margin-left: 30rpx;
+    font-size: 28rpx;
+    font-weight: 400;
+}
+.plugins-points-buy-container .desc {
+    color: #F37B1D;
+}
+
+.plugins-points-use-value {
+    border-top-right-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
+    width: 130rpx;
+    height: 38rpx;
+    line-height: 38rpx;
+}
+
+.plugins-points-use-submit {
+    border-top-left-radius: 0 !important;
+    border-bottom-left-radius: 0 !important;
+    height: 42rpx !important;
+    line-height: 42rpx !important;
+}
+
+/**
+ * 门店次卡-页面选择
+ */
+.plugins-realstore-container-view .image {
+    width: 34rpx;
+    height: 34rpx !important;
+}
+
+/*
+ * 门店次卡-弹窗选择
+ */
+.plugins-realstore-container {
+    max-height: 80vh;
+    overflow-y: scroll;
+    overflow-x: hidden;
+}
+.plugins-realstore-container .item {
+    overflow: hidden;
+    height: 220rpx;
+}
+.plugins-realstore-container .v-left {
+    width: calc(100% - 140rpx);
+    padding: 30rpx 0 30rpx 20rpx;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+}
+.plugins-realstore-container .v-left .base {
+    font-family: arial;
+    color: #D2364C;
+}
+.plugins-realstore-container .v-right {
+    width: 140rpx;
+    height: 220rpx;
+    font-weight: 500;
+}
+.plugins-realstore-container .v-right:before {
+    content: '';
+    display: inline-block;
+    height: 100%;
+    vertical-align: middle;
+}
+.plugins-realstore-container .item-disabled .v-right {
+    background: #dfdfdf !important;
+    color: #c0c0c0 !important;
+    cursor: no-drop !important;
+}
+
+
+/**
+ * 留言快捷选择 - 智能工具箱
+ */
+.plugins-intellectstools-data-note-fast .note-fast-data-list {
+    width: calc(100% - 112rpx);
+}
\ No newline at end of file
diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue
new file mode 100644
index 0000000..1fe835b
--- /dev/null
+++ b/pages/buy/buy.vue
@@ -0,0 +1,1275 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="buy_site_model_value == 4">
+            <component-no-data propStatus="2" :propMsg="$t('buy.buy.l1c8q6')"></component-no-data>
+        </block>
+        <block v-else>
+            <view v-if="goods_list.length > 0" class="page-bottom-fixed">
+                <!-- 模式选择，站点类型选择 销售+自提 -->
+                <view v-if="buy_site_model_list.length > 1" class="buy-site-model bg-white oh tc" :class="'count-'+buy_site_model_list.length">
+                    <block v-for="(item, index) in buy_site_model_list" :key="index">
+                        <view :class="'item fl cp ' + (buy_site_model_active_index == index ? 'nav-active-line cr-main' : 'cr-base')" :data-index="index" :data-value="item.value" @tap="buy_site_model_event">{{ item.name }}</view>
+                    </block>
+                </view>
+
+                <view class="padding-horizontal-main padding-top-main bottom-line-exclude">
+                    <!-- 非虚拟类型 则地址 -->
+                    <view v-if="buy_site_model_value != 3" class="padding-horizontal-main padding-top-main border-radius-main bg-white spacing-mb">
+                        <view class="address arrow-right cp" @tap="address_event">
+                            <view v-if="address != null" class="padding-bottom-main">
+                                <view class="address-base">
+                                    <text v-if="(address.alias || null) != null" class="address-alias br-main cr-main round margin-right-sm text-size-xs">{{ address.alias }}</text>
+                                    <text>{{ address.name }}</text>
+                                    <text class="fr">{{ address.tel }}</text>
+                                </view>
+                                <view class="address-detail oh margin-top-lg">
+                                    <view class="dis-inline-block va-m">
+                                        <iconfont name="icon-map-address" size="34rpx" color="#999"></iconfont>
+                                    </view>
+                                    <view class="text fr"> {{ address.province_name || '' }}{{ address.city_name || '' }}{{ address.county_name || '' }}{{ address.address || '' }} </view>
+                                </view>
+                            </view>
+                            <view v-else class="padding-top-xl padding-bottom-xxxl cr-grey">
+                                {{ (buy_site_model_value == 2) ? $t('buy.buy.wq7gnb') : $t('buy.buy.6rk813') }}
+                            </view>
+                        </view>
+                        <view class="address-divider spacing-mb"></view>
+                    </view>
+
+                    <!-- 客户输入的数据 -->
+                    <view v-if="((buy_extraction_contact_info || null) != null && (buy_extraction_contact_info.is_write || false) == true) || ((buy_datetime_info || null) != null && (buy_datetime_info.is_select || false) == true)" class="oh padding-horizontal-main bg-white border-radius-main spacing-mb padding-top-main form-container">
+                        <!-- 时间选择 -->
+                        <view v-if="(buy_datetime_info || null) != null && (buy_datetime_info.is_select || false) == true" class="form-gorup row padding-horizontal-0 padding-top-0">
+                            <view class="form-gorup-title margin-right">{{ buy_datetime_info.title }}</view>
+                            <view class="form-gorup-value tr">
+                                <component-time-select :propTitle="buy_datetime_info.title" :propPlaceholder="buy_datetime_info.placeholder" :propRangeType="buy_datetime_info.range_type" :propRangeDay="buy_datetime_info.range_day || 2" :propRangeStartTime="buy_datetime_info.time_start" :propRangeEndTime="buy_datetime_info.time_end" :propDisabled="buy_datetime_info.disabled" :propIsShow="buy_datetime_info.status" @selectEvent="buy_datetime_event">
+                                    <text v-if="(buy_datetime_info.value || null) == null" class="cr-grey va-m">{{ buy_datetime_info.placeholder }}</text>
+                                    <text v-else class="cr-base va-m">{{ buy_datetime_info.value }}</text>
+                                    <view class="dis-inline-block va-m lh-xs">
+                                        <iconfont name="icon-arrow-right" color="#999"></iconfont>
+                                    </view>
+                                </component-time-select>
+                            </view>
+                        </view>
+                        <!-- 自提客户名称和电话 -->
+                        <block v-if="(buy_extraction_contact_info || null) != null && (buy_extraction_contact_info.is_write || false) == true">
+                            <view class="form-gorup row padding-horizontal-0 padding-top-0">
+                                <view class="form-gorup-title margin-right">{{$t('buy.buy.df3raf')}}</view>
+                                <input type="text" name="extraction_contact_name" :value="buy_extraction_contact_info.name" data-value="name" @input="extraction_contact_event" maxlength="30" placeholder-class="cr-grey-9" class="cr-base br-b-f9" :placeholder="$t('user-address-save.user-address-save.65507o')" />
+                            </view>
+                            <view class="form-gorup row padding-horizontal-0 padding-top-0">
+                                <view class="form-gorup-title margin-right">{{$t('buy.buy.hjwerf')}}</view>
+                                <input type="text" name="extraction_contact_tel" :value="buy_extraction_contact_info.tel" data-value="tel" @input="extraction_contact_event" maxlength="30" placeholder-class="cr-grey-9" class="cr-base br-b-f9" :placeholder="$t('user-address-save.user-address-save.65507o')" />
+                            </view>
+                        </block>
+                    </view>
+
+                    <!-- 商品数据 -->
+                    <view v-for="(group, index) in goods_list" :key="index" class="goods-group-list padding-main border-radius-main bg-white spacing-mb">
+                        <!-- 仓库分组 -->
+                        <view class="goods-group-hd oh br-b padding-bottom-main">
+                            <view class="fl cp" @tap="warehouse_group_event" :data-value="group.url || ''">
+                                <image v-if="(group.icon || null) != null" class="goods-group-icon va-m margin-right-xs" :src="group.icon" mode="aspectFit"></image>
+                                <text class="goods-group-title va-m">{{ group.name }}</text>
+                                <text v-if="(group.alias || null) != null" class="goods-group-alias va-m round margin-left-sm text-size-xs">{{ group.alias }}</text>
+                            </view>
+                            <!-- #ifndef MP-KUAISHOU -->
+                            <view v-if="(group.lng || 0) != 0 && (group.lat || 0) != 0" class="fr">
+                                <view class="goods-group-map-submit br round text-size-xs" :data-index="index" @tap="map_event">{{ $t('buy.buy.o7722q') }}</view>
+                            </view>
+                            <!-- #endif -->
+                        </view>
+                        <!-- 商品 -->
+                        <view class="goods-content margin-bottom-sm">
+                            <view v-for="(item, index2) in group.goods_items" :key="index2" class="goods-item padding-vertical-main oh br-b-dashed">
+                                <!-- 商品主体 -->
+                                <view class="goods-item-content">
+                                    <image class="goods-image fl radius" :src="item.images" mode="aspectFill"></image>
+                                    <view class="goods-base">
+                                        <view class="goods-title multi-text">{{ item.title }}</view>
+                                        <view v-if="item.spec != null" class="margin-top-xs cr-grey">
+                                            <block v-for="(spec, si) in item.spec" :key="si">
+                                                <text v-if="si > 0">;</text>
+                                                <text>{{ spec.value }}</text>
+                                            </block>
+                                        </view>
+                                        <view class="oh pr margin-top-xs">
+                                            <block v-if="item.show_field_price_status == 1">
+                                                <text class="fw-b va-m">{{ item.show_price_symbol }}{{ item.price }}</text>
+                                                <text class="cr-grey text-size-xs va-m">{{ item.show_price_unit }}</text>
+                                            </block>
+                                            <block v-if="item.show_field_original_price_status == 1">
+                                                <text v-if="item.original_price > 0" class="original-price margin-left-sm">{{ item.show_original_price_symbol }}{{ item.original_price }}{{ item.show_original_price_unit }}</text>
+                                            </block>
+                                            <text class="buy-number pa cr-grey">x{{ item.stock }}</text>
+                                        </view>
+                                    </view>
+                                </view>
+                                <!-- 订单商品表单 -->
+                                <view v-if="(item.plugins_ordergoodsform_data || null) != null && item.plugins_ordergoodsform_data.length > 0" class="goods-item-ordergoodsform">
+                                    <component-buy-ordergoodsform ref="buy_ordergoodsform" :propData="item.plugins_ordergoodsform_data" :propGoodsID="item.goods_id"></component-buy-ordergoodsform>
+                                </view>
+                            </view>
+                        </view>
+                        <!-- 运费 -->
+                        <view v-if="(group.plugins_freightfee_data || null) != null && (group.plugins_freightfee_data.default || null) != null && (group.plugins_freightfee_data.fee_list || null) != null && group.plugins_freightfee_data.fee_list.length > 0" class="buy-data-item oh">
+                            <text class="cr-base">{{ $t('buy.buy.876tgh') }}</text>
+                            <view class="right-value fr cp tr">
+                                <view class="right-value-content single-text dis-inline-block va-m">
+                                    <picker :data-wid="group.id" @change="plugins_freightfee_change_event" :value="group.plugins_freightfee_data.default.key" :range="group.plugins_freightfee_data.fee_list" range-key="fee_name">
+                                        <view class="cr-grey">{{ group.plugins_freightfee_data.default.fee_name }}</view>
+                                    </picker>
+                                </view>
+                                <view class="dis-inline-block va-m lh-xs">
+                                    <iconfont name="icon-arrow-right" color="#999"></iconfont>
+                                </view>
+                            </view>
+                        </view>
+                        <!-- 优惠劵 -->
+                        <view v-if="(plugins_coupon_data || null) != null && (plugins_coupon_data[index] || null) != null && (plugins_coupon_data[index].coupon_data || null) != null && (plugins_coupon_data[index].coupon_data.coupon_list || null) != null && plugins_coupon_data[index].coupon_data.coupon_list.length > 0" class="buy-data-item oh" :data-index="index" @tap="plugins_coupon_open_event">
+                            <text class="cr-base">{{ $t('buy.buy.45ovhs') }}</text>
+                            <view class="right-value fr cp tr">
+                                <text class="right-value-content single-text cr-grey va-m">{{ (plugins_choice_coupon_value || null) != null && (plugins_choice_coupon_value[group.id] || null) != null ? plugins_choice_coupon_value[group.id] : $t('buy.buy.553mxo') }}</text>
+                                <view class="dis-inline-block va-m lh-xs">
+                                    <iconfont name="icon-arrow-right" color="#999"></iconfont>
+                                </view>
+                            </view>
+                        </view>
+                        <!-- 门店次卡 -->
+                        <view v-if="(plugins_realstore_data || null) != null && (plugins_realstore_data.user_card || null) != null && (plugins_realstore_data['user_card'][group.id] || null) != null" class="plugins-realstore-container-view">
+                            <block v-for="(item, index2) in plugins_realstore_data['user_card'][group.id]['data']" :key="index2">
+                                <view class="buy-data-item oh oh wh-auto">
+                                    <text class="cr-base va-m">{{ $t('buy.buy.58rs1a') }}</text>
+                                    <image class="image circle br va-m margin-left-xs" :src="item.images" mode="aspectFill"></image>
+                                    <text class="cr-grey va-m margin-left-xss text-size-xs">x{{ item.stock }}</text>
+                                    <view class="right-value fr cp tr" :data-index="index2" :data-groupid="group.id" @tap="plugins_realstore_open_event">
+                                        <text class="right-value-content single-text cr-grey va-m">{{ item.tips_msg }}</text>
+                                        <view class="dis-inline-block va-m lh-xs">
+                                            <iconfont name="icon-arrow-right" color="#999"></iconfont>
+                                        </view>
+                                    </view>
+                                </view>
+                            </block>
+                        </view>
+                        <!-- 扩展数据展示 -->
+                        <view v-if="group.order_base.extension_data.length > 0" class="extension-list radius margin-top-lg">
+                            <view v-for="(item, index2) in group.order_base.extension_data" :key="index2">
+                                <view class="item oh padding-vertical-xs padding-main">
+                                    <text class="cr-base fl">{{ item.name }}</text>
+                                    <text class="text-tips fr">{{ item.tips }}</text>
+                                </view>
+                            </view>
+                        </view>
+                        <!-- 小计 -->
+                        <view class="oh tr wh-auto goods-group-footer padding-top-xl">
+                            <text class="sales-price">{{ currency_symbol }}{{ group.order_base.actual_price }}</text>
+                        </view>
+                    </view>
+
+                    <!-- 积分 -->
+                    <view v-if="(plugins_points_data || null) != null && ((plugins_points_data.discount_price || 0) > 0 || (plugins_points_data.is_support_goods_exchange || 0) == 1)" class="plugins-points-buy-container padding-main border-radius-main bg-white spacing-mb">
+                        <block v-if="(plugins_points_data.discount_price || 0) > 0">
+                            <view class="select oh">
+                                <block v-if="plugins_points_data.discount_type == 1">
+                                    <text v-if="(plugins_points_data.use_msg_tips || null) != null" class="va-m">{{ plugins_points_data.use_msg_tips }}</text>
+                                </block>
+                                <view v-else class="dis-inline-block">
+                                    <text class="va-m">{{ $t('buy.buy.33fugm') }}</text>
+                                    <input type="number" class="br radius dis-inline-block va-m tc text-size-xs padding-horizontal-sm margin-left-xs plugins-points-use-value" :value="actual_use_integral" @input="points_use_value_event" @confirm="points_use_value_confirm_event" :placeholder="$t('buy.buy.80y7sv')" />
+                                    <button type="default" size="mini" class="bg-grey-e cr-gray cr-base text-size-xs radius va-m margin-right-xs plugins-points-use-submit" @tap="points_use_value_confirm_event">{{ $t('common.confirm') }}</button>
+                                    <text class="va-m">{{ $t('buy.buy.4di4i2') }}</text>
+                                </view>
+                                <block v-if="plugins_points_data.is_pure_exchange_modal == undefined || plugins_points_data.is_pure_exchange_modal != 1 || plugins_points_data.discount_type != 1">
+                                    <text class="sales-price va-m">-{{ currency_symbol }}{{ plugins_points_data.discount_price }}</text>
+                                    <view class="fr cp" @tap="points_event">
+                                        <iconfont :name="'icon-zhifu-' + (plugins_points_status ? 'yixuan' : 'weixuan')" size="40rpx" :color="plugins_points_status ? theme_color : '#999'"></iconfont>
+                                    </view>
+                                </block>
+                            </view>
+                            <view v-if="(plugins_points_data.usable_msg_tips || null) != null" class="desc margin-top-xs">{{ plugins_points_data.usable_msg_tips }}</view>
+                        </block>
+                        <block v-else>
+                            <view v-if="(plugins_points_data.not_msg_tips || null) != null" class="desc tr">{{ plugins_points_data.not_msg_tips }}</view>
+                        </block>
+                    </view>
+
+                    <!-- 留言 -->
+                    <view class="content-textarea-container padding-main border-radius-main bg-white spacing-mb">
+                        <view class="content">
+                            <textarea v-if="user_note_status" class="textarea" @blur="bind_user_note_blur_event" @input="bind_user_note_event" :focus="true" :disable-default-padding="false" :value="user_note_value" maxlength="230" :placeholder="$t('buy.buy.2rhko1')"></textarea>
+                            <view v-else @tap="bind_user_note_tap_event" :class="'textarea-view ' + ((user_note_value || null) == null ? 'cr-grey' : '')">{{ user_note_value || $t('buy.buy.2rhko1') }}</view>
+                        </view>
+                        <view v-if="(plugins_intellectstools_data || null) != null && (plugins_intellectstools_data.note_fast_data || null) != null" class="plugins-intellectstools-data-note-fast margin-top-sm">
+                            <text class="cr-grey margin-right-sm va-m text-size-xs">{{ $t('buy.buy.q7jq76') }}</text>
+                            <view class="note-fast-data-list scroll-view-horizontal dis-inline-block va-m">
+                                <scroll-view :scroll-x="true" :show-scrollbar="false" :scroll-with-animation="true">
+                                    <block v-for="(item, index) in plugins_intellectstools_data.note_fast_data" :key="index">
+                                        <view :class="'dis-inline-block text-size-xs round padding-top-xs padding-bottom-xs padding-left padding-right br-grey-f5 cr-base cp ' + (index > 0 ? 'margin-left-sm' : '')" :data-value="item" @tap="note_fast_event">{{ item }}</view>
+                                    </block>
+                                </scroll-view>
+                            </view>
+                        </view>
+                    </view>
+                    
+                    <!-- 支付选择 -->
+                    <view v-if="total_price > 0 && ((common_order_is_booking != 1 && payment_list.length > 0) || plugins_coin_is_valid)" class="payment-list border-radius-main bg-white oh padding-main spacing-mb">
+                        <!-- 虚拟币支付 -->
+                        <block v-if="plugins_coin_is_valid">
+                            <block v-for="(item, index) in plugins_coin_data.accounts_list" :key="index">
+                                <view class="item flex-row jc-sb align-c" :data-value="item.id" @tap="plugins_coin_payment_event">
+                                    <view class="item-content pr flex-row align-c">
+                                        <image v-if="(item.platform_icon || null) != null" class="icon margin-right-sm va-m radius" :src="item.platform_icon" mode="widthFix"></image>
+                                        <view class="flex-col">
+                                            <view class="cr-base">{{ item.platform_name }}</view>
+                                            <view class="flex-row align-c margin-top-xs">
+                                                <view class="fw-b">{{ item.default_symbol }} {{ item.default_coin }}</view>
+                                                <view class="margin-left-lg text-size-xs cr-999">{{ item.platform_symbol }} {{ item.normal_coin }}</view>
+                                            </view>
+                                        </view>
+                                    </view>
+                                    <view>
+                                        <iconfont :name="plugins_coin_payment_id == item.id ? 'icon-zhifu-yixuan cr-red' : 'icon-zhifu-weixuan'" size="40rpx"></iconfont>
+                                    </view>
+                                </view>
+                            </block>
+                        </block>
+                        <!-- 支付方式 -->
+                        <view v-if="common_order_is_booking != 1 && payment_list.length > 0" :class="(plugins_coin_is_valid ? 'br-t-f9' : '')">
+                            <view v-for="(item, index) in payment_list" :key="index">
+                                <view class="item flex-row jc-sb align-c" :data-value="item.id" :data-index="index" @tap="payment_event">
+                                    <view class="item-content pr flex-1 flex-width">
+                                        <image v-if="(item.logo || null) != null" class="icon margin-right-sm va-m radius" :src="item.logo" mode="widthFix"></image>
+                                        <text class="va-m">{{ item.name }}</text>
+                                        <text v-if="(item.tips || null) !== null" class="pay-tips">{{ item.tips }}</text>
+                                    </view>
+                                    <view>
+                                        <iconfont :name="payment_id == item.id ? 'icon-zhifu-yixuan cr-red' : 'icon-zhifu-weixuan'" size="40rpx"></iconfont>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+
+                    <!-- 底部说明 - 智能工具箱插件 -->
+                    <view v-if="(plugins_intellectstools_data || null) != null && (plugins_intellectstools_data.bottom_desc || null) != null && plugins_intellectstools_data.bottom_desc.length > 0" class="border-radius-main padding-main bg-white oh cr-orange spacing-mb">
+                        <view v-for="(item, index) in plugins_intellectstools_data.bottom_desc" :key="index">
+                            <view :class="index > 0 ? 'margin-top' : ''">{{item}}</view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 导航 -->
+                <view class="bottom-fixed" :style="bottom_fixed_style">
+                    <view class="bottom-line-exclude">
+                        <view class="item oh round flex-row jc-sb align-c br-top-shadow bg-white padding-vertical-sm">
+                            <view class="nav-base single-text padding-left-main fl">
+                                <text>{{ $t('buy.buy.wx78ju') }}</text>
+                                <text class="sales-price">{{ currency_symbol }}{{ total_price }}</text>
+                            </view>
+                            <view class="nav-submit padding-horizontal-main fr">
+                                <button class="btn bg-main cr-white round text-size-md" type="default" @tap="buy_submit_event" :disabled="buy_submit_disabled_status" hover-class="none">{{ $t('buy.buy.4884hk') }}</button>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </view>
+
+            <!-- 优惠劵选择 -->
+            <component-popup :propShow="popup_plugins_coupon_status" propPosition="bottom" @onclose="plugins_coupon_close_event">
+                <view class="plugins-coupon-popup bg-base">
+                    <view class="close oh">
+                        <view class="fr" @tap.stop="plugins_coupon_close_event">
+                            <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                        </view>
+                    </view>
+                    <view v-if="plugins_coupon_list.length > 0" class="plugins-coupon-container padding-horizontal-main padding-bottom-main oh">
+                        <view class="not-use-tips tc">
+                            <text class="cp" @tap="plugins_coupon_not_use_event">{{ $t('buy.buy.2c3i88') }}</text>
+                        </view>
+                        <block v-for="(item, index) in plugins_coupon_list" :key="index">
+                            <view :class="'item spacing-mt bg-white border-radius-main ' + ((item.is_active || 0) == 1 ? 'item-disabled' : '')">
+                                <view class="v-left fl">
+                                    <view class="base single-text">
+                                        <text v-if="item.coupon.type == 0" class="symbol cr-price">{{ currency_symbol }}</text>
+                                        <text class="price cr-price">{{ item.coupon.discount_value }}</text>
+                                        <text class="unit">{{ item.coupon.type_unit }}</text>
+                                        <text v-if="(item.coupon.desc || null) != null" class="desc cr-grey">{{ item.coupon.desc }}</text>
+                                    </view>
+                                    <view v-if="(item.coupon.use_limit_type_name || null) != null" class="base-tips cr-base single-text">{{ item.coupon.use_limit_type_name }}</view>
+                                    <view class="base-time cr-grey single-text">{{ item.time_start_show_text }}-{{ item.time_end_show_text }}</view>
+                                </view>
+                                <view :class="'v-right bg-main fr ' + ((item.is_active || 0) == 1 ? '' : 'cp')" :style="'background:' + item.coupon.bg_color_value + ';'" :data-index="index" :data-value="item.id" @tap="plugins_coupon_use_event">
+                                    <text class="circle"></text>
+                                    <text>{{ (item.is_active || 0) == 1 ? $t('buy.buy.g2vt78') : $t('buy.buy.inyxpx') }}</text>
+                                </view>
+                            </view>
+                        </block>
+                    </view>
+                </view>
+            </component-popup>
+
+            <!-- 次卡选择 -->
+            <component-popup :propShow="popup_plugins_realstore_status" propPosition="bottom" @onclose="plugins_realstore_close_event">
+                <view class="bg-base padding-top-lg">
+                    <view class="close oh margin-right-lg padding-bottom-sm">
+                        <view class="fr" @tap.stop="plugins_realstore_close_event">
+                            <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                        </view>
+                    </view>
+                    <view class="plugins-realstore-container padding-horizontal-main padding-bottom-main oh">
+                        <view class="not-use-tips tc">
+                            <text class="cp cr-yellow text-size-sm" data-type="0" @tap="plugins_realstore_use_event">{{ $t('buy.buy.8vqfp3') }}</text>
+                        </view>
+                        <view v-if="(plugins_realstore_data || null) != null && (plugins_realstore_data.user_card || null) != null && (plugins_realstore_data['user_card'][popup_plugins_realstore_group_id] || null) != null">
+                            <block v-for="(item, index) in plugins_realstore_data['user_card'][popup_plugins_realstore_group_id]['data'][popup_plugins_realstore_card_index]['user_card']" :key="index">
+                                <view :class="'item spacing-mt bg-white border-radius-main ' + ((item.is_active || 0) == 1 ? 'item-disabled' : '')">
+                                    <view class="v-left fl">
+                                        <view class="base single-text">
+                                            <text class="value fw-b text-size-xxl">{{ item.valid_number }}</text>
+                                            <text class="unit margin-left-xs">{{ $t('buy.buy.0pgsrm') }}</text>
+                                            <text v-if="(item.name || null) != null" class="cr-base margin-left-lg">{{ item.name }}</text>
+                                        </view>
+                                        <view v-if="(item.describe || null) != null" class="margin-top-sm cr-grey single-text">{{ item.describe }}</view>
+                                        <view class="margin-top-sm cr-grey single-text text-size-xs">{{ item.start_time }}{{ $t('buy.buy.70u2vy') }}{{ item.end_time }}</view>
+                                    </view>
+                                    <view v-if="(item.is_active || 0) == 1" class="v-right bg-main fr tc cr-white">
+                                        <text>{{ $t('buy.buy.g2vt78') }}</text>
+                                    </view>
+                                    <view v-else class="v-right bg-main fr tc cr-white cp" :data-index="index" :data-value="item.id" data-type="1" @tap="plugins_realstore_use_event">
+                                        <text>{{ $t('buy.buy.inyxpx') }}</text>
+                                    </view>
+                                </view>
+                            </block>
+                        </view>
+                    </view>
+                </view>
+            </component-popup>
+            <component-payment ref="payment" :propIsRedirectTo="true" :propPayUrl="pay_url" :propQrcodeUrl="qrcode_url" :propToAppointPage="to_appoint_page" propPayDataKey="ids" :propPaymentList="payment_list" :propToPageBack="to_page_back" :propToFailPage="to_fail_page"></component-payment>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import base64 from '@/common/js/lib/base64.js';
+    import componentCommon from '@/components/common/common';
+    import componentPopup from '@/components/popup/popup';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentTimeSelect from '@/components/time-select/time-select';
+    import componentPayment from '@/components/payment/payment';
+    import componentBuyOrdergoodsform from '@/components/buy-ordergoodsform/buy-ordergoodsform';
+
+    var common_static_url = app.globalData.get_static_url('common');
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: app.globalData.get_theme_color(),
+                common_static_url: common_static_url,
+                data_list_loding_status: 1,
+                buy_submit_disabled_status: false,
+                data_list_loding_msg: '',
+                bottom_fixed_style: '',
+                params: null,
+                payment_list: [],
+                payment_index: -1,
+                payment_id: 0,
+                goods_list: [],
+                address: null,
+                address_id: null,
+                total_price: 0,
+                user_note_value: '',
+                user_note_status: false,
+                is_first: 1,
+                common_site_type: 0,
+                extraction_address: [],
+                // 是否门店模式
+                is_realstore_model: false,
+                // 站点类型模式
+                buy_site_model_active_index: 0,
+                buy_site_model_value: -1,
+                buy_site_model_list: [],
+                // 基础配置
+                currency_symbol: app.globalData.currency_symbol(),
+                common_order_is_booking: 0,
+                // 下单时间选择
+                buy_datetime_info: {},
+                // 自提客户名称和电话
+                buy_extraction_contact_info: {},
+                // 订单是否已进入支付
+                is_order_submit_payment: 0,
+                // 优惠劵
+                plugins_coupon_data: null,
+                plugins_coupon_list: [],
+                plugins_use_coupon_ids: [],
+                plugins_choice_coupon_value: [],
+                popup_plugins_coupon_status: false,
+                popup_plugins_coupon_index: null,
+                // 积分
+                plugins_points_data: null,
+                actual_use_integral: 0,
+                plugins_points_status: false,
+                // 门店
+                plugins_realstore_data: null,
+                plugins_choice_realstore_value: {},
+                popup_plugins_realstore_status: false,
+                popup_plugins_realstore_group_id: 0,
+                popup_plugins_realstore_card_index: 0,
+                // 智能工具箱
+                plugins_intellectstools_data: null,
+                // 运费
+                plugins_freightfee_choice_data: {},
+                // 虚拟币
+                plugins_coin_data: null,
+                plugins_coin_is_valid: false,
+                plugins_coin_payment_id: 0,
+
+                // 支付弹窗参数
+                pay_url: '',
+                qrcode_url: '',
+                // 前往支付页面携带的参数
+                to_page_back: {
+                    title: this.$t('buy.buy.718tux'),
+                    page: '/pages/user-order/user-order',
+                },
+                // 支付失败跳转的页面
+                to_fail_page: '/pages/user-order/user-order',
+                // 现金--跳转指定页面
+                to_appoint_page: '/pages/user-order/user-order',
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentPopup,
+            componentNoData,
+            componentTimeSelect,
+            componentPayment,
+            componentBuyOrdergoodsform,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 下单参数处理
+            // params.data 参数 urlencode(base64_encode(json字符串))
+            // buy_type 下单类型（goods 立即购买、cart 购物车）
+            // goods_data 下单商品urlencode(base64_encode(json字符串[{goods_id,stock,spec}]))
+            // params['data'] = '{"buy_type":"goods","goods_data":"W3siZ29vZHNfaWQiOiI5Iiwic3RvY2siOjEsInNwZWMiOlt7InR5cGUiOiLpopzoibIiLCJ2YWx1ZSI6IueyieiJsiJ9LHsidHlwZSI6IuWwuueggSIsInZhbHVlIjoiTCJ9XX1"}';
+            // ids 购物车主键ids
+            if ((params.data || null) != null) {
+                params = JSON.parse(base64.decode(decodeURIComponent(params.data)));
+            }
+
+            // 设置参数
+            this.setData({
+                params: params,
+                is_realstore_model: (params.realstore_id || null) != null,
+                plugins_points_status: app.globalData.get_config('plugins_base.points.data.is_default_use_points', null) == 1,
+                pay_url: app.globalData.get_request_url('pay', 'order'),
+                qrcode_url: app.globalData.get_request_url('paycheck', 'order'),
+            });
+
+            // 删除地址缓存
+            uni.removeStorageSync(app.globalData.data.cache_buy_user_address_select_key);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 初始化配置
+            this.init_config();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    this.setData({
+                        currency_symbol: app.globalData.get_config('currency_symbol'),
+                        common_order_is_booking: app.globalData.get_config('config.common_order_is_booking'),
+                        plugins_points_status: app.globalData.get_config('plugins_base.points.data.is_default_use_points', null) == 1,
+                    });
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 获取数据
+            init() {
+                // 订单是否已经提交进入支付
+                if(this.is_order_submit_payment == 1) {
+                    uni.stopPullDownRefresh();
+                    return false;
+                }
+                // 订单参数信息是否正确
+                if (this.params == null) {
+                    this.setData({
+                        data_list_loding_status: 2,
+                        data_list_loding_msg: this.$t('buy.buy.p7e91u'),
+                    });
+                    uni.stopPullDownRefresh();
+                    return false;
+                }
+
+                // 本地缓存地址
+                if (this.is_first == 0) {
+                    var cache_address = uni.getStorageSync(app.globalData.data.cache_buy_user_address_select_key);
+                    if ((cache_address || null) != null) {
+                        this.setData({
+                            address: cache_address,
+                            address_id: cache_address.id,
+                        });
+                    }
+                }
+
+                // 是否门店订单
+                if (this.is_realstore_model) {
+                    var realstore_order_page = '/pages/plugins/realstore/orderallot-list/orderallot-list';
+                    this.setData({
+                        to_page_back: {
+                            title: this.$t('buy.buy.4is2ak'),
+                            page: realstore_order_page,
+                        },
+                        // 支付失败跳转的页面
+                        to_fail_page: realstore_order_page,
+                        // 现金--跳转指定页面
+                        to_appoint_page: realstore_order_page,
+                    });
+                }
+
+                // 加载loding
+                if(this.is_first == 0) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                var data = this.params;
+                data['address_id'] = this.address_id;
+                data['payment_id'] = this.payment_id;
+                data['site_model'] = this.buy_site_model_value;
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'buy'),
+                    method: 'POST',
+                    data: this.request_data_ext_params_merge(data),
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if(this.is_first == 0) {
+                            uni.hideLoading();
+                        }
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+
+                            // 基础数据
+                            this.setData({
+                                currency_symbol: data.currency_symbol || app.globalData.currency_symbol(),
+                                payment_list: data.payment_list || [],
+                            });
+
+                            // 首次
+                            if(this.is_first == 1) {
+                                // 赋值默认支付方式
+                                var default_payment_id = parseInt(data.default_payment_id || 0);
+                                if(this.payment_list.length > 0 && default_payment_id > 0) {
+                                    var temp_payment_ids = this.payment_list.map(function(item){return item.id;});
+                                    if(temp_payment_ids.indexOf(default_payment_id) != -1) {
+                                        this.setData({
+                                            payment_id: default_payment_id
+                                        });
+                                    }
+                                }
+                            }
+
+                            // 订单是否已提交、直接进入支付页面
+                            if ((data.is_order_submit || 0) == 1) {
+                                this.buy_submit_response_handle(res.data);
+                                return false;
+                            }
+
+                            // 处理订单初始化数据
+                            if (data.goods_list.length == 0) {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                });
+                            } else {
+                                // 下单选择时间
+                                var data_dt = this.buy_datetime_info || {};
+                                var temp_dt = data.buy_datetime_info || {};
+                                var datetime = {
+                                    // 是否开启时间选择
+                                    is_select: parseInt(temp_dt.is_select || 0) == 1,
+                                    // 是否必选
+                                    required: parseInt(temp_dt.required || 0) == 1,
+                                    // 状态
+                                    status: data_dt.status || parseInt(temp_dt.status || 0) == 1 || false,
+                                    // 默认值
+                                    value: data_dt.value || temp_dt.value || '',
+                                    // 标题
+                                    title: temp_dt.title || this.$t('buy.buy.s7rr5s'),
+                                    // 占位文本及标题
+                                    placeholder: temp_dt.placeholder || this.$t('buy.buy.1fi842'),
+                                    // 天起始时间
+                                    time_start: temp_dt.time_start || '',
+                                    // 天结束时间
+                                    time_end: temp_dt.time_end || '',
+                                    // 随机类型（区间还是固定时间, 0或1）
+                                    range_type: (temp_dt.range_type == undefined || parseInt(temp_dt.range_type || 0) == 1),
+                                    // 可选最大天数
+                                    range_day: parseInt(temp_dt.range_day || 2),
+                                    // 禁止选择的时间
+                                    disabled: temp_dt.disabled || '',
+                                    // 未选择错误提示
+                                    error_msg: temp_dt.error_msg || this.$t('buy.buy.q8u066'),
+                                };
+                                
+                                // 自提客户信息
+                                var data_ct = this.buy_extraction_contact_info || {};
+                                var temp_ct = data.buy_extraction_contact_info || {};
+                                var extraction_contact = {
+                                    is_write: parseInt(temp_ct.is_write || 0) == 1,
+                                    // 状态
+                                    status: data_ct.status || (temp_ct.status || 0) == 1 || false,
+                                    // 默认值、姓名和电话
+                                    name: data_ct.name || temp_ct.name || '',
+                                    tel: data_ct.tel || temp_ct.tel || '',
+                                    // 是否必选
+                                    required: parseInt(temp_ct.required || 0) == 1,
+                                    // 未选择错误提示
+                                    error_msg: temp_ct.error_msg || this.$t('buy.buy.8fghje'),
+                                };
+
+                                // 商品数据处理
+                                var goods_list = data.goods_list;
+                                for (var i in goods_list) {
+                                    // 扩展数据处理，
+                                    var temp_extension_data = [];
+                                    if ((goods_list[i]['order_base'] || null) != null && (goods_list[i]['order_base']['extension_data'] || null) != null) {
+                                        var temp_ext = goods_list[i]['order_base']['extension_data'];
+                                        for (var t in temp_ext) {
+                                            if (temp_ext[t]['is_buy_show'] == undefined || temp_ext[t]['is_buy_show'] == 1) {
+                                                temp_extension_data.push(temp_ext[t]);
+                                            }
+                                        }
+                                    }
+                                    goods_list[i]['order_base']['extension_data'] = temp_extension_data;
+                                }
+
+                                // 设置数据
+                                var plugins_coin_data = data.plugins_coin_data || null;
+                                this.setData({
+                                    goods_list: goods_list,
+                                    total_price: data.base.actual_price,
+                                    data_list_loding_status: 3,
+                                    common_site_type: data.common_site_type || 0,
+                                    buy_site_model_value: data.base.site_model || 0,
+                                    extraction_address: data.base.extraction_address || [],
+                                    buy_site_model_list: data.buy_site_model_list || [],
+                                    buy_datetime_info: datetime,
+                                    buy_extraction_contact_info: extraction_contact,
+                                    plugins_coupon_data: data.plugins_coupon_data || null,
+                                    plugins_points_data: data.plugins_points_data || null,
+                                    plugins_realstore_data: data.plugins_realstore_data || null,
+                                    plugins_intellectstools_data: data.plugins_intellectstools_data || null,
+                                    plugins_coin_data: plugins_coin_data,
+                                    plugins_coin_is_valid:  plugins_coin_data != null && (plugins_coin_data.accounts_list || null) != null &&  plugins_coin_data.accounts_list.length > 0,
+                                });
+
+                                // 非门店模式则赋值指定的类型模式
+                                if(this.is_first == 1) {
+                                    if (this.buy_site_model_list.length > 0) {
+                                        for(var i in this.buy_site_model_list) {
+                                            if(this.buy_site_model_list[i]['value'] == this.buy_site_model_value) {
+                                                this.setData({
+                                                    buy_site_model_active_index: i
+                                                });
+                                            }
+                                        }
+                                    }
+                                }
+
+                                // 可使用积分数量
+                                if (this.plugins_points_data != null && this.is_first == 1) {
+                                    this.setData({
+                                        actual_use_integral: this.plugins_points_data.use_integral || '',
+                                    });
+                                }
+
+                                // 优惠劵选择处理
+                                if ((data.plugins_coupon_data || null) != null) {
+                                    var plugins_choice_coupon_value = [];
+                                    for (var i in data.plugins_coupon_data) {
+                                        var cupk = data.plugins_coupon_data[i]['warehouse_id'];
+
+                                        if ((data.plugins_coupon_data[i]['coupon_data']['coupon_choice'] || null) != null) {
+                                            plugins_choice_coupon_value[cupk] = data.plugins_coupon_data[i]['coupon_data']['coupon_choice']['coupon']['desc'];
+                                        } else {
+                                            var coupon_count = (data.plugins_coupon_data[i]['coupon_data']['coupon_list'] || null) != null ? data.plugins_coupon_data[i]['coupon_data'].coupon_list.length : 0;
+                                            plugins_choice_coupon_value[cupk] = coupon_count > 0 ? this.$t('buy.buy.hw4l5m') + coupon_count + this.$t('buy.buy.5iuqow') : this.$t('buy.buy.4rb08b');
+                                        }
+                                    }
+
+                                    this.setData({
+                                        plugins_choice_coupon_value: plugins_choice_coupon_value,
+                                    });
+                                }
+
+                                // 地址
+                                this.setData({
+                                    address: data.base.address || null,
+                                    address_id: (data.base.address || null) != null ? data.base.address.id : null,
+                                });
+                                uni.setStorage({
+                                    key: app.globalData.data.cache_buy_user_address_select_key,
+                                    data: data.base.address || null,
+                                });
+
+                                // 非首次状态
+                                this.setData({
+                                    is_first: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'init')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        if(this.is_first == 0) {
+                            uni.hideLoading();
+                        }
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 请求参数合并
+            request_data_ext_params_merge(data) {
+                // 运费
+                var fee = this.plugins_freightfee_choice_data || null;
+                if (fee != null) {
+                    for (var i in fee) {
+                        data['freightfee_id_' + i] = fee[i];
+                    }
+                }
+
+                // 优惠券
+                var coupon_ids = this.plugins_use_coupon_ids;
+                if ((coupon_ids || null) != null && coupon_ids.length > 0) {
+                    for (var i in coupon_ids) {
+                        data['coupon_id_' + i] = coupon_ids[i];
+                    }
+                }
+
+                // 门店次卡
+                var key = 'realstore_card_value';
+                var realstore_value = this.plugins_choice_realstore_value;
+                if (Object.keys(realstore_value).length > 0) {
+                    data[key] = realstore_value;
+                } else {
+                    if (data[key] != undefined) {
+                        delete data[key];
+                    }
+                }
+
+                // 积分
+                data['is_points'] = this.plugins_points_status === true ? 1 : 0;
+                if (data['is_points'] == 1) {
+                    data['actual_use_integral'] = this.actual_use_integral;
+                }
+
+                // 虚拟币
+                data['plugins_coin_payment_id'] = this.plugins_coin_payment_id;
+
+                return data;
+            },
+
+            // 用户留言输入事件
+            bind_user_note_event(e) {
+                this.setData({
+                    user_note_value: e.detail.value,
+                });
+            },
+
+            // 用户留言点击
+            bind_user_note_tap_event(e) {
+                this.setData({
+                    user_note_status: true,
+                });
+            },
+
+            // 用户留言失去焦点
+            bind_user_note_blur_event(e) {
+                this.setData({
+                    user_note_status: false,
+                });
+            },
+
+            // 留言快捷选择
+            note_fast_event(e) {
+                var value = e.currentTarget.dataset.value;
+                var user_note = this.user_note_value || '';
+                if (user_note != '') {
+                    // 已存在则不追加
+                    if (user_note.indexOf(value) != -1) {
+                        return false;
+                    }
+                    // 有数据组则增加分割符号
+                    user_note += ',';
+                }
+                user_note += value;
+
+                // 大于限定长度则不增加
+                if (user_note.length <= 230) {
+                    this.setData({
+                        user_note_value: user_note,
+                    });
+                }
+            },
+
+            // 提交订单
+            buy_submit_event(e) {
+                // 表单数据
+                var data = this.params;
+                data['address_id'] = this.address_id;
+                data['payment_id'] = this.payment_id;
+                data['payment_type'] = this.payment_type;
+                data['user_note'] = this.user_note_value;
+                data['site_model'] = this.buy_site_model_value;
+
+                // 数据验证
+                var validation = [];
+                if (this.buy_site_model_value <= 2) {
+                    validation.push({
+                        fields: 'address_id',
+                        msg: this.$t('buy.buy.3740ur'),
+                        is_can_zero: 1,
+                    });
+                    if (!app.globalData.fields_check(data, validation)) {
+                        return false;
+                    }
+                }
+
+                // 订单商品表单插件数据验证处理
+                var buy_ordergoodsform = this.$refs.buy_ordergoodsform || [];
+                if (buy_ordergoodsform.length > 0) {
+                    for (var i in buy_ordergoodsform) {
+                        if (!buy_ordergoodsform[i].data_check()) {
+                            return false;
+                        }
+                    }
+                }
+
+                // 请求参数处理
+                data = this.request_data_ext_params_merge(data);
+
+                // 是否需要选择时间
+                var datetime = this.buy_datetime_info || {};
+                if ((datetime.is_select || false) == true) {
+                    // 是否必选
+                    if ((datetime.required || false) == true && (datetime.value || null) == null) {
+                        app.globalData.showToast(datetime.error_msg || this.$t('buy.buy.q8u066'));
+                        return false;
+                    }
+                    data['appoint_time'] = datetime.value || '';
+                }
+
+                // 自提客户名称和电话
+                var extraction_contact = this.buy_extraction_contact_info || {};
+                if ((extraction_contact.is_write || false) == true) {
+                    // 是否必选
+                    if ((extraction_contact.required || false) == true && ((extraction_contact.name || null) == null || (extraction_contact.tel || null) == null)) {
+                        app.globalData.showToast(extraction_contact.error_msg || this.$t('buy.buy.8fghje'));
+                        return false;
+                    }
+                    data['extraction_contact_name'] = extraction_contact.name || '';
+                    data['extraction_contact_tel'] = extraction_contact.tel || '';
+                }
+
+                // 是否需要选择支付方式、并且未选择虚拟币支付方式
+                if (this.total_price > 0 && this.common_order_is_booking != 1 && (this.plugins_coin_payment_id || null) == null) {
+                    if ((data.payment_id || null) == null) {
+                        app.globalData.showToast(this.$t('buy.buy.71kidy'));
+                        return false;
+                    }
+                }
+
+                // 加载loding
+                uni.showLoading({
+                    title: this.$t('buy.buy.r79t77'),
+                });
+                this.setData({
+                    buy_submit_disabled_status: true,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('add', 'buy'),
+                    method: 'POST',
+                    data: data,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            this.buy_submit_response_handle(res.data);
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                        this.setData({
+                            buy_submit_disabled_status: false,
+                        });
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        this.setData({
+                            buy_submit_disabled_status: false,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 订单提交响应处理
+            buy_submit_response_handle(res) {
+                // 是否预约模式，则进入订单列表
+                if (res.data.order_status == 0) {
+                    var self = this;
+                    uni.showModal({
+                        title: this.$t('common.warm_tips'),
+                        content: res.msg,
+                        confirmText: this.$t('common.confirm'),
+                        showCancel: false,
+                        success(res) {
+                            app.globalData.url_open(self.to_appoint_page, true);
+                        },
+                        fail(res) {
+                            app.globalData.url_open(self.to_appoint_page, true);
+                        },
+                    });
+                } else if(res.data.order_status == 2) {
+                    // 线下支付（开启线下订单正常进入流程）
+                    app.globalData.url_open(this.to_appoint_page, true);
+                    
+                } else {
+                    // 调起支付
+                    this.$refs.payment.pay_handle(res.data.order_ids.join(','), res.data.payment_id, this.payment_list);
+                }
+                this.setData({
+                    is_order_submit_payment: 1
+                });
+            },
+
+            // 支付方式选择
+            payment_event(e) {
+                var value = e.currentTarget.dataset.value;
+                this.setData({
+                    payment_id: (this.payment_id == value) ? 0 : value,
+                    plugins_coin_payment_id: 0,
+                });
+                this.init();
+            },
+
+            // 虚拟币支付方式选择
+            plugins_coin_payment_event(e) {
+                var value = e.currentTarget.dataset.value;
+                this.setData({
+                    plugins_coin_payment_id: (this.plugins_coin_payment_id == value) ? 0 : value,
+                    payment_id: 0,
+                });
+                this.init();
+            },
+
+            // 优惠劵弹层开启
+            plugins_coupon_open_event(e) {
+                var index = e.currentTarget.dataset.index;
+                var coupon_data = this.plugins_coupon_data[index]['coupon_data'];
+                var coupon_choice = coupon_data.coupon_choice || null;
+                var temp_list = coupon_data.coupon_list || [];
+                // 选中处理
+                if (temp_list.length > 0) {
+                    for (var i in temp_list) {
+                        temp_list[i]['is_active'] = (coupon_choice || null) !== null && coupon_choice.id == temp_list[i]['id'] ? 1 : 0;
+                    }
+                }
+                this.setData({
+                    plugins_coupon_list: temp_list,
+                    popup_plugins_coupon_status: true,
+                    popup_plugins_coupon_index: index,
+                });
+            },
+
+            // 优惠劵弹层关闭
+            plugins_coupon_close_event(e) {
+                this.setData({
+                    popup_plugins_coupon_status: false,
+                });
+            },
+
+            // 优惠劵选择
+            plugins_coupon_use_event(e) {
+                var index = e.currentTarget.dataset.index;
+                var value = e.currentTarget.dataset.value;
+                var temp_ids = this.plugins_use_coupon_ids;
+                if (this.popup_plugins_coupon_index !== null && temp_ids.indexOf(value) == -1) {
+                    var temp_data = this.plugins_coupon_data[this.popup_plugins_coupon_index];
+                    var temp_list = this.plugins_coupon_list;
+                    // 当前索引数据已选中则不处理
+                    if ((temp_list[index]['is_active'] || 0) != 1) {
+                        // 选中处理
+                        for (var i in temp_list) {
+                            temp_list[i]['is_active'] = index == i ? 1 : 0;
+                        }
+
+                        // 根据仓库id和优惠券id记录
+                        temp_ids[temp_data['warehouse_id']] = value;
+                        this.setData({
+                            plugins_use_coupon_ids: temp_ids,
+                            plugins_coupon_list: temp_list,
+                            popup_plugins_coupon_status: false,
+                        });
+
+                        // 重新获取数据
+                        this.init();
+                    }
+                }
+            },
+
+            // 不使用优惠劵
+            plugins_coupon_not_use_event(e) {
+                if (this.popup_plugins_coupon_index !== null) {
+                    var temp_data = this.plugins_coupon_data[this.popup_plugins_coupon_index];
+                    var temp_list = this.plugins_coupon_list;
+                    var temp = this.plugins_use_coupon_ids;
+                    for (var i in temp_list) {
+                        temp_list[i]['is_active'] = 0;
+                    }
+                    temp[temp_data['warehouse_id']] = 0;
+                    this.setData({
+                        plugins_coupon_list: temp_list,
+                        plugins_use_coupon_ids: temp,
+                        popup_plugins_coupon_status: false,
+                    });
+                    this.init();
+                }
+            },
+
+            // 运费选择事件
+            plugins_freightfee_change_event(e) {
+                var temp = this.plugins_freightfee_choice_data;
+                temp[e.currentTarget.dataset.wid] = parseInt(e.detail.value);
+                this.setData({
+                    plugins_freightfee_choice_data: temp,
+                });
+                this.init();
+            },
+
+            // 地址选择事件
+            address_event(e) {
+                // 带上参数
+                var json = this.params || null;
+                if (json != null) {
+                    var params =
+                        '&' +
+                        Object.keys(json)
+                            .map(function (key) {
+                                var temp_val = json[key] === undefined || json[key] === null ? '' : json[key];
+                                return encodeURIComponent(key) + '=' + encodeURIComponent(temp_val);
+                            })
+                            .join('&');
+                } else {
+                    var params = '';
+                }
+
+                // 快递、同城、自提 需要选择地址
+                if (this.buy_site_model_value <= 1) {
+                    app.globalData.url_open('/pages/user-address/user-address?is_back=1' + params);
+                } else if (this.buy_site_model_value == 2) {
+                    app.globalData.url_open('/pages/extraction-address/extraction-address?is_back=1&is_buy=1' + params);
+                } else {
+                    app.globalData.showToast(this.$t('buy.buy.31616e'));
+                }
+            },
+
+            // 销售,同城,自提,虚拟 模式选择事件
+            buy_site_model_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                if (index != this.buy_site_model_active_index) {
+                    // 数据设置
+                    var upd_data = {
+                        address: null,
+                        address_id: null,
+                        buy_site_model_value: e.currentTarget.dataset.value || 0,
+                        buy_site_model_active_index: index,
+                    };
+
+                    // 是否门店模式下
+                    if (this.is_realstore_model) {
+                        // 覆盖选择的门店下单类型参数索引值
+                        upd_data['params'] = {...this.params, ...{buy_use_type_data_index: this.buy_site_model_list[index]['index']}};
+                    }
+                    this.setData(upd_data);
+
+                    // 删除地址缓存
+                    uni.removeStorageSync(app.globalData.data.cache_buy_user_address_select_key);
+
+                    // 数据初始化
+                    this.init();
+                }
+            },
+
+            // 地图查看
+            map_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var data = this.goods_list[index] || null;
+                if (data == null) {
+                    app.globalData.showToast(this.$t('user-order-detail.user-order-detail.i876o3'));
+                    return false;
+                }
+
+                // 打开地图
+                var name = data.alias || data.name || '';
+                var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || '');
+                app.globalData.open_location(data.lng, data.lat, name, address);
+            },
+
+            // 积分使用值输入事件
+            points_use_value_event(e) {
+                var value = parseInt(e.detail.value || 0);
+                var use_integral = parseInt(this.plugins_points_data.use_integral || 0);
+                if (value > use_integral && use_integral > 0) {
+                    value = use_integral;
+                }
+                this.setData({
+                    actual_use_integral: value || '',
+                });
+            },
+
+            // 积分使用值确认事件
+            points_use_value_confirm_event(e) {
+                this.setData({
+                    plugins_points_status: this.actual_use_integral > 0,
+                });
+                this.init();
+            },
+
+            // 积分选择事件
+            points_event(e) {
+                this.setData({
+                    plugins_points_status: !this.plugins_points_status,
+                    actual_use_integral: this.actual_use_integral > 0 ? this.actual_use_integral : this.plugins_points_data.use_integral,
+                });
+                this.init();
+            },
+
+            // 仓库事件
+            warehouse_group_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 下单选择时间
+            buy_datetime_event(e) {
+                var temp = this.buy_datetime_info;
+                temp['status'] = !temp.status;
+                if (e != 'open' && e != 'close') {
+                    temp['value'] = ((e || null) != null ? e.value : '') || '';
+                }
+                this.setData({
+                    buy_datetime_info: temp,
+                });
+            },
+
+            // 自提客户名称和电话输入事件
+            extraction_contact_event(e) {
+                var temp = this.buy_extraction_contact_info;
+                temp[e.currentTarget.dataset.value] = e.detail.value || '';
+                this.setData({
+                    buy_extraction_contact_info: temp,
+                });
+            },
+
+            // 打开次卡选择
+            plugins_realstore_open_event(e) {
+                this.setData({
+                    popup_plugins_realstore_status: true,
+                    popup_plugins_realstore_group_id: e.currentTarget.dataset.groupid || 0,
+                    popup_plugins_realstore_card_index: e.currentTarget.dataset.index || 0,
+                });
+            },
+
+            // 关闭次卡选择
+            plugins_realstore_close_event(e) {
+                this.setData({
+                    popup_plugins_realstore_status: false,
+                });
+            },
+
+            // 次卡选择事件
+            plugins_realstore_use_event(e) {
+                var type = e.currentTarget.dataset.type;
+                var group_id = this.popup_plugins_realstore_group_id;
+                var card_index = this.popup_plugins_realstore_card_index;
+                var id = this.plugins_realstore_data['user_card'][group_id]['data'][card_index]['id'];
+                var temp = this.plugins_choice_realstore_value;
+                if (type == 1) {
+                    if (temp[group_id] == undefined) {
+                        temp[group_id] = {};
+                    }
+                    temp[group_id][id] = {
+                        group_id: group_id,
+                        data_id: id,
+                        card_id: e.currentTarget.dataset.value,
+                    };
+                } else {
+                    if (temp[group_id] != undefined && temp[group_id][id] != undefined) {
+                        delete temp[group_id][id];
+                        if (Object.keys(temp[group_id]).length <= 0) {
+                            delete temp[group_id];
+                        }
+                    }
+                }
+                this.setData({
+                    plugins_choice_realstore_value: temp,
+                    popup_plugins_realstore_status: false,
+                });
+                this.init();
+            },
+        },
+    };
+</script>
+<style>
+    @import './buy.css';
+</style>
diff --git a/pages/cart-page/cart-page.vue b/pages/cart-page/cart-page.vue
new file mode 100644
index 0000000..8c027e1
--- /dev/null
+++ b/pages/cart-page/cart-page.vue
@@ -0,0 +1,56 @@
+<template>
+    <view :class="theme_view">
+        <!-- 购物车 -->
+        <component-cart ref="cart" :propCartNavBottomValue="footer_height_value" propSourceType="page"></component-cart>
+
+        <!-- 快捷导航 -->
+        <component-quick-nav :propIsBar="true"></component-quick-nav>
+
+        <!-- 公共 -->
+        <component-common ref="common" @onFooterHeight="footer_height_value_event" :propIsFooterSeat="false"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentQuickNav from '@/components/quick-nav/quick-nav';
+    import componentCart from '@/components/cart/cart';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                footer_height_value: 0
+            };
+        },
+        components: {
+            componentCommon,
+            componentQuickNav,
+            componentCart,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        methods: {
+            // 底部菜单高度
+            footer_height_value_event(value) {
+                this.setData({
+                    footer_height_value: value
+                });
+            }
+        },
+    };
+</script>
+<style></style>
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
new file mode 100644
index 0000000..0da63ae
--- /dev/null
+++ b/pages/cart/cart.vue
@@ -0,0 +1,63 @@
+<template>
+    <view :class="theme_view">
+        <!-- 购物车 -->
+        <component-cart ref="cart" :propCartNavBottomValue="footer_height_value"></component-cart>
+
+        <!-- 公共 -->
+        <component-common ref="common" @onFooterHeight="footer_height_value_event" :propIsFooterSeat="false"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentCart from "@/components/cart/cart";
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                footer_height_value: 0
+            };
+        },
+        components: {
+            componentCommon,
+            componentCart
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 初始化
+            this.init();
+        },
+
+        methods: {
+            // 初始化
+            init() {
+                // 数据加载
+                if ((this.$refs.cart || null) != null) {
+                    this.$refs.cart.init();
+                }
+
+                // 公共onshow事件
+                if ((this.$refs.common || null) != null) {
+                    this.$refs.common.on_show({object: this, method: 'init'});
+                }
+            },
+
+            // 底部菜单高度
+            footer_height_value_event(value) {
+                this.setData({
+                    footer_height_value: value
+                });
+            }
+        }
+    };
+</script>
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/common/open-setting-location/open-setting-location.css b/pages/common/open-setting-location/open-setting-location.css
new file mode 100644
index 0000000..6faa539
--- /dev/null
+++ b/pages/common/open-setting-location/open-setting-location.css
@@ -0,0 +1,41 @@
+page {
+    background: #fbfbfb;
+}
+.open-setting-view {
+    background: hsla(0, 0%, 0%, 0.1);
+    position: fixed;
+    top: 0;
+    /*  #ifdef  H5  */
+    top: calc(88rpx + env(safe-area-inset-top));
+    /*  #endif  */
+    left: 0;
+    width: 100%;
+    height: 100%;
+    text-align: center;
+    z-index: 1000000;
+}
+.open-setting-view .content {
+    margin: 0 auto;
+    width: 360rpx;
+    height: 200rpx;
+    padding: 50rpx;
+    border-radius: 12rpx;
+    margin-top: 70%;
+    position: relative;
+}
+.open-setting-view .content button {
+    margin-top: 15rpx;
+}
+.open-setting-view .content .value {
+    margin-top: 5rpx;
+}
+.open-setting-view .content .value text {
+    font-weight: 500;
+    color: #333;
+}
+.open-setting-loding {
+    padding-top: 35%;
+}
+.open-setting-loding image {
+    margin: 0 auto;
+}
\ No newline at end of file
diff --git a/pages/common/open-setting-location/open-setting-location.vue b/pages/common/open-setting-location/open-setting-location.vue
new file mode 100644
index 0000000..58a6d1b
--- /dev/null
+++ b/pages/common/open-setting-location/open-setting-location.vue
@@ -0,0 +1,149 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="is_show_open_setting" class="open-setting-view">
+            <view class="content bg-white">
+                <view class="msg cr-grey">{{$t('open-setting-location.open-setting-location.61wezw')}}</view>
+                <view class="value cr-base">{{$t('open-setting-location.open-setting-location.6vev38')}}<text>{{$t('open-setting-location.open-setting-location.lult41')}}</text>{{$t('open-setting-location.open-setting-location.407106')}}</view>
+                <button type="primary" open-type="openSetting" size="mini" @opensetting="setting_event">{{$t('open-setting-location.open-setting-location.65q4b3')}}</button>
+                <view class="tc margin-top-sm">
+                    <navigator open-type="navigateBack" class="cp cr-grey dis-inline-block" hover-class="none">{{$t('common.return')}}</navigator>
+                </view>
+            </view>
+        </view>
+        <view v-else class="open-setting-loding">
+            <image :src="common_static_url + 'bg-loding.gif'" class="avatar dis-block" mode="widthFix"></image>
+            <view class="tc margin-top-sm">
+                <navigator open-type="navigateBack" class="cp cr-grey dis-inline-block" hover-class="none">{{$t('common.return')}}</navigator>
+            </view>
+        </view>
+        <view v-if="(error_msg || null) != null" class="cr-red margin-top-lg padding-horizontal-main">{{ error_msg }}</view>
+    </view>
+</template>
+<script>
+const app = getApp();
+
+var common_static_url = app.globalData.get_static_url("common");
+export default {
+    data() {
+        return {
+            theme_view: app.globalData.get_theme_value_view(),
+            common_static_url: common_static_url,
+            params: null,
+            is_show_open_setting: false,
+            auth: "scope.userLocation",
+            cache_key: app.globalData.data.cache_userlocation_key,
+            error_msg: null,
+        };
+    },
+
+    components: {},
+
+    onLoad(params) {
+        // 调用公共事件方法
+        app.globalData.page_event_onload_handle(params);
+
+        // 设置参数
+        this.setData({
+            params: params,
+        });
+        this.init();
+    },
+
+    onShow() {
+        // 调用公共事件方法
+        app.globalData.page_event_onshow_handle();
+    },
+
+    methods: {
+        // 获取权限
+        init() {
+            app.globalData.get_location_check(this.auth, this, "location_back_handle");
+        },
+
+        // 位置权限校验回调
+        location_back_handle(status = 0) {
+            if (status == 1) {
+                // 是否校验成功直接返回
+                if (parseInt(this.params.is_check_success_back || 0) == 1) {
+                    uni.navigateBack();
+                } else {
+                    this.choose_location();
+                }
+            } else {
+                this.setData({
+                    is_show_open_setting: true,
+                });
+            }
+        },
+
+        // 配置打开事件
+        setting_event(e) {
+            if (e.detail.authSetting[this.auth]) {
+                // 不展示打开设置的按钮容器
+                this.setData({
+                    is_show_open_setting: false,
+                });
+
+                // 是否校验成功直接返回
+                if (parseInt(this.params.is_check_success_back || 0) == 1) {
+                    uni.navigateBack();
+                } else {
+                    this.choose_location();
+                }
+            }
+        },
+
+        // 打开位置服务
+        choose_location() {
+            // app先返回当前页面再调用位置选择组件
+            // #ifdef APP
+            uni.navigateBack();
+            // #endif
+
+            // 调用位置选择组件
+            uni.chooseLocation({
+                success: (res) => {
+                    // 位置数据存储缓存中，改变状态值（成功）
+                    res['status'] = 1;
+                    res['lat'] = res.latitude;
+                    res['lng'] = res.longitude;
+                    delete res['latitude'];
+                    delete res['longitude'];
+                    uni.setStorageSync(this.cache_key, res);
+
+                    // 触发自定义事件并传递参数给上一页
+                    uni.$emit('refresh', { location_success: true });
+
+                    // app则不执行返回操作、上面已经返回过了
+                    // #ifndef APP
+                    setTimeout(function () {
+                        uni.navigateBack();
+                    }, 500);
+                    // #endif
+                },
+                fail: (res) => {
+                    // 存在数据则改变状态值（失败）
+                    var result = {...(uni.getStorageSync(this.cache_key) || {}), ...{status: 3}};
+                    uni.setStorageSync(this.cache_key, result);
+
+                    // 取消则自动返回、则显示错误
+                    // error=11 支付宝取消、msg包含cancel则其他平台
+                    var msg = res.errorMessage || res.chooseLocation || res.errMsg || this.$t('open-setting-location.open-setting-location.hwn386');
+                    if(res.error == 11 || msg.indexOf('cancel') != -1) {
+                        // app则不执行返回操作、上面已经返回过了
+                        // #ifndef APP
+                        uni.navigateBack();
+                        // #endif
+                    } else {
+                        this.setData({ error_msg: res.errMsg });
+                        app.globalData.showToast(res.errMsg);
+                    }
+                }
+            });
+        }
+    },
+};
+</script>
+<style>
+@import "./open-setting-location.css";
+</style>
diff --git a/pages/customview/customview.vue b/pages/customview/customview.vue
new file mode 100644
index 0000000..b936901
--- /dev/null
+++ b/pages/customview/customview.vue
@@ -0,0 +1,146 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data || null) != null">
+            <!-- 搜索 -->
+            <block v-if="(data.is_header || 0) == 1">
+                <!-- 搜索框 -->
+                <view class="padding-main bg-white">
+                    <component-search propClass="br" :propPlaceholder="$t('customview.customview.726k7y')"></component-search>
+                </view>
+            </block>
+
+            <!-- 内容 -->
+            <mp-html :content="data.html_content" />
+
+            <!-- 结尾 -->
+            <block v-if="(data.is_footer || 0) == 1">
+                <!-- 结尾 -->
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            </block>
+        </view>
+        <view v-else>
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentSearch from "@/components/search/search";
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                params: {},
+                data: null,
+                // 自定义分享信息
+                share_info: {}
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentSearch,
+            componentNoData,
+            componentBottomLine
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.get_data();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        methods: {
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url("index", "customview"),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: res => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data: data.data || null,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: true
+                            });
+
+                            if ((this.data || null) != null) {
+                                // 基础自定义分享
+                                this.setData({
+                                    share_info: {
+                                        title: this.data.seo_title || this.data.name,
+                                        desc: this.data.seo_desc,
+                                        path: '/pages/customview/customview',
+                                        query: 'id='+this.data.id,
+                                        img: this.data.logo
+                                    }
+                                });
+
+                                // 标题名称
+                                uni.setNavigationBarTitle({
+                                    title: this.data.name
+                                });
+                            }
+
+                            // 分享菜单处理
+                            app.globalData.page_share_handle(this.share_info);
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg
+                            });
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips')
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    }
+                });
+            }
+        }
+    };
+</script>
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/design/design.vue b/pages/design/design.vue
new file mode 100644
index 0000000..a0fa6a7
--- /dev/null
+++ b/pages/design/design.vue
@@ -0,0 +1,193 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="(data || null) != null">
+            <!-- 搜索 -->
+            <block v-if="(data.is_header || 0) == 1">
+                <!-- 搜索框 -->
+                <view class="padding-main bg-white">
+                    <component-search propClass="br" :propPlaceholder="$t('customview.customview.726k7y')"></component-search>
+                </view>
+            </block>
+
+            <!-- 拖拽模式、引入拖拽数据模块 -->
+            <component-layout :propData="layout_data"></component-layout>
+
+            <!-- 结尾 -->
+            <block v-if="(data.is_footer || 0) == 1">
+                <!-- 结尾 -->
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            </block>
+        </block>
+        <block v-else>
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentLayout from "@/components/layout/layout";
+    import componentSearch from "@/components/search/search";
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                load_status: 0,
+                params: null,
+                data: null,
+                layout_data: [],
+                // 自定义分享信息
+                share_info: {}
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentLayout,
+            componentSearch,
+            componentNoData,
+            componentBottomLine
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.get_data();
+
+            // 公共onshow事件
+            this.init_common();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        methods: {
+            // 初始化公共
+            init_common() {
+                // 公共onshow事件
+                if ((this.$refs.common || null) != null) {
+                    this.$refs.common.on_show();
+                }
+            },
+
+            // 获取数据
+            get_data(params = {}) {
+                // 还没有数据则读取缓存
+                var cache_key = app.globalData.data.cache_design_page_data_key+(this.params.id || 0);
+                if (this.load_status == 0) {
+                    // 本地缓存数据
+                    var upd_data = uni.getStorageSync(cache_key) || null;
+                    if (upd_data != null) {
+                        // 先使用缓存数据展示
+                        this.setData(upd_data);
+
+                        // 已有本地缓存则直接取远程有效数据（默认首次取的是远程缓存数据）
+                        params['is_cache'] = 0;
+
+                        // 公共onshow事件
+                        this.init_common();
+                    }
+                } else {
+                    // 已有本地缓存则直接取远程有效数据（默认首次取的是远程缓存数据）
+                    params['is_cache'] = 0;
+                }
+                uni.request({
+                    url: app.globalData.get_request_url("index", "design"),
+                    method: 'POST',
+                    data: {...this.params, ...params},
+                    dataType: 'json',
+                    success: res => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var upd_data = {
+                                data: (data.data || null) != null && data.data.length != 0 ? data.data : null,
+                                layout_data: data.layout_data || [],
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: true
+                            };
+                            this.setData(upd_data);
+
+                            // 存储缓存
+                            uni.setStorageSync(cache_key, upd_data);
+
+                            // 是否需要重新加载数据
+                            if (parseInt(data.is_result_data_cache || 0) == 1) {
+                                this.get_data({ is_cache: 0 });
+                            }
+
+                            if ((this.data || null) != null) {
+                                // 基础自定义分享
+                                this.setData({
+                                    share_info: {
+                                        title: this.data.seo_title || this.data.name,
+                                        desc: this.data.seo_desc,
+                                        path: '/pages/design/design',
+                                        query: 'id='+this.data.id,
+                                        img: this.data.logo
+                                    }
+                                });
+
+                                // 标题名称
+                                uni.setNavigationBarTitle({
+                                    title: this.data.name
+                                });
+
+                                // 公共onshow事件
+                                this.init_common();
+                            }
+
+                            // 分享菜单处理
+                            app.globalData.page_share_handle(this.share_info);
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg
+                            });
+                        }
+
+                        // 非首次状态
+                        this.setData({
+                            load_status: 1
+                        });
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            load_status: 1,
+                            data_list_loding_msg: this.$t('common.internet_error_tips')
+                        });
+                    }
+                });
+            }
+        }
+    };
+</script>
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/diy/diy.vue b/pages/diy/diy.vue
new file mode 100644
index 0000000..d0db251
--- /dev/null
+++ b/pages/diy/diy.vue
@@ -0,0 +1,208 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="(data || null) != null && (data.config || null) != null">
+            <!-- diy模块 -->
+            <componentDiy :propValue="data.config" :propDataId="data.id" :propKey="random_value" @onLocationBack="user_back_choice_location">
+                <!-- 底部内容 -->
+                <template slot="diy-bottom-content">
+                    <!-- 结尾 -->
+                    <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+                </template>
+                <!-- 底部公共 -->
+                <template slot="diy-bottom-common">
+                    <component-common ref="common"></component-common>
+                </template>
+            </componentDiy>
+        </block>
+        <block v-else>
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentDiy from '@/components/diy/diy';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    export default {
+        components: {
+            componentCommon,
+            componentDiy,
+            componentNoData,
+            componentBottomLine,
+        },
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                load_status: 0,
+                params: null,
+                data: null,
+                // 自定义分享信息
+                share_info: {},
+                // 增加随机数，避免无法监听数据列表内部数据更新
+                random_value: 0,
+            };
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.get_data();
+
+            // 公共onshow事件
+            this.init_common();
+
+            // 设置顶部导航的默认颜色
+            this.set_navigation_bar_color();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        methods: {
+            // 初始化公共
+            init_common() {
+                // 公共onshow事件
+                if ((this.$refs.common || null) != null) {
+                    this.$refs.common.on_show();
+                }
+            },
+
+            // 获取数据
+            get_data(params = {}) {
+                // 还没有数据则读取缓存
+                var cache_key = app.globalData.data.cache_diy_page_data_key + (this.params.id || 0);
+                if (this.load_status == 0) {
+                    // 本地缓存数据
+                    var upd_data = uni.getStorageSync(cache_key) || null;
+                    if (upd_data != null) {
+                        // 先使用缓存数据展示
+                        this.setData(upd_data);
+
+                        // 已有本地缓存则直接取远程有效数据（默认首次取的是远程缓存数据）
+                        params['is_cache'] = 0;
+
+                        // 设置顶部导航的默认颜色
+                        this.set_navigation_bar_color();
+
+                        // 公共onshow事件
+                        this.init_common();
+                    }
+                } else {
+                    // 已有本地缓存则直接取远程有效数据（默认首次取的是远程缓存数据）
+                    params['is_cache'] = 0;
+                }
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'diy'),
+                    method: 'POST',
+                    data: { ...this.params, ...params },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var upd_data = {
+                                data: data.data || null,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: true,
+                                random_value: Math.random(),
+                            };
+                            this.setData(upd_data);
+                            // 存储缓存
+                            uni.setStorageSync(cache_key, upd_data);
+
+                            // 是否需要重新加载数据
+                            if (parseInt(data.is_result_data_cache || 0) == 1) {
+                                this.get_data({ is_cache: 0 });
+                            }
+
+                            if ((this.data || null) != null) {
+                                // 基础自定义分享
+                                this.setData({
+                                    share_info: {
+                                        title: this.data.name,
+                                        desc: this.data.describe,
+                                        path: '/pages/diy/diy',
+                                        query: 'id=' + this.data.id,
+                                        img: this.data.logo,
+                                    },
+                                });
+
+                                // 标题名称
+                                uni.setNavigationBarTitle({
+                                    title: this.data.name,
+                                });
+
+                                // 设置顶部导航的默认颜色
+                                this.set_navigation_bar_color();
+
+                                // 公共onshow事件
+                                this.init_common();
+                            }
+
+                            // 分享菜单处理
+                            app.globalData.page_share_handle(this.share_info);
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                        }
+
+                        // 非首次状态
+                        this.setData({
+                            load_status: 1,
+                        });
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            load_status: 1,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+
+            // 状态栏设置
+            set_navigation_bar_color() {
+                app.globalData.set_navigation_bar_color(parseInt(app.globalData.get_key_data(this.data, 'config.header.com_data.style.function_buttons_type', 0)) == 1);
+            },
+
+            // 选择用户地理位置回调
+            user_back_choice_location(e) {
+                // 重新刷新数据
+                this.get_data();
+            },
+        },
+    };
+</script>
+<style scoped lang="scss">
+// ::v-deep ::-webkit-scrollbar {
+//     /* 滚动条整体样式 */  
+//     display: block !important;  
+//     width: 4rpx;
+// }
+</style>
diff --git a/pages/error/error.vue b/pages/error/error.vue
new file mode 100644
index 0000000..c311a3e
--- /dev/null
+++ b/pages/error/error.vue
@@ -0,0 +1,66 @@
+<template>
+    <view :class="theme_view">
+        <view class="content padding-horizontal-main tc">
+            <view class="margin-top-xxxl">
+                <icon type="warn" size="16" color="#f00" class="va-m" />
+                <view class="cr-red va-m dis-inline-block margin-left-sm">
+                    <block v-if="(params || null) != null && (params.msg || null) != null">{{params.msg}}</block>
+                    <block v-else>{{$t('error.error.u697ih')}}</block>
+                </view>
+            </view>
+            <view class="margin-top-xxl">
+                <button type="default" size="mini" class="bg-main br-main cr-white round text-size-sm padding-left-xxxl padding-right-xxxl padding-top-xs padding-bottom-xs margin-top-xl" @tap="back_event">{{$t('common.return')}}</button>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import base64 from '@/common/js/lib/base64.js';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                params: null
+            };
+        },
+        components: {},
+
+        // 页面加载初始化
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            if((params.msg || null) != null) {
+                params['msg'] = base64.decode(decodeURIComponent(params.msg));
+            }
+            this.setData({
+                params: params
+            });
+        },
+
+        // 页面显示
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 方法
+        methods: {
+            // 返回
+            back_event(e) {
+                app.globalData.page_back_prev_event();
+            }
+        }
+    };
+</script>
+<style>
+    .content {
+        padding-top: 30%;
+    }
+</style>
\ No newline at end of file
diff --git a/pages/extraction-address/extraction-address.css b/pages/extraction-address/extraction-address.css
new file mode 100644
index 0000000..9043aad
--- /dev/null
+++ b/pages/extraction-address/extraction-address.css
@@ -0,0 +1,15 @@
+.address-logo {
+    width: 140rpx;
+    height: 140rpx !important;
+}
+.address .item-icon {
+    width: 25rpx;
+    height: 28rpx !important;
+}
+.address-alias {
+    padding: 0 10rpx;
+}
+.address .text {
+    line-height: 44rpx;
+    width: calc(100% - 35rpx);
+}
\ No newline at end of file
diff --git a/pages/extraction-address/extraction-address.vue b/pages/extraction-address/extraction-address.vue
new file mode 100644
index 0000000..7d73894
--- /dev/null
+++ b/pages/extraction-address/extraction-address.vue
@@ -0,0 +1,255 @@
+<template>
+    <view :class="theme_view">
+        <view class="page">
+            <view v-if="data_list.length > 0" class="padding-main">
+                <view v-for="(item, index) in data_list" :key="index" class="item bg-white padding-main border-radius-main spacing-mb">
+                    <view @tap="address_conent_event" :data-index="index" class="oh">
+                        <view v-if="(item.logo || null) != null" class="fl oh margin-right-lg">
+                            <image class="dis-block address-logo radius" :src="item.logo" mode="widthFix"></image>
+                        </view>
+                        <view class="oh">
+                            <view class="base oh padding-bottom-main padding-top-xs">
+                                <text v-if="(item.alias || null) != null" class="address-alias br-main cr-main round margin-right-sm">{{ item.alias }}</text>
+                                <text>{{ item.name }}</text>
+                                <text class="fr">{{ item.tel }}</text>
+                            </view>
+                            <view class="address oh padding-top-sm">
+                                <image class="item-icon fl margin-top-xs" :src="common_static_url + 'map-icon.png'" mode="widthFix"></image>
+                                <view class="text fr"> {{ item.province_name || "" }}{{ item.city_name || "" }}{{ item.county_name || "" }}{{ item.address || "" }} </view>
+                            </view>
+                        </view>
+                    </view>
+                    <view v-if="((item.distance_value || null) != null && (item.distance_unit || null) != null) || ((item.lng || 0) != 0 && (item.lat || 0) != 0)" class="item-operation br-t oh padding-top-main margin-top-main">
+                        <view v-if="(item.distance_value || null) != null && (item.distance_unit || null) != null" class="fl margin-top-sm">
+                            <text class="cr-grey text-size-xs">{{$t('extraction-address.extraction-address.42v8tv')}}{{ item.distance_value }}{{ item.distance_unit }}</text>
+                        </view>
+                        <button v-if="(item.lng || 0) != 0 && (item.lat || 0) != 0" class="fr round bg-white cr-base br" type="default" size="mini" @tap="address_map_event" :data-index="index" hover-class="none">{{$t('buy.buy.o7722q')}}</button>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+
+<script>
+const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    var common_static_url = app.globalData.get_static_url("common");
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_list: [],
+                params: null,
+                is_default: 0,
+                is_first: 1,
+                home_extraction_address_position: 0,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+                home_extraction_address_position: app.globalData.get_config("config.home_extraction_address_position", 0),
+            });
+        },
+
+        onReady() {
+            // #ifndef MP-KUAISHOU
+            // 是否获取位置、下单选择地址进入需要传参 is_buy
+            if ((this.params.is_buy || 0) == 1 && this.home_extraction_address_position == 1) {
+                app.globalData.choose_user_location_event();
+            }
+            // #endif
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // #ifndef MP-KUAISHOU
+            // 是否需要选择地理位置、这里不校验参数is_buy，仅页面进入才需要校验is_buy进入位置选择页面
+            if (this.home_extraction_address_position == 1) {
+                // 首次不请求数据
+                if (this.is_first == 0) {
+                    // 先解绑自定义事件
+                    uni.$off('refresh');
+                    // 监听自定义事件并进行页面刷新操作
+                    uni.$on('refresh', (data) => {
+                        // 初始位置数据
+                        if((data.location_success || false) == true) {
+                            // 重新请求数据
+                            // #ifdef APP
+                            this.init();
+                            // #endif
+                        }
+                    });
+
+                    // 初始化数据
+                    this.init();
+                }
+            } else {
+                this.init();
+            }
+            // #endif
+            // #ifdef MP-KUAISHOU
+            this.init();
+            // #endif
+
+            // 首次状态
+            this.setData({
+                is_first: 0,
+            });
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data_list();
+        },
+
+        methods: {
+            // 初始化
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据列表
+            get_data_list() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+
+                // 获取数据
+                var data = this.params || {};
+
+                // 是否有坐标
+                var user_location = app.globalData.choice_user_location_init();
+                if ((user_location || null) != null) {
+                    data["lng"] = user_location.lng;
+                    data["lat"] = user_location.lat;
+                }
+
+                // 请求接口
+                uni.request({
+                    url: app.globalData.get_request_url("extraction", "useraddress"),
+                    method: "POST",
+                    data: data,
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.length > 0) {
+                                // 获取当前默认地址
+                                var is_default = 0;
+                                for (var i in res.data.data) {
+                                    if (res.data.data[i]["is_default"] == 1) {
+                                        is_default = res.data.data[i]["id"];
+                                    }
+                                }
+
+                                // 设置数据
+                                this.setData({
+                                    data_list: res.data.data,
+                                    is_default: is_default,
+                                    data_list_loding_status: 3,
+                                    data_bottom_line_status: true,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 地图查看
+            address_map_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var data = this.data_list[index] || null;
+                if (data == null) {
+                    app.globalData.showToast(this.$t('user-order-detail.user-order-detail.i876o3'));
+                    return false;
+                }
+
+                // 打开地图
+                var name = data.alias || data.name || "";
+                var address = (data.province_name || "") + (data.city_name || "") + (data.county_name || "") + (data.address || "");
+                app.globalData.open_location(data.lng, data.lat, name, address);
+            },
+
+            // 地址内容事件
+            address_conent_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var is_back = this.params.is_back || 0;
+                if (is_back == 1) {
+                    uni.setStorage({
+                        key: app.globalData.data.cache_buy_user_address_select_key,
+                        data: this.data_list[index],
+                    });
+                    uni.navigateBack();
+                }
+            },
+        },
+    };
+</script>
+<style>
+    @import "./extraction-address.css";
+</style>
diff --git a/pages/goods-category/goods-category.css b/pages/goods-category/goods-category.css
new file mode 100644
index 0000000..3f049f6
--- /dev/null
+++ b/pages/goods-category/goods-category.css
@@ -0,0 +1,335 @@
+/**
+ * 头部背景
+ */
+.goods-top-bg {
+    height: calc(320rpx + var(--status-bar-height) + 5px);
+    /* #ifdef H5 */
+    height: 286rpx;
+    /* #endif */
+    background-color: #f5f5f5;
+}
+.goods-top-search-bg {
+    background-color: #f5f5f5;
+}
+
+/**
+ * 导航搜索、内容区域
+ */
+.nav-search {
+    padding-right: 250rpx;
+    /* #ifdef MP-ALIPAY */
+    padding-right: 255rpx;
+    padding-left: 80rpx;
+    /* #endif */
+    /* #ifdef H5 || MP-TOUTIAO || APP */
+    padding-right: 20rpx;
+    /* #endif */
+    /* #ifdef H5 */
+    padding-top: 20rpx !important;
+    /* #endif */
+    padding-bottom: 20rpx;
+    height: 64rpx;
+    z-index: 5;
+}
+.nav-more-top {
+    /* #ifdef H5 || APP */
+    top: 135rpx !important;
+    /* #endif */
+}
+
+/**
+* 左侧导航
+*/
+.left-nav {
+    width: 200rpx;
+    background-color: #f5f5f5;
+    height: 100%;
+}
+.left-nav .item {
+    height: 80rpx;
+    line-height: 80rpx;
+    padding: 0 10rpx;
+    background: #f5f5f5;
+}
+.left-nav .nav-active {
+    background: #fff;
+    font-weight: 500;
+}
+
+/**
+*  右侧内容
+*/
+.right-container {
+    width: calc(100% - 200rpx);
+    height: 100%;
+    top: 0;
+    right: 0;
+    background: #f5f5f5;
+}
+.content-item {
+    width: calc(100% / 3);
+}
+.content-item .content {
+    padding: 28rpx;
+}
+.content-item .text {
+    font-weight: 600;
+}
+.content-item .icon {
+    width: 92rpx;
+    height: 92rpx;
+}
+.content-item.two-img .icon {
+    width: 104rpx;
+    height: 104rpx;
+}
+.content-item.two-img .content {
+    padding: 26rpx 0;
+}
+.model-one .content-item:nth-child(3n) {
+    border-right: 0;
+}
+.model-one .content .desc {
+    min-height: 52rpx;
+    line-height: 26rpx;
+}
+.model-one .content {
+    height: 240rpx;
+}
+.one-content image {
+    height: 120rpx;
+}
+.text-random-1,
+.text-random-2,
+.text-random-3,
+.text-random-4,
+.text-random-5,
+.text-random-6,
+.text-random-7,
+.text-random-8,
+.text-random-9 {
+    position: relative;
+}
+.text-random-1::before,
+.text-random-2::before,
+.text-random-3::before,
+.text-random-4::before,
+.text-random-5::before,
+.text-random-6::before,
+.text-random-7::before,
+.text-random-8::before,
+.text-random-9::before {
+    content: '';
+    width: 126rpx;
+    height: 12rpx;
+    border-radius: 6rpx;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    opacity: 0.6;
+}
+.text-random-1::before {
+    background: linear-gradient(90deg, #F2C3A5 0%, rgba(255, 255, 255, 0) 100%);
+}
+.text-random-2::before {
+    background: linear-gradient(90deg, #FF9BBB 0%, rgba(255, 255, 255, 0) 100%);
+}
+.text-random-3::before {
+    background: linear-gradient(90deg, #EAC5A9 0%, rgba(255, 255, 255, 0) 100%);
+}
+.text-random-4::before {
+    background: linear-gradient(90deg, #F7BEBE 0%, rgba(255, 255, 255, 0) 100%);
+}
+.text-random-5::before {
+    background: linear-gradient(90deg, #F2DC86 0%, rgba(255, 255, 255, 0) 100%);
+}
+.text-random-6::before {
+    background: linear-gradient(90deg, #98B7E8 0%, rgba(255, 255, 255, 0) 100%);
+}
+.text-random-7::before {
+    background: linear-gradient(90deg, #CD92F3 0%, rgba(255, 255, 255, 0) 100%);
+}
+.text-random-8::before {
+    background: linear-gradient(90deg, #5EEA7C 0%, rgba(255, 255, 255, 0) 100%);
+}
+.text-random-9::before {
+    background: linear-gradient(90deg, #E67A7A 0%, rgba(255, 255, 255, 0) 100%);
+}
+
+
+/**
+ * 商品列表模式
+ */
+.category-content {
+    height: 100vh;
+    /* #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || MP-ALIPAY || APP */
+    height: calc(100vh - 134rpx - var(--window-bottom));
+    /* #endif */
+    /* #ifdef H5 */
+    height: calc(100vh - 104rpx - var(--window-bottom));
+    /* #endif */
+}
+.category-content.goods-model {
+    padding-top: 182rpx;
+}
+.top-nav {
+    height: 182rpx;
+    top: 0;
+    left: 0;
+    z-index: 4;
+}
+.top-nav-scroll {
+    width: calc(100% - 70rpx);
+}
+.top-nav .icon-content {
+    width: 92rpx;
+    height: 92rpx;
+    padding: 1px;
+}
+.top-nav-scroll .item:first-of-type {
+    padding-left: 16rpx;
+}
+.top-nav .item {
+    padding: 20rpx 4rpx;
+}
+.nav-list-more {
+    width: 100%;
+    max-height: 550rpx;
+    overflow-y: auto;
+}
+.nav-list-more image {
+    width: 92rpx;
+    height: 92rpx;
+    border-radius: 50%;
+    margin-bottom: 10rpx;
+}
+.nav-list-more .item {
+    width: 20%;
+    padding: 20rpx 0;
+}
+.goods-right-content {
+    width: calc(100% - 200rpx);
+    height: calc(100% - 182rpx);
+    top: 182rpx;
+    right: 0;
+}
+.right-content-actual .item {
+    padding-bottom: 20rpx;
+}
+.right-content-actual .item:not(:last-of-type) {
+    border-bottom: 1px solid #eee;
+}
+.right-content-actual .item .plugins-label-img {
+    border-top-left-radius: 10rpx;
+}
+.goods-right-content.category-one-subset-content {
+    width: 100%;
+}
+.goods-list-top-nav {
+    position: sticky;
+    top: 0;
+    right: 0;
+    z-index: 3;
+}
+.nav-sort-content .sort-item {
+    height: 80rpx;
+    line-height: 80rpx;
+    width: 20%;
+}
+.nav-sort-content .sort-item .sort-icon {
+    width: 26rpx;
+    height: 26rpx !important;
+}
+.goods-list .goods-img {
+    width: 160rpx;
+    height: 160rpx !important;
+}
+.goods-list .goods-base {
+    width: calc(100% - 200rpx);
+    padding-right: 20rpx;
+}
+.goods-list .goods-base-content {
+    min-height: 100rpx;
+}
+.goods-list .goods-base .simple-desc {
+    line-height: 30rpx;
+    min-height: 30rpx;
+    max-height: 58rpx;
+}
+.goods-list .goods-base .sales-price {
+    width: calc(100% - 140rpx);
+}
+.goods-list .goods-base .buy-number {
+    min-width: 32rpx;
+}
+
+/**
+ * 底部导航
+ */
+.botton-nav {
+    width: calc(100% - 60rpx);
+    left: auto;
+    bottom: 20rpx;
+    z-index: 2;
+    margin-left: 20rpx;
+    box-shadow: 0rpx 4rpx 8rpx 0px rgba(0, 0, 0, 0.16);
+    line-height: 84rpx;
+    height: 84rpx;
+}
+.botton-nav .btn {
+    height: 70rpx;
+    line-height: 70rpx;
+}
+.botton-nav .cart .badge-icon {
+    top: -20rpx;
+    right: -2rpx;
+}
+
+/**
+ * 购物车
+ */
+.cart-mask {
+    left: 0;
+    top: 0;
+    background: rgb(0, 0, 0, 0.6);
+    z-index: 5;
+}
+.cart-content {
+    left: auto;
+    bottom: 150rpx;
+    width: calc(100% - 40rpx);
+    z-index: 6;
+    max-width: calc(800px - 40rpx);
+    margin-left: 20rpx;
+}
+.cart-content .cart-list {
+    max-height: 60vh;
+}
+.cart-content .cart-list .goods-img {
+    width: 132rpx;
+    height: 132rpx !important;
+}
+.cart-content .cart-list .goods-base {
+    padding-right: 0;
+    padding-left: 24rpx;
+}
+.cart-content .cart-list .goods-base-content {
+    min-height: 60rpx;
+}
+
+/**
+ * 无数据
+ */
+.no-data {
+    z-index: 101;
+}
+
+/* 
+ * 隐藏滚动条
+ */
+scroll-view ::-webkit-scrollbar {
+    display: none;
+    width: 0;
+    height: 0;
+    color: transparent;
+}
\ No newline at end of file
diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
new file mode 100644
index 0000000..6096174
--- /dev/null
+++ b/pages/goods-category/goods-category.vue
@@ -0,0 +1,1393 @@
+<template>
+    <view :class="theme_view">
+        <view :class="popup_status ? 'fixed-top' : ''">
+            <view class="pr" :class="is_single_page == 1 ? 'margin-top-xxxl single-page-top' : ''">
+                <block v-if="category_list.length > 0">
+                    <view v-if="category_list.length > 0" class="goods-top-bg pa top-0 left-0 right-0 wh-auto oh">
+                        <image :src="theme_static_url + 'top-bg.png'" mode="widthFix" class="wh-auto"></image>
+                    </view>
+                    <!-- 搜索框 -->
+                    <block v-if="is_single_page == 0">
+                        <view class="nav-search padding-horizontal-main pr" :style="'padding-top:' + (status_bar_height + 5) + 'px;'">
+                            <view class="goods-top-search-bg pa top-0 left-0 right-0 bottom-0 wh-auto oh">
+                                <image :src="theme_static_url + 'top-bg.png'" mode="widthFix" class="wh-auto"></image>
+                            </view>
+                            <block v-if="category_goods_is_search_alone == 1">
+                                <component-search :propPlaceholder="$t('customview.customview.726k7y')"></component-search>
+                            </block>
+                            <block v-else>
+                                <component-search @onsearch="search_button_event" :propIsOnEvent="true" :propIsRequired="false" :propPlaceholder="$t('customview.customview.726k7y')"></component-search>
+                            </block>
+                        </view>
+                    </block>
+                    <view class="category-container">
+                        <!-- 分类内容 -->
+                        <view :class="'category-content bs-bb pr ' + (category_show_level == 0 ? 'goods-model' : '')" :style="category_content_style">
+                            <block v-if="category_show_level == 1">
+                                <!-- 一级模式 -->
+                                <scroll-view scroll-y class="ht-auto" :show-scrollbar="false">
+                                    <view class="model-one padding-sm oh flex-row flex-wrap">
+                                        <block v-for="(item, index) in category_list" :key="index">
+                                            <view class="content-item cp" :data-value="item.id" @tap="category_event">
+                                                <view class="padding-sm">
+                                                    <view class="content bg-white border-radius-main">
+                                                        <image v-if="(item[category_goods_model_icon_field] || null) != null" :src="item[category_goods_model_icon_field]" mode="aspectFit" class="icon circle"></image>
+                                                        <view class="text single-text margin-top-sm" :class="'text-random-' + (Math.floor(Math.random() * 9) + 1)">{{ item.name }}</view>
+                                                        <view class="desc multi-text margin-top-xs padding-top-xss cr-grey-9 text-size-xss">{{ item.describe }}</view>
+                                                    </view>
+                                                </view>
+                                            </view>
+                                        </block>
+                                    </view>
+                                </scroll-view>
+                            </block>
+                            <block v-else>
+                                <!-- 商品列表模式 -->
+                                <block v-if="category_show_level == 0">
+                                    <!-- 一级导航 -->
+                                    <view class="top-nav wh-auto pa scroll-view-horizontal bottom-0">
+                                        <scroll-view :scroll-x="true" :show-scrollbar="false" :scroll-with-animation="true" :scroll-into-view="'one-nav-item-' + nav_active_index" class="top-nav-scroll">
+                                            <block v-for="(item, index) in category_list" :key="index">
+                                                <view class="item tc cp dis-inline-block text-size-xss" :id="'one-nav-item-' + index" :data-index="index" :data-itemtwoindex="-1" :data-itemthreeindex="-1" @tap="nav_event">
+                                                    <view :class="'icon-content circle br auto ' + (nav_active_index == index ? 'border-color-main' : '')">
+                                                        <image :src="(item[category_goods_model_icon_field] || null) == null ? common_static_url + 'images.png' : item[category_goods_model_icon_field]" mode="aspectFit" class="icon dis-block auto wh-auto ht-auto circle"></image>
+                                                    </view>
+                                                    <view class="padding-left-sm padding-right-sm round margin-top-xs" :class="nav_active_index == index ? 'bg-main border-color-main cr-white' : ''">{{ item.name }} </view>
+                                                </view>
+                                            </block>
+                                        </scroll-view>
+                                        <component-nav-more class="nav-more-top" :propTop="search_height + 'px'" :propStatus="popup_status" @open-popup="open_popup_event">
+                                            <view class="nav-list-more">
+                                                <view class="flex-row flex-wrap align-c">
+                                                    <block v-for="(item, index) in category_list" :key="index">
+                                                        <view class="item tc cr-base cp text-size-xss" :id="'one-nav-item-' + index" :data-index="index" :data-itemtwoindex="-1" :data-itemthreeindex="-1" @tap="nav_event">
+                                                            <view :class="'icon-content circle br auto ' + (nav_active_index == index ? 'border-color-main' : '')">
+                                                                <image :src="(item[category_goods_model_icon_field] || null) == null ? common_static_url + 'images.png' : item[category_goods_model_icon_field]" mode="aspectFit" class="icon dis-block auto wh-auto ht-auto circle"></image>
+                                                            </view>
+                                                            <view class="dis-inline-block padding-left-sm padding-right-sm round margin-top-xs" :class="nav_active_index == index ? 'bg-main border-color-main cr-white' : ''">
+                                                                {{ item.name }}
+                                                            </view>
+                                                        </view>
+                                                    </block>
+                                                </view>
+                                            </view>
+                                        </component-nav-more>
+                                    </view>
+                                    <!-- 二级导航 -->
+                                    <view v-if="category_one_subset_count > 0" class="left-nav" :style="left_content_actual_style">
+                                        <scroll-view :scroll-y="true" :show-scrollbar="false" class="ht-auto">
+                                            <view :class="'text-size-sm item tc cr-base cp oh ' + (nav_active_item_two_index == -1 ? 'nav-active cr-main nav-left-border' : '')" :data-index="nav_active_index" :data-itemtwoindex="-1" :data-itemthreeindex="-1" @tap="nav_event">
+                                                <text>{{ $t('common.all') }}</text>
+                                            </view>
+                                            <block v-if="(data_content || null) != null && (data_content.items || null) != null && data_content.items.length > 0">
+                                                <block v-for="(item, index) in data_content.items" :key="index">
+                                                    <view :class="'text-size-sm item tc cr-base cp oh ' + (nav_active_item_two_index == index ? 'nav-active cr-main nav-left-border' : '')" :data-index="nav_active_index" :data-itemtwoindex="index" :data-itemthreeindex="-1" @tap="nav_event">
+                                                        <text>{{ item.name }}</text>
+                                                    </view>
+                                                </block>
+                                            </block>
+                                        </scroll-view>
+                                    </view>
+                                    <!-- 商品列表 -->
+                                    <view :class="'goods-right-content bg-white pa bs-bb ' + (category_one_subset_count > 0 ? '' : 'category-one-subset-content')">
+                                        <scroll-view :scroll-y="true" :show-scrollbar="false" class="ht-auto goods-list" :scroll-top="scroll_top" @scroll="scroll_event" @scrolltolower="scroll_lower" lower-threshold="60">
+                                            <view class="padding-left-main" :style="right_content_actual_style">
+                                                <!-- 操作导航 -->
+                                                <view class="goods-list-top-nav bg-white">
+                                                    <!-- 排序 -->
+                                                    <view class="nav-sort-content oh">
+                                                        <block v-for="(item, index) in search_nav_sort_list" :key="index">
+                                                            <view class="sort-item tc fl cp" :data-index="index" @tap="nav_sort_event">
+                                                                <text class="cr-base va-m text-size-sm">{{ item.name }}</text>
+                                                                <image v-if="(item.icon || null) != null" class="sort-icon va-m" :src="common_static_url + 'sort-' + item.icon + '-icon.png'" mode="aspectFill"></image>
+                                                            </view>
+                                                        </block>
+                                                    </view>
+                                                    <!-- 三级导航 -->
+                                                    <view v-if="(data_three_content || null) != null && (data_three_content.items || null) != null && data_three_content.items.length > 0" class="word-list scroll-view-horizontal padding-bottom-main">
+                                                        <scroll-view :scroll-x="true" :show-scrollbar="false" :scroll-with-animation="true" :scroll-into-view="'three-nav-item-' + nav_active_item_three_index">
+                                                            <view :class="'word-icon dis-inline-block text-size-xs round padding-top-xs padding-bottom-xs padding-left padding-right ' + (nav_active_item_three_index == -1 ? 'bg-main-light br-main-light cr-main' : 'br-grey cr-grey')" :data-index="nav_active_index" :data-itemtwoindex="nav_active_item_two_index" :data-itemthreeindex="-1" @tap="nav_event">{{ $t('common.all') }}</view>
+                                                            <block v-for="(item, index) in data_three_content.items" :key="index">
+                                                                <view :class="'word-icon dis-inline-block text-size-xs round padding-top-xs padding-bottom-xs padding-left padding-right ' + (nav_active_item_three_index == index ? 'bg-main-light br-main-light cr-main' : 'br-grey cr-grey')" :id="'three-nav-item-' + index" :data-index="nav_active_index" :data-itemtwoindex="nav_active_item_two_index" :data-itemthreeindex="index" @tap="nav_event">{{ item.name }}</view>
+                                                            </block>
+                                                        </scroll-view>
+                                                    </view>
+                                                </view>
+                                                <!-- 右侧商品列表 -->
+                                                <view v-if="(data_list || null) != null && data_list.length > 0" class="oh">
+                                                    <view v-for="(item, index) in data_list" :key="index" class="item oh pr spacing-mb">
+                                                        <!-- 商品主体内容 -->
+                                                        <view class="flex-row jc-sb" data-type="type" :data-index="index" :data-value="item.goods_url + '&is_opt_back=1'" @tap="goods_event">
+                                                            <image :src="item.images" mode="widthFix" class="goods-img radius dis-block"></image>
+                                                            <view class="goods-base flex-col jc-sb">
+                                                                <view class="goods-base-content">
+                                                                    <view class="goods-title multi-text">{{ item.title }}</view>
+                                                                    <view v-if="(item.simple_desc || null) != null" class="simple-desc cr-grey-9 text-size-xs margin-top-sm single-text">{{ item.simple_desc }}</view>
+                                                                </view>
+                                                                <view v-if="(item.show_field_price_status || 0) == 1" class="oh flex-row jc-sb align-c">
+                                                                    <view class="single-text va-m">
+                                                                        <text class="sales-price">
+                                                                            <text class="text-size-xss">{{ item.show_price_symbol }}</text>
+                                                                            <text class="text-size">{{ item.min_price }}</text>
+                                                                        </text>
+                                                                        <text class="text-size-xss cr-grey">{{ item.show_price_unit }}</text>
+                                                                    </view>
+                                                                    <view v-if="common_site_type != 4" class="buy-opt flex-row align-c tc">
+                                                                        <block v-if="(item.is_error || 0) == 0">
+                                                                            <view v-if="(item.buy_number || 0) > 0" class="cp pr top-sm" :data-index="index" data-type="0" @tap.stop="buy_number_event">
+                                                                                <iconfont name="icon-cart-dec" size="48rpx" :color="theme_color"></iconfont>
+                                                                            </view>
+                                                                            <view v-if="(item.buy_number || 0) > 0" class="buy-number cr-black text-size-sm padding-left-xs padding-right-xs">
+                                                                                {{ item.buy_number }}
+                                                                            </view>
+                                                                            <view class="cp pr top-sm" :data-index="index" data-type="1" @tap.stop="buy_number_event">
+                                                                                <iconfont name="icon-cart-inc" size="48rpx" :color="theme_color"></iconfont>
+                                                                            </view>
+                                                                        </block>
+                                                                        <block v-else>
+                                                                            <text class="cr-grey text-size-xs">{{ item.error_msg }}</text>
+                                                                        </block>
+                                                                    </view>
+                                                                </view>
+                                                            </view>
+                                                        </view>
+                                                        <!-- 标签插件 -->
+                                                        <view v-if="(plugins_label_data || null) != null && plugins_label_data.data.length > 0" :class="'plugins-label oh pa plugins-label-' + ((plugins_label_data.base.is_user_goods_label_icon || 0) == 0 ? 'text' : 'img') + ' plugins-label-' + (plugins_label_data.base.user_goods_show_style || 'top-left')">
+                                                            <block v-for="(lv, li) in plugins_label_data.data" :key="li">
+                                                                <view v-if="(lv.goods_ids || null) != null && lv.goods_ids.indexOf(item.id) != -1" class="lv dis-inline-block va-m" :data-value="(plugins_label_data.base.is_user_goods_label_url || 0) == 1 ? lv.url || '' : ''" @tap="url_event">
+                                                                    <view v-if="(plugins_label_data.base.is_user_goods_label_icon || 0) == 0" class="round cr-white bg-main text-size-xs fl" :style="('background-color:'+(lv.bg_color || '#666'))+' !important;'+('color:'+(lv.text_color || '#fff'))+' !important;'">
+                                                                        {{ lv.name }}
+                                                                    </view>
+                                                                    <block v-else>
+                                                                        <image v-if="(lv.icon || null) != null" class="dis-block" :src="lv.icon" mode="scaleToFill"></image>
+                                                                    </block>
+                                                                </view>
+                                                            </block>
+                                                        </view>
+                                                    </view>
+                                                </view>
+                                                <block v-else>
+                                                    <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg" :propBackBtn="false" propPage="goods-category-item"></component-no-data>
+                                                </block>
+                                            </view>
+                                        </scroll-view>
+                                    </view>
+                                </block>
+                                <block v-else>
+                                    <!-- 一级导航 -->
+                                    <view class="left-nav ht-auto">
+                                        <scroll-view :scroll-y="true" class="ht-auto" :show-scrollbar="false">
+                                            <view :class="common_site_type != 4 ? 'left-content-actual ht-auto' : ''">
+                                                <view class="ht-auto padding-0" :style="left_content_actual_style">
+                                                    <block v-for="(item, index) in category_list" :key="index">
+                                                        <view :class="'text-size-sm item tc cr-base cp oh ' + (nav_active_index == index ? 'nav-active cr-main nav-left-border' : '')" :data-index="index" :data-itemindex="-1" @tap="nav_event">
+                                                            <text>{{ item.name }}</text>
+                                                        </view>
+                                                    </block>
+                                                </view>
+                                            </view>
+                                        </scroll-view>
+                                    </view>
+                                    <view class="right-container pa">
+                                        <scroll-view :scroll-y="true" class="ht-auto bg-white" :show-scrollbar="false">
+                                            <!-- 一级内容基础容 -->
+                                            <view v-if="(data_content || null) != null" class="oh">
+                                                <view class="padding-top-main padding-horizontal-main">
+                                                    <!-- 一级基础信息 -->
+                                                    <block v-if="(data_content.banner_images || null) !== null">
+                                                        <view :class="'one-content border-radius-main cp ' + (category_show_level == 3 ? 'spacing-mb' : '')" :data-value="data_content.id" @tap="category_event">
+                                                            <image :src="data_content.banner_images" mode="scaleToFill" class="wh-auto radius"></image>
+                                                        </view>
+                                                    </block>
+                                                    <block v-else>
+                                                        <view v-if="(data_content.vice_name || null) != null || (data_content.describe || null) != null" :class="'one-content border-radius-main cp pr ' + (category_show_level == 3 ? 'spacing-mb' : '')" :data-value="data_content.id" @tap="category_event">
+                                                            <image :src="theme_static_url + 'level2-content-bg.png'" mode="scaleToFill" class="wh-auto ht-auto radius pa top-0 left-0"></image>
+                                                            <view class="pr padding-main">
+                                                                <view v-if="(data_content.vice_name || null) != null" class="text-size-md fw-b" :style="'color:' + data_content.bg_color + ';'">
+                                                                    {{ data_content.vice_name }}
+                                                                </view>
+                                                                <view v-if="(data_content.describe || null) != null" class="text-size-xs cr-grey margin-top-sm">{{ data_content.describe }}</view>
+                                                            </view>
+                                                        </view>
+                                                    </block>
+                                                    <!-- 一二级数据渲染 -->
+                                                    <block v-if="(data_content.items || null) != null && data_content.items.length > 0">
+                                                        <!-- 二级模式 -->
+                                                        <block v-if="category_show_level == 2">
+                                                            <view class="two-content oh border-radius-main spacing-mb flex-row flex-wrap">
+                                                                <block v-for="(v, index) in data_content.items" :key="index">
+                                                                    <view class="content-item tc cp two-img" :data-value="v.id" @tap="category_event">
+                                                                        <view class="content">
+                                                                            <image v-if="(v.icon || null) != null" :src="v.icon" mode="aspectFit" class="icon radius margin-bottom-main"></image>
+                                                                            <view class="single-text text-size-sm cr-grey">{{ v.name }}</view>
+                                                                        </view>
+                                                                    </view>
+                                                                </block>
+                                                            </view>
+                                                        </block>
+                                                        <!-- 三级模式 -->
+                                                        <block v-if="category_show_level == 3">
+                                                            <block v-for="(v, index) in data_content.items" :key="index">
+                                                                <view class="spacing-nav-title flex-row jc-sb align-c">
+                                                                    <view class="flex-1">
+                                                                        <text class="text-wrapper text-size-md">{{ v.name }}</text>
+                                                                        <text v-if="(v.describe || null) != null" class="vice-name margin-left-lg cr-grey">{{ v.describe }}</text>
+                                                                    </view>
+                                                                    <view :data-value="v.id" @tap="category_event" class="arrow-right padding-right cr-grey text-size-xs">{{ $t('common.more') }}</view>
+                                                                </view>
+                                                                <view v-if="(v.items || null) != null && v.items.length > 0" class="oh border-radius-main spacing-mb flex-row flex-wrap">
+                                                                    <block v-for="(vs, index2) in v.items" :key="index2">
+                                                                        <view class="content-item two-img tc cp" :data-value="vs.id" @tap="category_event">
+                                                                            <view class="content">
+                                                                                <image v-if="(vs.icon || null) != null" :src="vs.icon" mode="aspectFit" class="icon radius margin-bottom-main"></image>
+                                                                                <view class="single-text text-size-sm cr-grey">{{ vs.name }}</view>
+                                                                            </view>
+                                                                        </view>
+                                                                    </block>
+                                                                </view>
+                                                            </block>
+                                                        </block>
+                                                    </block>
+                                                    <block v-else>
+                                                        <!-- 提示信息 -->
+                                                        <component-no-data propStatus="0" :propMsg="$t('goods-category.goods-category.7e4m68')"></component-no-data>
+                                                    </block>
+                                                </view>
+                                            </view>
+                                            <view v-else>
+                                                <!-- 提示信息 -->
+                                                <component-no-data propStatus="0" :propMsg="$t('goods-category.goods-category.7e4m68')"></component-no-data>
+                                            </view>
+                                        </scroll-view>
+                                    </view>
+                                </block>
+                            </block>
+                        </view>
+
+                        <view v-if="category_list.length == 0 && data_list_loding_status != 0">
+                            <!-- 提示信息 -->
+                            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+                        </view>
+
+                        <!-- 仅商品模式展示购物车和规格选择 -->
+                        <block v-if="category_goods_is_show_cart_nav == 1 && common_site_type != 4 && category_show_level == 0">
+                            <!-- 购物车列表 -->
+                            <block v-if="cart_status">
+                                <view class="cart-mask wh-auto ht-auto pf" @tap="cart_event"></view>
+                                <view class="cart-content bg-white border-radius-main pa oh" :style="cart_content_style">
+                                    <block v-if="(cart || null) != null && (cart.data || null) != null && cart.data.length > 0">
+                                        <view class="oh br-b padding-vertical-main padding-horizontal-main">
+                                            <text class="va-m text-size-xs cr-base">{{ $t('goods-category.goods-category.ico62g') }}</text>
+                                            <view class="fr cp" @tap="cart_all_delete_event">
+                                                <view class="dis-inline-block va-m pr top-xs">
+                                                    <uni-icons type="trash" size="16" color="#f00"></uni-icons>
+                                                </view>
+                                                <text class="cr-red va-m text-size-xs">{{ $t('common.clear') }}</text>
+                                            </view>
+                                        </view>
+                                        <scroll-view :scroll-y="true" class="cart-list goods-list" :show-scrollbar="false">
+                                            <view v-for="(goods, index) in cart.data" :key="index" class="item padding-main oh spacing-mb">
+                                                <view data-type="cart" :data-index="index" :data-value="goods.goods_url" @tap="goods_event" class="cp flex-row jc-sb">
+                                                    <image :src="goods.images" mode="widthFix" class="goods-img radius br"></image>
+                                                    <view class="goods-base flex-1 flex-width flex-col jc-sb">
+                                                        <view class="goods-base-content">
+                                                            <view class="goods-title text-size-sm single-text">{{ goods.title }}</view>
+                                                            <view v-if="goods.spec != null" class="text-size-xs cr-grey margin-top-xs">
+                                                                <block v-for="(sv, si) in goods.spec" :key="si">
+                                                                    <text v-if="si > 0" class="padding-left-xs padding-right-xs">;</text>
+                                                                    <text>{{ sv.value }}</text>
+                                                                </block>
+                                                            </view>
+                                                        </view>
+                                                        <view class="margin-top-xs oh">
+                                                            <view class="sales-price text-size single-text dis-inline-block va-m pr top-sm">{{ currency_symbol }}{{ goods.price }}</view>
+                                                            <view class="tc fr flex-row align-c">
+                                                                <block v-if="goods.is_error == 0">
+                                                                    <view v-if="(goods.stock || 0) > 0" class="cp pr top-sm" :data-index="index" data-type="0" @tap.stop="cart_buy_number_event">
+                                                                        <iconfont name="icon-cart-dec" size="48rpx" :color="theme_color"></iconfont>
+                                                                    </view>
+                                                                    <view v-if="(goods.stock || 0) > 0" class="buy-number dis-inline-block cr-black text-size-sm padding-left-xs padding-right-xs va-m">
+                                                                        {{ goods.stock }}
+                                                                    </view>
+                                                                    <view class="cp pr top-sm" :data-index="index" data-type="1" @tap.stop="cart_buy_number_event">
+                                                                        <iconfont name="icon-cart-inc" size="48rpx" :color="theme_color"></iconfont>
+                                                                    </view>
+                                                                </block>
+                                                                <block v-else>
+                                                                    <text class="cr-red">{{ goods.error_msg }}</text>
+                                                                </block>
+                                                            </view>
+                                                        </view>
+                                                    </view>
+                                                </view>
+                                            </view>
+                                        </scroll-view>
+                                    </block>
+                                    <block v-else>
+                                        <component-no-data propStatus="0" :propMsg="$t('goods-category.goods-category.5pj8ip')"></component-no-data>
+                                    </block>
+                                </view>
+                            </block>
+                            <!-- 购物车底部导航 -->
+                            <view class="botton-nav bg-white round pa oh padding-sm flex-row jc-sb align-c" :style="botton_nav_style+(cart_status ? 'z-index:5;' : '')">
+                                <view class="flex-row align-c flex-1 flex-width">
+                                    <view class="cart pr cp top-sm padding-left-sm" @tap="cart_event">
+                                        <iconfont name="icon-menu-cart" size="36rpx" color="#666"></iconfont>
+                                        <view v-if="(cart || null) != null && (cart.buy_number || 0) != 0" class="badge-icon pa">
+                                            <component-badge :propNumber="cart.buy_number"></component-badge>
+                                        </view>
+                                    </view>
+                                    <view class="cart-total-price single-text padding-left-sm fw-b cr-red flex-1">
+                                        <text class="text-size-xss">{{ currency_symbol }}</text>
+                                        <text class="text-size-lg">{{ (cart || null) == null ? 0 : cart.total_price || 0 }}</text>
+                                    </view>
+                                </view>
+                                <button type="default" size="mini" hover-class="none" class="btn bg-main cr-white text-size-md round margin-right-xs" @tap="buy_submit_event">{{ $t('goods-category.goods-category.44f1ww') }}</button>
+                            </view>
+                        </block>
+                    </view>
+                </block>
+                <block v-else>
+                    <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg" propPage="goods-category" :propIsHeader="true"></component-no-data>
+                </block>
+
+                <block v-if="data_list_loding_status != 1">
+                    <!-- 购物车抛物线 -->
+                    <component-cart-para-curve ref="cart_para_curve"></component-cart-para-curve>
+
+                    <!-- 商品购买 -->
+                    <component-goods-buy ref="goods_buy" :propCurrencySymbol="currency_symbol" v-on:CartSuccessEvent="goods_cart_back_event"></component-goods-buy>
+                </block>
+            </view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common" @onFooterHeight="footer_height_value_event" :propIsFooterSeat="false"></component-common>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import base64 from '@/common/js/lib/base64.js';
+    import componentCommon from '@/components/common/common';
+    import componentGoodsBuy from '@/components/goods-buy/goods-buy';
+    import componentSearch from '@/components/search/search';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentPopup from '@/components/popup/popup';
+    import componentBadge from '@/components/badge/badge';
+    import componentCartParaCurve from '@/components/cart-para-curve/cart-para-curve';
+    import componentNavMore from '@/components/nav-more/nav-more';
+
+    var theme_static_url = app.globalData.get_static_url('goods-category');
+    var common_static_url = app.globalData.get_static_url('common');
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+
+    var icon_type = app.globalData.data.category_goods_model_icon_type;
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_static_url: theme_static_url,
+                common_static_url: common_static_url,
+                status_bar_height: bar_height,
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_is_loading: 0,
+                user: null,
+                params: null,
+                tabbar_params: null,
+                common_site_type: 0,
+                category_list: [],
+                data_content: null,
+                data_three_content: null,
+                cart: null,
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                currency_symbol: app.globalData.currency_symbol(),
+                is_first: 1,
+                search_keywords_value: '',
+                nav_active_index: 0,
+                nav_active_item_two_index: -1,
+                nav_active_item_three_index: -1,
+                scroll_top: 0,
+                scroll_top_old: 0,
+                cart_status: false,
+                goods_choose_data: {},
+                category_one_subset_count: 0,
+                // 基础配置
+                category_show_level: 0,
+                // 排序导航
+                search_nav_sort_index: 0,
+                search_nav_sort_list: [],
+                // 自定义分享信息
+                share_info: {},
+                // 是否单页预览
+                is_single_page: app.globalData.is_current_single_page() || 0,
+                // 商品列表模式一级分类图标类型
+                category_goods_model_icon_field: icon_type == 0 ? 'realistic_images' : icon_type == 1 ? 'icon' : 'big_images',
+                // 商品分类页面搜索进入独立搜索页面
+                category_goods_is_search_alone: app.globalData.data.category_goods_is_search_alone,
+                // 商品分类页面开启购物车导航
+                category_goods_is_show_cart_nav: app.globalData.data.category_goods_is_show_cart_nav,
+                // 临时操作数据
+                temp_opt_data: null,
+                // 标签插件
+                plugins_label_data: null,
+                theme_color: app.globalData.get_theme_color(),
+                popup_status: false,
+                // 获取搜索框高度
+                search_height: 0,
+                // 底部tab高度 - 只有H5下有值
+                window_bottom_height: 0,
+                // #ifdef H5
+                window_bottom_height: (app.globalData.data.is_use_native_tabbar == 1) ? (uni.getWindowInfo().windowBottom || 50) : 0,
+                // #endif
+                // 样式
+                category_content_style: '',
+                left_content_actual_style: '',
+                right_content_actual_style: '',
+                botton_nav_style: '',
+                cart_content_style: '',
+                footer_height_value: 0,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentGoodsBuy,
+            componentSearch,
+            componentNoData,
+            componentPopup,
+            componentBadge,
+            componentCartParaCurve,
+            componentNavMore
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 资源设置
+            this.set_resources_data();
+
+            // 基础参数
+            this.setData({
+                user: app.globalData.get_user_cache_info(),
+                tabbar_params: app.globalData.get_page_tabbar_switch_params(),
+            });
+
+            // 数据加载
+            this.init();
+
+            // 初始化配置
+            this.init_config();
+
+            // 清除tab参数
+            app.globalData.remove_page_tabbar_switch_params();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show({object: this, method: 'init'});
+            }
+        },
+
+        methods: {
+            // 资源设置
+            set_resources_data() {
+                var search_nav_sort_list = [
+                    {
+                        name: this.$t('goods-category.goods-category.x69aow'),
+                        field: 'default',
+                        sort: 'asc',
+                        icon: null,
+                    },
+                    {
+                        name: this.$t('goods-category.goods-category.at5p35'),
+                        field: 'sales_count',
+                        sort: 'asc',
+                        icon: 'default',
+                    },
+                    {
+                        name: this.$t('goods-category.goods-category.283ot0'),
+                        field: 'access_count',
+                        sort: 'asc',
+                        icon: 'default',
+                    },
+                    {
+                        name: this.$t('goods-category.goods-category.g2u3lf'),
+                        field: 'min_price',
+                        sort: 'asc',
+                        icon: 'default',
+                    },
+                    {
+                        name: this.$t('goods-category.goods-category.5p4ksj'),
+                        field: 'id',
+                        sort: 'asc',
+                        icon: 'default',
+                    },
+                ];
+                this.setData({
+                    search_nav_sort_list,
+                });
+            },
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    this.setData({
+                        common_site_type: app.globalData.get_config('config.common_site_type'),
+                        currency_symbol: app.globalData.get_config('currency_symbol'),
+                        category_show_level: app.globalData.get_config('config.category_show_level'),
+                    });
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 获取数据
+            init(params = {}) {
+                // 网络检查
+                if ((params || null) == null || (params.loading || 0) == 0) {
+                    app.globalData.network_type_handle(this, 'init', params);
+                    return false;
+                }
+
+                // 请求数据
+                if (this.is_first == 1) {
+                    this.setData({
+                        data_list_loding_status: 1,
+                    });
+                }
+                uni.request({
+                    url: app.globalData.get_request_url('category', 'goods'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var active_index = this.nav_active_index;
+                            var temp_category = data.category || [];
+                            // 全部分类子级数量
+                            var category_one_subset_count = 0;
+                            // 是否指定分类
+                            if (temp_category.length > 0) {
+                                for (var i in temp_category) {
+                                    // tab切换参数、访问请求参数
+                                    if (((this.tabbar_params || null) != null && (this.tabbar_params.id || null) != null && temp_category[i]['id'] == this.tabbar_params.id) || ((this.params || null) != null && (this.params.id || null) != null && temp_category[i]['id'] == this.params.id)) {
+                                        active_index = i;
+                                    }
+                                    // 是否全部数据都无二级
+                                    if ((temp_category[i]['items'] || null) != null && temp_category[i]['items'].length > 0) {
+                                        category_one_subset_count++;
+                                    }
+                                }
+                            }
+                            // 设置分类及右侧数据和及基础数据
+                            var upd_data = {
+                                category_list: temp_category,
+                                data_content: temp_category[active_index] || null,
+                                nav_active_index: active_index,
+                                category_one_subset_count: category_one_subset_count,
+                                plugins_label_data: (data.plugins_label_data || null) == null || (data.plugins_label_data.base || null) == null || (data.plugins_label_data.data || null) == null || data.plugins_label_data.data.length <= 0 ? null : data.plugins_label_data,
+                            };
+                            // 指定分类则重新读取列表数据
+                            if (this.nav_active_index != active_index) {
+                                upd_data['is_first'] = 1;
+                                upd_data['data_page'] = 1;
+                                upd_data['data_list'] = [];
+                                upd_data['data_list_loding_status'] = 1;
+                                upd_data['nav_active_item_two_index'] = -1;
+                                upd_data['nav_active_item_three_index'] = -1;
+                            }
+                            // 非商品列表模式
+                            if (this.category_show_level != 0) {
+                                upd_data['data_list_loding_status'] = temp_category.length == 0 ? 0 : 3;
+                                upd_data['data_bottom_line_status'] = true;
+                            }
+                            this.setData(upd_data);
+
+                            // 商品列表模式
+                            if (this.category_show_level == 0) {
+                                // 商品列表模式获取购物车数据
+                                this.get_cart_data();
+                                // 获取商品列表、仅首次请求商品列表
+                                if (this.is_first == 1) {
+                                    this.get_goods_list(1);
+                                }
+                            }
+
+                            // 计算更多分类弹窗的高度、由于页面元素渲染异步问题，这里加延时执行
+                            if (this.is_first == 1) {
+                                var self = this;
+                                var timer = setInterval(function () {
+                                    if (self.search_height == 0) {
+                                        self.search_height_computer();
+                                    } else {
+                                        clearInterval(timer);
+                                    }
+                                }, 500);
+                            }
+
+                            // 内容大小处理
+                            this.content_actual_size_handle();
+
+                            // 是否首次记录
+                            this.setData({
+                                is_first: 0,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                        }
+
+                        // 基础自定义分享
+                        this.setData({
+                            share_info: {
+                                path: '/pages/goods-category/goods-category',
+                            },
+                        });
+
+                        // 分享菜单处理、延时执行，确保基础数据已加载完成
+                        setTimeout(function () {
+                            app.globalData.page_share_handle(this.share_info);
+                        }, 3000);
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 内容实际大小处理
+            content_actual_size_handle() {
+                // 底部加点距离
+                var bottom_style_value = 20;
+                // 左侧
+                var left_style = '';
+                if(this.category_goods_is_show_cart_nav == 1) {
+                    left_style = 'height: calc(100% - 120rpx - '+bottom_style_value+'rpx);';
+                }
+                // 右侧
+                var right_style = '';
+                if(this.category_goods_is_show_cart_nav == 1 && this.common_site_type != 4) {
+                    right_style = 'padding-bottom: calc(120rpx + '+bottom_style_value+'rpx);';
+                }
+                // 底部导航高度
+                var footer_height = this.footer_height_value;
+                var footer_height_unit = 'px';
+                // #ifdef H5
+                if(app.globalData.is_pc()) {
+                    var system = app.globalData.get_system_info(null, null, true);
+                    if(system.windowWidth <= 960) {
+                        footer_height *= 2;
+                        footer_height_unit = 'rpx';
+                    }
+                }
+                // #endif
+                this.setData({
+                    category_content_style: 'height:calc(100vh - ' + (this.search_height + this.window_bottom_height)+'px - '+footer_height+footer_height_unit+');',
+                    left_content_actual_style: left_style,
+                    right_content_actual_style: right_style,
+                    botton_nav_style: 'bottom: calc(20rpx);',
+                    cart_content_style: 'bottom: calc(150rpx);',
+                });
+            },
+
+            // 获取商品列表
+            get_goods_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                });
+
+                // 请求参数
+                var post_data = {
+                    page: this.data_page,
+                    wd: this.search_keywords_value || '',
+                };
+                // 分类id
+                if ((this.data_content || null) != null) {
+                    // 主分类id
+                    post_data['category_id'] = this.data_content['id'];
+                    // 是否选中了二级分类
+                    if (this.nav_active_item_two_index != -1) {
+                        post_data['category_id'] = this.data_content['items'][this.nav_active_item_two_index]['id'];
+                    }
+                    // 是否选中了三级分类
+                    if (this.data_three_content != null && this.nav_active_item_three_index != -1) {
+                        post_data['category_id'] = this.data_three_content['items'][this.nav_active_item_three_index]['id'];
+                    }
+                }
+                // 排序
+                var temp_index = this.search_nav_sort_index;
+                var temp_search_nav_sort = this.search_nav_sort_list;
+                post_data['order_by_type'] = temp_search_nav_sort[temp_index]['sort'] == 'desc' ? 'asc' : 'desc';
+                post_data['order_by_field'] = temp_search_nav_sort[temp_index]['field'];
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('datalist', 'search'),
+                    method: 'POST',
+                    data: post_data,
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            if (data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: data.total,
+                                    data_page_total: data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+
+                                // 购物车数据处理
+                                this.cart_data_list_handle();
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_total: 0,
+                                    data_is_loading: 0,
+                                });
+                                if (this.data_page <= 1) {
+                                    this.setData({
+                                        data_list: [],
+                                        data_bottom_line_status: false,
+                                    });
+                                }
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                                data_is_loading: 0,
+                            });
+                        }
+                    },
+                    fail: () => {
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                            data_is_loading: 0,
+                        });
+                    },
+                });
+            },
+
+            // 重置滑动位置
+            reset_scroll() {
+                this.setData({
+                    scroll_top: this.scroll_top_old,
+                });
+                this.$nextTick(() => {
+                    this.setData({
+                        scroll_top: 0,
+                    });
+                });
+            },
+
+            // 滑动事件位置记录
+            scroll_event(e) {
+                this.setData({
+                    scroll_top_old: e.detail.scrollTop,
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_goods_list();
+            },
+
+            // 导航事件
+            nav_event(e) {
+                var index = e.currentTarget.dataset.index;
+                var two_index = e.currentTarget.dataset.itemtwoindex;
+                var three_index = e.currentTarget.dataset.itemthreeindex;
+                var temp_data_content = this.category_list[index] || null;
+                var temp_data_three_content = null;
+                if (two_index != -1 && temp_data_content != null) {
+                    temp_data_three_content = temp_data_content['items'][two_index];
+                }
+                this.setData({
+                    nav_active_index: index,
+                    nav_active_item_two_index: two_index,
+                    nav_active_item_three_index: three_index,
+                    data_content: temp_data_content,
+                    data_three_content: temp_data_three_content,
+                    popup_status: false,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.reset_scroll();
+                this.get_goods_list(1);
+            },
+
+            // 打开弹窗
+            open_popup_event(e) {
+                this.setData({
+                    popup_status: e,
+                });
+            },
+
+            // 分类事件
+            category_event(e) {
+                app.globalData.url_open('/pages/goods-search/goods-search?category_id=' + e.currentTarget.dataset.value);
+            },
+
+            // 搜索事件
+            search_button_event(e) {
+                // 商品列表模式
+                if (this.category_show_level == 0) {
+                    this.setData({
+                        search_keywords_value: e || '',
+                        data_page: 1,
+                        data_list: [],
+                        data_list_loding_status: 1,
+                        data_bottom_line_status: false
+                    });
+                    this.get_goods_list(1);
+                } else {
+                    // 进入搜索页面
+                    app.globalData.url_open('/pages/goods-search/goods-search' + ((e || null) == null ? '' : '?keywords=' + e));
+                }
+            },
+
+            // 商品事件
+            goods_event(e) {
+                // 商品数据缓存处理
+                var index = e.currentTarget.dataset.index;
+                if(e.currentTarget.dataset.type == 'cart') {
+                    var goods = this.cart.data[index];
+                    goods['id'] = goods['goods_id'];
+                } else {
+                    var goods = this.data_list[index];
+                }
+                app.globalData.goods_data_cache_handle(goods.id, goods);
+
+                // 调用公共打开url地址
+                app.globalData.url_event(e);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 列表数据操作
+            buy_number_event(e) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                var user = app.globalData.get_user_info(this, 'buy_number_event', e);
+                if (user != false) {
+                    var index = e.currentTarget.dataset.index;
+                    var type = parseInt(e.currentTarget.dataset.type) || 0;
+                    var temp_goods = this.data_list[index];
+                    this.setData({
+                        goods_choose_data: temp_goods,
+                    });
+
+                    // 是否存在多规格
+                    if ((temp_goods.is_exist_many_spec || 0) != 0) {
+                        // 是否购物车中操作
+                        if (type == 0) {
+                            this.setData({
+                                cart_status: true,
+                            });
+                            app.globalData.showToast(this.$t('goods-category.goods-category.gy7y0w'));
+                        } else {
+                            if ((this.$refs.goods_buy || null) != null) {
+                                this.$refs.goods_buy.init(temp_goods, {
+                                    buy_event_type: 'cart',
+                                });
+                            }
+                        }
+                        return false;
+                    }
+
+                    // 数据操作处理
+                    this.buy_number_event_handle(e, type, temp_goods);
+                }
+            },
+
+            // 加入购物车成功回调
+            goods_cart_back_event(e) {
+                // 重新获取购物车数据
+                this.get_cart_data();
+            },
+
+            // 列表数量事件处理
+            buy_number_event_handle(e, type, goods, spec = '') {
+                var res = this.buy_number_handle(type, goods, 'buy_number');
+                if (res === false) {
+                    return false;
+                }
+
+                // 为0或减操作则查询
+                var cart_item = null;
+                if (type == 0 || (type == 1 && goods['buy_number'] > 0)) {
+                    var cart_data = this.cart.data;
+                    var params_spec = (spec || null) == null || typeof spec != 'object' ? '' : JSON.stringify(spec);
+                    for (var i in cart_data) {
+                        if (goods['id'] == cart_data[i]['goods_id']) {
+                            var cart_spec = (cart_data[i]['spec'] || null) == null || typeof cart_data[i]['spec'] != 'object' ? '' : JSON.stringify(cart_data[i]['spec']);
+                            if (type == 0 || (type == 1 && cart_spec == params_spec)) {
+                                cart_item = cart_data[i];
+                            }
+                            break;
+                        }
+                    }
+                }
+
+                // 数据临时记录
+                this.setData({
+                    temp_opt_data: {
+                        pos: e,
+                        goods: goods,
+                        type: type,
+                    },
+                });
+
+                // 操作类型
+                if (res == 0) {
+                    if (cart_item == null) {
+                        app.globalData.showToast(this.$t('goods-category.goods-category.x46kbv'));
+                        return false;
+                    }
+                    this.cart_delete(cart_item.id);
+                } else if (cart_item == null) {
+                    this.cart_save(goods['id'], res, spec);
+                } else {
+                    var number = type == 0 ? parseInt(cart_item['stock']) - res : res + parseInt(cart_item['stock']);
+                    this.cart_update(cart_item.id, goods['id'], number);
+                }
+                return true;
+            },
+
+            // 购物车抛物线动画
+            cart_para_curve_handle() {
+                if ((this.temp_opt_data || null) != null && (this.temp_opt_data.type || 0) == 1) {
+                    if ((this.$refs.cart_para_curve || null) != null) {
+                        var self = this;
+                        uni.createSelectorQuery()
+                            .select('.botton-nav .cart')
+                            .boundingClientRect()
+                            .exec(function (res) {
+                                self.$refs.cart_para_curve.init(res, self.temp_opt_data.pos, self.temp_opt_data.goods.images);
+                            });
+                    }
+                }
+            },
+
+            // 购物车数量操作
+            cart_buy_number_event(e) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                var user = app.globalData.get_user_info(this, 'cart_buy_number_event', e);
+                if (user != false) {
+                    var index = e.currentTarget.dataset.index;
+                    var type = parseInt(e.currentTarget.dataset.type) || 0;
+                    var temp_data = this.cart.data;
+                    var temp_goods = temp_data[index];
+
+                    // 数据操作处理
+                    var res = this.buy_number_handle(type, temp_goods, 'stock');
+                    if (res === false) {
+                        return false;
+                    }
+
+                    // 数据临时记录
+                    this.setData({
+                        temp_opt_data: {
+                            pos: e,
+                            goods: temp_goods,
+                            type: type,
+                        },
+                    });
+
+                    // 操作类型
+                    if (res == 0) {
+                        this.cart_delete(temp_goods['id']);
+                    } else {
+                        var number = type == 0 ? parseInt(temp_goods['stock']) - res : res + parseInt(temp_goods['stock']);
+                        this.cart_update(temp_goods['id'], temp_goods['goods_id'], number);
+                    }
+                }
+            },
+
+            // 数量操作处理
+            buy_number_handle(type, goods, buy_number_field) {
+                // 加减处理
+                var buy_number = parseInt(goods[buy_number_field]) || 0;
+                if (type == 0) {
+                    buy_number -= 1;
+                } else {
+                    buy_number += 1;
+                }
+                if (buy_number < 0) {
+                    buy_number = 0;
+                }
+
+                // 数据校验
+                var buy_min_number = parseInt(goods['buy_min_number']) || 1;
+                var buy_max_number = parseInt(goods['buy_max_number']) || 0;
+                var spec_buy_min_number = parseInt(goods['spec_buy_min_number']) || 0;
+                var spec_buy_max_number = parseInt(goods['spec_buy_max_number']) || 0;
+                var inventory = parseInt(goods['inventory']);
+                var inventory_unit = goods['inventory_unit'];
+
+                // 最小起购数量
+                var min = spec_buy_min_number > 0 ? spec_buy_min_number : buy_min_number;
+                if (min > 0) {
+                    if (type == 0) {
+                        if (buy_number < min) {
+                            buy_number = 0;
+                        }
+                    } else {
+                        if (buy_number < min) {
+                            buy_number = min;
+                        }
+                    }
+                }
+
+                // 最大购买数量
+                var max = spec_buy_max_number > 0 ? spec_buy_max_number : buy_max_number;
+                if (max > 0 && buy_number > max) {
+                    buy_number = max;
+                    app.globalData.showToast(this.$t('goods-category.goods-category.z1eh3v') + max + inventory_unit);
+                    return false;
+                }
+
+                // 数量是否改变
+                if (goods[buy_number_field] == buy_number) {
+                    app.globalData.showToast(this.$t('goods-category.goods-category.1ox23z'));
+                    return false;
+                }
+
+                // 操作数量
+                var opt_number = 1;
+                if (type == 0) {
+                    if (buy_number <= 0) {
+                        opt_number = 0;
+                    }
+                } else {
+                    if (buy_number > goods['buy_number']) {
+                        opt_number = buy_number - goods['buy_number'];
+                    }
+                }
+                return opt_number;
+            },
+
+            // 购物车添加
+            cart_save(goods_id, buy_number, spec = '') {
+                uni.request({
+                    url: app.globalData.get_request_url('save', 'cart'),
+                    method: 'POST',
+                    data: {
+                        goods_id: goods_id,
+                        stock: buy_number,
+                        spec: spec,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            this.cart_para_curve_handle();
+                            this.get_cart_data();
+                        } else {
+                            if (app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 购物车更新
+            cart_update(cart_id, goods_id, buy_number) {
+                uni.request({
+                    url: app.globalData.get_request_url('stock', 'cart'),
+                    method: 'POST',
+                    data: {
+                        id: cart_id,
+                        goods_id: goods_id,
+                        stock: buy_number,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            this.cart_para_curve_handle();
+                            this.get_cart_data();
+                        } else {
+                            if (app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            } else {
+                                app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                            }
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 购物车删除
+            cart_delete(cart_id) {
+                uni.request({
+                    url: app.globalData.get_request_url('delete', 'cart'),
+                    method: 'POST',
+                    data: {
+                        id: cart_id,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            this.get_cart_data();
+                        } else {
+                            if (app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            } else {
+                                app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                            }
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 获取购物车数据
+            get_cart_data() {
+                if (this.user != null) {
+                    uni.request({
+                        url: app.globalData.get_request_url('index', 'cart'),
+                        method: 'POST',
+                        data: {},
+                        dataType: 'json',
+                        success: (res) => {
+                            if (res.data.code == 0) {
+                                var data = res.data.data;
+                                var temp_cart = data.data || [];
+                                this.setData({
+                                    cart: res.data.data,
+                                });
+                                this.cart_data_list_handle();
+
+                                // 购物车导航角标
+                                app.globalData.set_tab_bar_badge('cart', data.buy_number);
+                            }
+                        },
+                        fail: () => {
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 购物车更新列表数据处理
+            cart_data_list_handle() {
+                var temp_cart = this.cart || null;
+                if (temp_cart != null) {
+                    var temp_data_list = this.data_list;
+                    if (temp_data_list.length > 0) {
+                        for (var i in temp_data_list) {
+                            temp_data_list[i]['buy_number'] = 0;
+                            if (temp_cart.data.length > 0) {
+                                for (var k in temp_cart.data) {
+                                    if (temp_cart.data[k]['goods_id'] == temp_data_list[i]['id']) {
+                                        temp_data_list[i]['buy_number'] += parseInt(temp_cart.data[k]['stock']);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    this.setData({
+                        data_list: temp_data_list,
+                    });
+                }
+            },
+
+            // 批量删除操作
+            cart_all_delete_event(e) {
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('goods-category.goods-category.o6i1w2'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('common.not_yet'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            var ids = [];
+                            var temp_data = this.cart.data;
+                            for (var i in temp_data) {
+                                ids.push(temp_data[i]['id']);
+                            }
+                            this.cart_delete(ids.join(','));
+                            this.setData({
+                                cart_status: !this.cart_status,
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 购物车状态
+            cart_event(e) {
+                var bool = this.cart_status;
+                if (this.cart.data.length > 0) {
+                    bool = !bool;
+                } else {
+                    bool = false;
+                }
+                this.setData({
+                    cart_status: bool,
+                });
+            },
+
+            // 购物车结算
+            buy_submit_event(e) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+
+                // 获取购物车数据
+                var ids = [];
+                if ((this.cart || null) != null) {
+                    var temp_data = this.cart.data || [];
+                    for (var i in temp_data) {
+                        if (temp_data[i]['is_error'] == 0) {
+                            ids.push(temp_data[i]['id']);
+                        }
+                    }
+                }
+                if (ids.length <= 0) {
+                    app.globalData.showToast(this.$t('goods-category.goods-category.5pj8ip'));
+                    return false;
+                }
+
+                // 进入订单确认页面
+                var data = {
+                    buy_type: 'cart',
+                    ids: ids.join(','),
+                };
+                app.globalData.url_open('/pages/buy/buy?data=' + encodeURIComponent(base64.encode(JSON.stringify(data))));
+            },
+
+            // 计算搜索框的高度
+            search_height_computer() {
+                const query = uni.createSelectorQuery();
+                query
+                    .select('.nav-search')
+                    .boundingClientRect((res) => {
+                        if ((res || null) != null) {
+                            // 获取搜索框高度
+                            this.setData({
+                                search_height: res.height,
+                            });
+                            this.content_actual_size_handle();
+                        }
+                    })
+                    .exec();
+            },
+
+            // 排序事件
+            nav_sort_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var temp_search_nav_sort = this.search_nav_sort_list;
+                var temp_sort = temp_search_nav_sort[index]['sort'] == 'desc' ? 'asc' : 'desc';
+                for (var i in temp_search_nav_sort) {
+                    if (i != index) {
+                        if (temp_search_nav_sort[i]['icon'] != null) {
+                            temp_search_nav_sort[i]['icon'] = 'default';
+                        }
+                        temp_search_nav_sort[i]['sort'] = 'desc';
+                    }
+                }
+                temp_search_nav_sort[index]['sort'] = temp_sort;
+                if (temp_search_nav_sort[index]['icon'] != null) {
+                    temp_search_nav_sort[index]['icon'] = temp_sort;
+                }
+
+                this.setData({
+                    search_nav_sort_index: index,
+                    search_nav_sort_list: temp_search_nav_sort,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.reset_scroll();
+                this.get_goods_list(1);
+            },
+
+            // 底部菜单高度
+            footer_height_value_event(value) {
+                this.setData({
+                    footer_height_value: value
+                });
+                this.content_actual_size_handle();
+            }
+        },
+    };
+</script>
+<style scoped>
+    @import './goods-category.css';
+</style>
diff --git a/pages/goods-comment/goods-comment.css b/pages/goods-comment/goods-comment.css
new file mode 100644
index 0000000..93e8f71
--- /dev/null
+++ b/pages/goods-comment/goods-comment.css
@@ -0,0 +1,52 @@
+/*
+ * 评分
+ */
+.score-container .score {
+    width: 180rpx;
+    border-right: 1px solid #eee;
+}
+.score-container .score .value {
+    font-weight: bold;
+    font-size: 60rpx;
+    line-height: 60rpx;
+    margin-top: 10rpx;
+}
+.progress {
+    overflow: hidden;
+    height: 40rpx;
+    background-color: #eee;
+    margin-left: 24rpx;
+}
+.progress .cr-grey {
+    font-size: 24rpx;
+    line-height: 40rpx;
+}
+.progress-bar {
+    float: left;
+    width: 0;
+    height: 100%;
+    font-size: 24rpx;
+    line-height: 40rpx;
+    color: #fff;
+    text-align: center;
+    background-color: #0e90d2;
+}
+.progress-bar-danger {
+    background-color: #dd514c;
+}
+.progress-bar-warning {
+    background-color: #F37B1D;
+}
+.progress-bar-secondary {
+    background-color: #3bb4f2;
+}
+.progress-bar-success {
+    background-color: #5eb95e;
+}
+
+/*
+ * 列表
+ */
+.scroll-box {
+    height: calc(100vh - 148rpx);
+}
\ No newline at end of file
diff --git a/pages/goods-comment/goods-comment.vue b/pages/goods-comment/goods-comment.vue
new file mode 100644
index 0000000..2ee293d
--- /dev/null
+++ b/pages/goods-comment/goods-comment.vue
@@ -0,0 +1,254 @@
+<template>
+    <view :class="theme_view">
+        <!-- 提示信息 -->
+        <block v-if="data_list_loding_status == 1">
+            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+        </block>
+        <block v-else>
+            <!-- 评分 -->
+            <view v-if="goods_score != null" class="score-container oh padding-main">
+                <view class="bg-white border-radius-main padding-main flex-row jc-sb align-c">
+                    <view class="score tc">
+                        <view class="cr-base">{{$t('goods-comment.goods-comment.dfmjxd')}}</view>
+                        <view class="value cr-main">{{ goods_score.avg || "0.0" }}</view>
+                    </view>
+                    <view class="progress tc border-radius-main flex-1 flex-width">
+                        <block v-if="goods_score.avg > 0">
+                            <block v-for="(item, index) in goods_score.rating" :key="index">
+                                <view v-if="item.portion > 0" :class="'progress-bar ' + progress_class[index]" :style="'width: ' + item.portion + '%;'">{{ item.name }}</view>
+                            </block>
+                        </block>
+                        <text v-else class="cr-grey">{{$t('goods-comment.goods-comment.1qh8s8')}}</text>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 列表 -->
+            <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+                <view class="padding-horizontal-main goods-comment">
+                    <!-- 评价 -->
+                    <component-goods-comments :propData="data_list" :propIsReply="true" propClass="bg-white padding-main border-radius-main"></component-goods-comments>
+
+                    <!-- 结尾 -->
+                    <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+                </view>
+            </scroll-view>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+    import componentGoodsComments from "@/components/goods-comments/goods-comments";
+
+    var static_url = app.globalData.get_static_url("home");
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                static_url: static_url,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                data_list: [],
+                data_page_total: 0,
+                data_page: 1,
+                goods_score: null,
+                params: null,
+                progress_class: ["progress-bar-danger", "progress-bar-warning", "progress-bar-secondary", "", "progress-bar-success"],
+            };
+        },
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentGoodsComments,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            // 初始化
+            init() {
+                // 获取数据
+                this.get_goods_score();
+                this.get_data_list();
+            },
+
+            // 获取商品评分
+            get_goods_score() {
+                uni.request({
+                    url: app.globalData.get_request_url("goodsscore", "goods"),
+                    method: "POST",
+                    data: {
+                        goods_id: this.params.goods_id,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            this.setData({
+                                goods_score: res.data.data || null,
+                            });
+                        } else {
+                            if (res.data.code != -400) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 获取数据列表
+            get_data_list(is_mandatory) {
+                // 参数校验
+                if ((this.params.goods_id || null) == null) {
+                    uni.stopPullDownRefresh();
+                    this.setData({
+                        data_bottom_line_status: false,
+                        data_list_loding_status: 2,
+                    });
+                } else {
+                    // 分页是否还有数据
+                    if ((is_mandatory || 0) == 0) {
+                        if (this.data_bottom_line_status == true) {
+                            uni.stopPullDownRefresh();
+                            return false;
+                        }
+                    }
+
+                    // 是否加载中
+                    if (this.data_is_loading == 1) {
+                        return false;
+                    }
+                    this.setData({
+                        data_is_loading: 1,
+                    });
+
+                    uni.request({
+                        url: app.globalData.get_request_url("comments", "goods"),
+                        method: "POST",
+                        data: {
+                            goods_id: this.params.goods_id,
+                            page: this.data_page,
+                        },
+                        dataType: "json",
+                        success: (res) => {
+                            uni.stopPullDownRefresh();
+                            if (res.data.code == 0) {
+                                if (res.data.data.data.length > 0) {
+                                    if (this.data_page <= 1) {
+                                        var temp_data_list = res.data.data.data;
+                                    } else {
+                                        var temp_data_list = this.data_list || [];
+                                        var temp_data = res.data.data.data;
+                                        for (var i in temp_data) {
+                                            temp_data_list.push(temp_data[i]);
+                                        }
+                                    }
+                                    this.setData({
+                                        data_list: temp_data_list,
+                                        data_total: res.data.data.total,
+                                        data_page_total: res.data.data.page_total,
+                                        data_list_loding_status: 3,
+                                        data_page: this.data_page + 1,
+                                        data_is_loading: 0,
+                                    });
+
+                                    // 是否还有数据
+                                    this.setData({
+                                        data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                    });
+                                } else {
+                                    this.setData({
+                                        data_list_loding_status: 0,
+                                        data_is_loading: 0,
+                                    });
+                                    if (this.data_page <= 1) {
+                                        this.setData({
+                                            data_list: [],
+                                            data_bottom_line_status: false,
+                                        });
+                                    }
+                                }
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_is_loading: 0,
+                                });
+                                if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                    app.globalData.showToast(res.data.msg);
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.stopPullDownRefresh();
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_is_loading: 0,
+                            });
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 评价图片预览
+            comment_images_show_event(e) {
+                var index = e.currentTarget.dataset.index;
+                var ix = e.currentTarget.dataset.ix;
+                uni.previewImage({
+                    current: this.data_list[index]["images"][ix],
+                    urls: this.data_list[index]["images"],
+                });
+            },
+        },
+    };
+</script>
+<style>
+    @import "./goods-comment.css";
+</style>
diff --git a/pages/goods-detail/goods-detail.css b/pages/goods-detail/goods-detail.css
new file mode 100644
index 0000000..8e64496
--- /dev/null
+++ b/pages/goods-detail/goods-detail.css
@@ -0,0 +1,578 @@
+.page {
+    padding-bottom: 130rpx;
+}
+
+/**
+ * 顶部导航内容
+ */
+.top-nav-left-icon {
+    top: 28px;
+    z-index: 11;
+}
+.top-nav-left-icon {
+    left: auto;
+    margin-left: 20rpx;
+}
+.top-nav-left-icon .icon {
+    background: rgb(255 255 255 / 70%);
+    width: 25px;
+    height: 25px;
+    line-height: 25px;
+    display: block;
+    float: left;
+    text-align: center;
+    padding: 3px;
+}
+.top-nav {
+    position: absolute;
+    bottom: 0;
+    width: calc(100% - 40rpx);
+    /* #ifdef H5 || APP */
+    bottom: 6px;
+    padding-bottom: 5px;
+    /* #endif */
+}
+.top-nav-content {
+    margin: 0 auto;
+    width: 310rpx;
+    margin-left: calc(50% - 170rpx);
+}
+.top-nav-content text {
+    font-size: 30rpx;
+    /* #ifdef H5 || APP */
+    font-size: 14px;
+    /* #endif */
+}
+.top-nav-content text:not(:last-child) {
+    margin-right: 30rpx;
+}
+.top-nav-content .nav-active {
+    font-weight: 500;
+    padding-bottom: 2rpx;
+    border-style: solid;
+    border-width: 0 0 2px 0;
+}
+
+/**
+ * 顶部更多导航
+ */
+.nav-more-view {
+    position: fixed;
+    z-index: 20;
+    top: 62px;
+    left: 20rpx;
+}
+.nav-more-view .triangle {
+    width: 0;
+    height: 0;
+    border-width: 0 5px 5px 5px;
+    border-style: solid;
+    border-color: transparent transparent rgb(0 0 0 / 0.7) transparent;
+    top: -5px;
+    left: calc(20rpx + 42px);
+}
+.nav-more-view .content {
+    background: rgb(0 0 0 / 0.7);
+}
+.nav-more-view .content .item {
+    font-size: 12px;
+}
+.nav-more-view .content .item:not(:last-child) {
+    border-bottom: 1px solid #585858;
+}
+
+/**
+ * 相册
+ */
+.goods-photo .swiper,
+.goods-photo .swiper-item {
+    height: 55vh !important;
+    display: block;
+}
+
+/**
+ * 购买操作导航
+ */
+.goods-buy-nav .btn-items .btn {
+    height: 70rpx;
+    line-height: 70rpx;
+    padding: 0 10rpx;
+    margin-right: 15rpx;
+    position: relative;
+}
+.goods-buy-nav .image {
+    width: 40rpx;
+    height: 40rpx;
+    margin: 10rpx 0 5rpx 0;
+}
+.goods-buy-nav .dis-block {
+    margin-top: -10rpx;
+}
+.goods-buy-nav .badge-icon {
+    position: absolute;
+    top: 2rpx;
+    left: calc(50% + 25rpx);
+    z-index: 1;
+}
+.goods-buy-nav-btn-number-0 .btn,
+.goods-buy-nav-btn-number-1 .btn {
+    width: calc(100% - 15rpx) !important;
+}
+.goods-buy-nav-btn-number-2 .btn {
+    width: calc(50% - 15rpx) !important;
+}
+.goods-buy-nav-btn-number-3 .btn {
+    width: calc(33.33% - 15rpx) !important;
+}
+.goods-buy-nav-btn-number-4 .btn {
+    width: calc(25% - 15rpx) !important;
+}
+.goods-buy-nav-btn-number-5 .btn {
+    width: calc(20% - 15rpx) !important;
+}
+.goods-buy-nav-btn-number-6 .btn {
+    width: calc(16.66% - 15rpx) !important;
+}
+.goods-buy-nav-btn-number-7 .btn {
+    width: calc(14.28% - 15rpx) !important;
+}
+.goods-buy-nav-btn-number-8 .btn {
+    width: calc(12.5% - 15rpx) !important;
+}
+.goods-buy-nav-btn-number-9 .btn {
+    width: calc(11.11% - 15rpx) !important;
+}
+.goods-buy-nav-btn-number-10 .btn {
+    width: calc(10% - 15rpx) !important;
+}
+
+/**
+ * 商品基础
+ */
+.goods-base-content .goods-title-content {
+    position: relative;
+    min-height: 86rpx;
+}
+.goods-base-content .goods-title-content .goods-title {
+    font-size: 30rpx;
+    line-height: 40rpx;
+    font-weight: bold;
+    width: calc(100% - 200rpx);
+}
+.goods-base-content image {
+    width: 40rpx;
+    height: 40rpx;
+}
+.goods-base-content .collect {
+    width: 76rpx;
+}
+
+/**
+* 视频
+*/
+.goods-video {
+    width: 100%;
+    top: 0;
+    left: 0;
+    z-index: 1;
+}
+.goods-video video {
+    width: 100%;
+    height: 55vh !important;
+}
+.goods-video-submit {
+    left: 50rpx;
+    top: auto;
+    bottom: 60rpx;
+    z-index: 2;
+}
+.goods-video-submit image {
+    width: 80rpx;
+    height: 80rpx !important;
+}
+
+/**
+ * 基础价格信息
+ */
+.goods-base-price,
+.price-content,
+.goods-base-right-opt {
+    min-height: 145rpx;
+}
+.price-content {
+    width: calc(100% - 200rpx);
+}
+.goods-base-right-opt {
+    width: 200rpx;
+}
+.price-content,
+.goods-base-right-opt {
+    box-sizing: border-box;
+    position: relative;
+    height: 100%;
+}
+.goods-base-right-opt image {
+    width: 40rpx;
+    height: 40rpx;
+}
+.goods-base-right-opt .collect {
+    width: 76rpx;
+}
+.price-content .price-icon {
+    padding: 0px 8rpx;
+    color: #fff;
+    border: 1px solid #FF5722;
+    background: #FF5722;
+    font-size: 24rpx;
+}
+.price-content .sales-price {
+    font-size: 42rpx;
+}
+.price-content .item:not(:last-child) {
+    margin-bottom: 10rpx;
+}
+
+/**
+ * app独立内容
+ */
+.goods-detail-app .content-items view {
+    padding: 15rpx 10rpx;
+    line-height: 44rpx;
+    font-size: 32rpx;
+}
+
+/**
+ * 价格信息与秒杀结合
+ */
+.countdown-content {
+    width: 38%;
+}
+.countdown-content .time-title {
+    font-size: 38rpx;
+    margin-bottom: 10rpx;
+}
+.goods-base-price-countdown {
+    background: #e84742 !important;
+}
+.goods-base-price-countdown .price-content {
+    background: #f9534e;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    width: 60%;
+    min-height: 164rpx;
+}
+.goods-base-price-countdown .price-content .price-icon {
+    border-color: #fff;
+    color: #fff;
+    background: transparent;
+}
+.goods-base-price-countdown .price-content .sales-price,
+.goods-base-price-countdown .price-content .sales-price-unit,
+.goods-base-price-countdown .price-content .points-price-value,
+.goods-base-price-countdown .price-content .points-price-unit {
+    color: #fff !important;
+}
+.goods-base-price-countdown .price-content .original-price,
+.goods-base-price-countdown .price-content .unit{
+    color: #ffcece !important;
+}
+.price-content .price-icon.seckill {
+    position: absolute;
+    right: 20rpx;
+    bottom: 20rpx;
+    margin-right: 0;
+}
+
+/*
+* 商品参数
+*/
+.parameters-base .content-item .item {
+    color: #666;
+}
+.goods-parameters .content-item .item {
+    padding: 8rpx 10rpx;
+    width: calc(50% - 20rpx);
+}
+.goods-parameters .content-item .item .name {
+    margin-right: 10rpx;
+}
+.goods-parameters .content-item .item:nth-child(2n-1) {
+    float: left;
+}
+.goods-parameters .content-item .item:nth-child(2n) {
+    float: right;
+}
+
+/**
+ * 商品参数弹窗
+ */
+.popup-params-container {
+    max-height: 80vh;
+    overflow-y: scroll;
+    overflow-x: hidden;
+}
+.popup-params-container .item .name {
+    width: 220rpx;
+}
+.popup-params-container .item .value {
+    width: calc(100% - 240rpx);
+}
+
+/*
+* 标题icon
+*/
+.goods-title-icon-item {
+    background: #666;
+    color: #fff;
+    padding: 0 8rpx;
+    line-height: 26rpx;
+    font-weight: 400;
+}
+
+/*
+* 面板
+*/
+.goods-panel-container {
+    background: #fffbfc;
+    color: #d2354c;
+}
+.goods-panel-container view {
+    padding: 15rpx 0;
+}
+.goods-panel-container view:not(:first-child) {
+    border-top: 1px dashed #fff1f2;
+}
+
+/**
+* 购买记录 - 插件
+*/
+.plugins-salerecords-tips,
+.plugins-salerecords-tips-top-left,
+.plugins-salerecords-tips-top-right,
+.plugins-salerecords-tips-bottom-left,
+.plugins-salerecords-tips-bottom-right,
+.plugins-salerecords-tips-top-center,
+.plugins-salerecords-tips-bottom-center {
+    position: fixed;
+    left: calc(50% - 170rpx);
+    top: 50%;
+    background: rgb(0 0 0 / 60%);
+    border-radius: 60rpx;
+    padding: 8rpx 20rpx;
+    color: #fff;
+    z-index: 50;
+    -webkit-box-shadow: 0 8px 10px rgb(0 0 0 / 20%);
+    -moz-box-shadow: 0 8px 10px rgba(0, 0, 0, 0.2);
+    box-shadow: 0 8px 10px rgb(0 0 0 / 20%);
+}
+.plugins-salerecords-tips image,
+.plugins-salerecords-tips-top-left image,
+.plugins-salerecords-tips-top-right image,
+.plugins-salerecords-tips-bottom-left image,
+.plugins-salerecords-tips-bottom-right image,
+.plugins-salerecords-tips-top-center image,
+.plugins-salerecords-tips-bottom-center image {
+    width: 50rpx;
+    height: 50rpx;
+    border-radius: 50%;
+}
+.plugins-salerecords-tips-top-left {
+    left: 5%;
+    top: 13%;
+}
+.plugins-salerecords-tips-top-right {
+    right: 5%;
+    top: 13%;
+    left: auto;
+}
+.plugins-salerecords-tips-top-center {
+    top: 13%;
+}
+
+/* #ifdef MP-ALIPAY  */
+.plugins-salerecords-tips-top-left {
+    top: 5%;
+}
+.plugins-salerecords-tips-top-right {
+    top: 5%;
+}
+.plugins-salerecords-tips-top-center {
+    top: 5%;
+}
+
+/* #endif  */
+.plugins-salerecords-tips-bottom-left {
+    left: 5%;
+    bottom: 10%;
+    top: auto;
+}
+.plugins-salerecords-tips-bottom-right {
+    right: 5%;
+    bottom: 10%;
+    left: auto;
+    top: auto;
+}
+.plugins-salerecords-tips-bottom-center {
+    bottom: 10%;
+    top: auto;
+}
+
+/*
+* 优惠劵 - 插件
+*/
+.coupon-padding {
+    padding: 2rpx;
+}
+.mini-coupon {
+    position: relative;
+    display: inline-block;
+    height: 40rpx;
+    line-height: 40rpx;
+    border-radius: 4rpx;
+    padding: 0 16rpx;
+}
+.mini-coupon::before,
+.mini-coupon::after {
+    content: '';
+    width: 14rpx;
+    height: 14rpx;
+    border-radius: 50%;
+    background-color: #fff;
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+}
+.mini-coupon::before {
+    left: -8rpx;
+}
+.mini-coupon::after {
+    right: -8rpx;
+}
+.mini-coupon-br::before,
+.mini-coupon-br::after {
+    border: 1px solid #FE5500;
+}
+.coupon-srcoll {
+    white-space: nowrap;
+    overflow-x: auto;
+}
+.coupon-srcoll::-webkit-scrollbar {
+    width: 0;
+    height: 0;
+    display: none;
+}
+.received-coupon {
+    background: #FFEBE0;
+    border: 2rpx solid #FE5500;
+    color: #FE5500;
+}
+.not-received-coupon {
+    background: #FE5500;
+    border: 2rpx solid #FE5500;
+    color: #fff;
+}
+.received-coupon .divider-l::before {
+    background: red;
+}
+.not-received-coupon .divider-l::before {
+    background: #fff;
+}
+.plugins-coupon-container-view .item-title {
+    min-width: 70rpx;
+}
+.plugins-coupon-container-view .item:not(:last-child) {
+    margin-right: 10rpx;
+}
+.plugins-coupon-container {
+    max-height: 50vh;
+    overflow-y: scroll;
+    overflow-x: hidden;
+    margin-top: 20rpx;
+}
+.plugins-coupon-container .v-left {
+    padding: 20rpx 10rpx 20rpx 20rpx;
+}
+.plugins-coupon-container .item:not(:last-child) {
+    margin-bottom: 20rpx;
+}
+.plugins-coupon-container .item,
+.plugins-coupon-container .v-right,
+.plugins-coupon-container .v-right .circle {
+    height: 175rpx;
+}
+.plugins-coupon-container .v-left .base .price {
+    font-size: 46rpx;
+}
+
+/**
+ * 标签 - 插件
+ */
+.plugins-label navigator:not(:last-child) {
+    margin-right: 20rpx;
+}
+.plugins-label navigator {
+    margin-bottom: 20rpx;
+}
+.plugins-label-top-left,
+.plugins-label-top-center,
+.plugins-label-top-right {
+    top: calc(var(--status-bar-height) + 130rpx);
+}
+.plugins-label-text {
+    padding: 20rpx 20rpx 0 20rpx;
+}
+.plugins-label-bottom-left,
+.plugins-label-bottom-center,
+.plugins-label-bottom-right {
+    bottom: 0;
+}
+
+/**
+ * 智能工具 - 插件
+ */
+.plugins-intellectstools-base-bottom-container .notice-content {
+    padding: 10rpx 20rpx;
+    background: #fff1f0;
+    border-color: #ffe2e0;
+    color: #dd514c;
+}
+.plugins-intellectstools-content-top-container {
+    background: #daeeff;
+    color: #2b6e8f;
+    border: 1px solid #c9e9ff;
+}
+.plugins-intellectstools-content-top-container .panel-content .item:first-child {
+    padding-top: 0 !important;
+}
+.plugins-intellectstools-content-top-container .panel-title,
+.plugins-intellectstools-content-top-container .panel-content .item:not(:last-child) {
+    border-bottom: 1px solid #c8e4fb !important;
+}
+
+/**
+ * 门店 - 插件
+ */
+.plugins-realstore-popup {
+    max-height: 80vh;
+    overflow-y: scroll;
+    overflow-x: hidden;
+    margin-top: 20rpx;
+}
+
+/**
+ * 商品服务 - 插件
+ */
+.plugins-goodsservice-view-container .item image {
+    width: 32rpx;
+    height: 32rpx !important;
+}
+.plugins-goodsservice-container .item image {
+    width: 70rpx;
+    height: 70rpx !important;
+}
+.plugins-goodsservice-container .item .left {
+    width: 80rpx;
+}
+.plugins-goodsservice-container .item .right {
+    width: calc(100% - 90rpx);
+}
\ No newline at end of file
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
new file mode 100644
index 0000000..8ef30d9
--- /dev/null
+++ b/pages/goods-detail/goods-detail.vue
@@ -0,0 +1,1511 @@
+<template>
+    <view :class="theme_view">
+        <!-- 顶部导航 -->
+        <view v-if="goods != null" :class="'page ' + (is_single_page == 1 ? ' single-page-top' : '')">
+            <!-- 单页模式不展示导航栏 -->
+            <block v-if="is_single_page == 0">
+                <!-- #ifdef MP-WEIXIN || MP-QQ || MP-KUAISHOU || H5 || APP -->
+                <!-- 小导航 -->
+                <view class="top-nav-left-icon pf" :style="'top:' + top_nav_icon_top_value + 'px;'">
+                    <uni-icons type="arrowleft" size="22" color="#333" class="icon round cp" @tap="top_nav_left_back_event"></uni-icons>
+                    <uni-icons v-if="nav_more_list.length > 0" type="list" size="20" color="#333" class="icon round cp margin-left-lg" @tap="top_nav_left_more_event"></uni-icons>
+                </view>
+                <!-- #endif -->
+                <!-- #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP -->
+                <!-- 更多导航 -->
+                <view v-if="nav_more_list.length > 0 && nav_more_status" class="nav-more-view tc" :style="'top:' + top_nav_more_top_value + 'px;'">
+                    <view class="triangle dis-inline-block pa"></view>
+                    <view class="content radius padding-horizontal-main">
+                        <block v-for="(item, index) in nav_more_list" :key="index">
+                            <view class="item padding-main cp" :data-value="item.url" data-type="1" @tap="nav_more_event">
+                                <view class="va-m dis-inline-block">
+                                    <uni-icons :type="item.icon" size="16" color="#fff"></uni-icons>
+                                </view>
+                                <text class="cr-white va-m margin-left-sm">{{ item.name }}</text>
+                            </view>
+                        </block>
+                    </view>
+                </view>
+                <!-- 顶部导航 -->
+                <block v-if="(top_nav_title_data || null) != null && top_nav_title_data.length > 0">
+                    <component-trn-nav :propScroll="scroll_value" :propHeight="top_nav_height">
+                        <view class="top-nav padding-bottom padding-horizontal-main pr">
+                            <view class="top-nav-content tc">
+                                <block v-for="(item, index) in top_nav_title_data" :key="index">
+                                    <text :class="'cp ' + (top_nav_title_index == index ? 'nav-active border-color-main' : '')" :data-index="index" :data-value="item.ent" @tap="top_nav_title_event">{{ item.name }}</text>
+                                </block>
+                            </view>
+                        </view>
+                    </component-trn-nav>
+                </block>
+                <!-- #endif -->
+            </block>
+
+            <!-- 相册 -->
+            <view class="goods-photo bg-white oh pr" v-if="goods_photo.length > 0" :style="'height: ' + photo_height + ' !important;'">
+                <!-- 视频 -->
+                <block v-if="(goods.video || null) != null">
+                    <view v-if="goods_video_is_autoplay" class="goods-video pa tc">
+                        <video :src="goods.video" :autoplay="goods_video_is_autoplay" :show-center-play-btn="true" :controls="false" :show-play-btn="false" :enable-progress-gesture="false" :show-fullscreen-btn="false" :style="'height: ' + photo_height + ' !important;'"></video>
+                    </view>
+                    <view class="goods-video-submit pa">
+                        <image v-if="!goods_video_is_autoplay" class="goods-video-play cp" @tap="goods_video_play_event" :src="common_static_url + 'video-play-icon.png'" mode="aspectFit"></image>
+                        <image v-if="goods_video_is_autoplay" class="goods-video-close cp" @tap="goods_video_close_event" :src="common_static_url + 'video-close-icon.png'" mode="aspectFit"></image>
+                    </view>
+                </block>
+                <!-- 相册内容 -->
+                <swiper :indicator-dots="indicator_dots" :indicator-color="indicator_color" :indicator-active-color="indicator_active_color" :autoplay="autoplay" :circular="circular" class="swiper" :style="'height: ' + photo_height + ' !important;'">
+                    <block v-for="(item, index) in goods_photo" :key="index">
+                        <swiper-item>
+                            <image class="swiper-item wh-auto" @tap="goods_photo_view_event" :data-index="index" :src="item.images" mode="scaleToFill" :style="'height: ' + photo_height + ' !important;'"></image>
+                        </swiper-item>
+                    </block>
+                </swiper>
+                <!-- 标签插件 -->
+                <view v-if="(plugins_label_data || null) != null && plugins_label_data.data.length > 0" :class="'plugins-label oh pa plugins-label-' + ((plugins_label_data.base.is_user_goods_label_icon || 0) == 0 ? 'text' : 'img') + ' plugins-label-' + (plugins_label_data.base.user_goods_show_style || 'top-left')">
+                    <block v-for="(lv, li) in plugins_label_data.data" :key="li">
+                        <view class="lv dis-inline-block va-m" :data-value="(plugins_label_data.base.is_user_goods_label_url || 0) == 1 ? lv.url || '' : ''" @tap="url_event">
+                            <view v-if="(plugins_label_data.base.is_user_goods_label_icon || 0) == 0" class="round cr-white bg-main text-size-xs fl" :style="('background-color:'+(lv.bg_color || '#666'))+' !important;'+('color:'+(lv.text_color || '#fff'))+' !important;'">{{ lv.name }}</view>
+                            <image v-else class="dis-block" :src="lv.icon" mode="scaleToFill"></image>
+                        </view>
+                    </block>
+                </view>
+            </view>
+
+            <!-- 价格信息 -->
+            <view class="goods-base-price bg-white oh spacing-mb" :class="plugins_seckill_is_valid ? 'goods-base-price-countdown' : ''">
+                <!-- 批发规则、未隐藏商品售价的时候独立行展示 -->
+                <block v-if="(plugins_wholesale_data || null) != null && (plugins_wholesale_data.is_hide_goods_price || 0) != 1">
+                    <component-wholesale-rules :propIsPopup="true" :propCurrencySymbol="currency_symbol" :propData="plugins_wholesale_data" :propIsAlone="true"></component-wholesale-rules>
+                </block>
+                <!-- 价格 -->
+                <view class="price-content padding-vertical-main padding-left-main bs-bb fl" :style="plugins_seckill_is_valid ? 'background-image: url(' + plugins_seckill_data.goods_detail_header + ')' : ''">
+                    <!-- 批发插件是否开启隐藏价格信息 -->
+                    <block v-if="(plugins_wholesale_data || null) == null || (plugins_wholesale_data.is_hide_goods_price || 0) != 1">
+                        <!-- 售价 -->
+                        <view v-if="(goods.show_field_price_status || 0) == 1" class="item single-text">
+                            <!-- 图标 -->
+                            <text v-if="(show_field_price_text || null) != null" :class="'price-icon round va-m margin-right-xs '+((plugins_seckill_is_valid) ? 'seckill' : '')">{{ show_field_price_text }}</text>
+                            <!-- 售价 -->
+                            <text class="sales-price va-m">{{ goods.show_price_symbol }}{{ goods_spec_base_price }}</text>
+                            <text class="sales-price-unit text-size-xs cr-grey va-m">{{ goods.show_price_unit }}</text>
+                        </view>
+                        <!-- 原价 -->
+                        <view v-if="(goods.show_field_original_price_status || 0) == 1 && (goods_spec_base_original_price || null) != null && goods_spec_base_original_price != 0" class="item original-price single-text">{{ goods.show_original_price_symbol }}{{ goods_spec_base_original_price }}{{ goods.show_original_price_unit }}</view>
+                        <!-- 积分兑换 -->
+                        <view v-if="(goods.plugins_points_data || null) != null && (goods.plugins_points_data.is_goods_detail_show || 0) == 1" class="item">
+                            <text class="points-price-value text-size-lg cr-base va-m">{{ goods.plugins_points_data.points_value }}</text>
+                            <text class="points-price-unit text-size-xs cr-grey va-m margin-left-xs">{{goods.plugins_points_data.points_unit}}</text>
+                        </view>
+                    </block>
+                    <block v-else>
+                        <!-- 批发开启了隐藏价格，则价格容器这里展示批发价格信息 -->
+                        <component-wholesale-rules :propIsPopup="true" :propCurrencySymbol="currency_symbol" :propData="plugins_wholesale_data"></component-wholesale-rules>
+                    </block>
+                </view>
+                <block v-if="plugins_seckill_is_valid">
+                    <view class="countdown-content padding-top-lg padding-bottom-lg padding-left-xs padding-right-xs fr tc">
+                        <view class="time-title cr-white single-text">{{ plugins_seckill_data.goods_detail_title || $t('goods-detail.goods-detail.775ppk') }}</view>
+                        <component-countdown
+                            :propHour="plugins_seckill_data.time.hours"
+                            :propMinute="plugins_seckill_data.time.minutes"
+                            :propSecond="plugins_seckill_data.time.seconds"
+                            :propMsecShow="true"
+                            propTimeSize="32"
+                            propTimePadding="0"
+                            propTimeWeight="bold"
+                            propTimeBackgroundColor="transparent"
+                            propTimeColor="#ffe500"
+                            propDsColor="#fff"
+                        ></component-countdown>
+                    </view>
+                </block>
+                <block v-else>
+                    <!-- 右侧操作 -->
+                    <view class="goods-base-right-opt padding-top-lg padding-bottom-lg padding-left-xs padding-right-main fr oh">
+                        <!-- 收藏 -->
+                        <view class="collect tc cp fr margin-left" @tap="goods_favor_event">
+                            <image :src="common_static_url + 'favor' + (nav_favor_button_info.status == 1 ? '-active' : '') + '-icon.png'" mode="scaleToFill" class="dis-block auto"></image>
+                            <view :class="'cr-grey text-size-xs ' + (nav_favor_button_info.status == 1 ? 'cr-main' : 'cr-grey')">{{ nav_favor_button_info.text }}</view>
+                        </view>
+                        <!-- 分享 -->
+                        <view class="goods-share tc cp fr" @tap="popup_share_event">
+                            <image :src="common_static_url + 'share-icon.png'" mode="scaleToFill" class="dis-block auto"></image>
+                            <view class="cr-grey text-size-xs">{{$t('common.share')}}</view>
+                        </view>
+                    </view>
+                </block>
+            </view>
+
+            <view class="padding-horizontal-main">
+                <!-- 基础信息 -->
+                <view class="goods-base-content border-radius-main bg-white spacing-mb">
+                    <view class="padding-main">
+                        <view class="goods-title-content oh flex-row jc-sb align-c">
+                            <!-- 标题容器 -->
+                            <view class="goods-title flex-1 flex-width" :style="'color:' + goods.title_color">
+                                <!-- icon -->
+                                <block v-if="(goods.plugins_view_icon_data || null) != null && goods.plugins_view_icon_data.length > 0">
+                                    <block v-for="(item, index) in goods.plugins_view_icon_data" :key="index">
+                                        <text
+                                            v-if="(item.name || null) != null"
+                                            class="goods-title-icon-item va-m radius text-size-xs margin-right-xs"
+                                            :style="((item.br_color || null) == null ? '' : 'border:1px solid ' + item.br_color + ';') + ((item.bg_color || null) == null ? '' : 'background: ' + item.bg_color + ';') + '' + ((item.color || null) == null ? '' : 'color: ' + item.color + ';')"
+                                            :data-value="item.url || ''"
+                                            @tap="url_event">{{ item.name }}</text>
+                                    </block>
+                                </block>
+                                <!-- 标题 -->
+                                <text class="va-m">{{ goods.title }}</text>
+                            </view>
+                            <view v-if="(plugins_seckill_data || null) !== null" class="flex-row align-c padding-left-main">
+                                <!-- 分享 -->
+                                <view class="goods-share tc cp" @tap="popup_share_event">
+                                    <image :src="common_static_url + 'share-icon.png'" mode="scaleToFill" class="dis-block auto"></image>
+                                    <view class="cr-grey text-size-xs">{{$t('common.share')}}</view>
+                                </view>
+                                <!-- 收藏 -->
+                                <view class="collect tc cp margin-left-xxxl" @tap="goods_favor_event">
+                                    <image :src="common_static_url + 'favor' + (nav_favor_button_info.status == 1 ? '-active' : '') + '-icon.png'" mode="scaleToFill" class="dis-block auto"></image>
+                                    <view :class="'cr-grey text-size-xs ' + (nav_favor_button_info.status == 1 ? 'cr-main' : 'cr-grey')">{{ nav_favor_button_info.text }}</view>
+                                </view>
+                            </view>
+                        </view>
+                        <!-- 简述 -->
+                        <view v-if="(goods.simple_desc || null) != null" class="cr-red text-size-xs margin-top-sm">{{ goods.simple_desc }}</view>
+                    </view>
+
+                    <!-- 基础总计数据 -->
+                    <view v-if="(goods.show_sales_number_status || 0) == 1 || (goods.show_inventory_status || 0) == 1" class="br-t padding-main">
+                        <view class="text-size-xs flex-row jc-sb">
+                            <view v-if="(goods.show_inventory_status || 0) == 1">
+                                <text class="cr-grey">{{$t('goods-detail.goods-detail.1s79t4')}}</text>
+                                <text class="cr-main padding-left-sm">{{ goods.inventory }}</text>
+                            </view>
+                            <view>
+                                <text class="cr-grey">{{$t('goods-category.goods-category.283ot0')}}</text>
+                                <text class="cr-main padding-left-sm">{{ goods.access_count }}</text>
+                            </view>
+                            <view v-if="(goods.show_sales_number_status || 0) == 1">
+                                <text class="cr-grey">{{$t('goods-category.goods-category.at5p35')}}</text>
+                                <text class="cr-main padding-left-sm">{{ goods.sales_count }}</text>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 面板提示信息 -->
+                <view v-if="(goods.plugins_view_panel_data || null) != null && goods.plugins_view_panel_data.length > 0" class="goods-panel-container oh border-radius-main padding-horizontal-main padding-top-xs padding-bottom-xs bg-white text-size-xs spacing-mb">
+                    <block v-for="(item, index) in goods.plugins_view_panel_data" :key="index">
+                        <view v-if="(item || null) != null">{{ item }}</view>
+                    </block>
+                </view>
+
+                <!-- 智能工具-基础提示信息 -->
+                <view v-if="(plugins_intellectstools_data || null) != null && (plugins_intellectstools_data.base_bottom || null) != null && (plugins_intellectstools_data.base_bottom.msg || null) != null" class="plugins-intellectstools-base-bottom-container spacing-mb">
+                    <view class="notice-content text-size-xs">
+                        <view class="va-m dis-inline-block margin-right-xs">
+                            <uni-icons type="notification" size="32rpx" color="#dd514c"></uni-icons>
+                        </view>
+                        <text v-if="(plugins_intellectstools_data.base_bottom.title || null) != null" class="fw-b">{{ plugins_intellectstools_data.base_bottom.title }}</text>
+                        <view>{{ plugins_intellectstools_data.base_bottom.msg }}</view>
+                    </view>
+                </view>
+
+                <!-- 优惠券 -->
+                <view v-if="(plugins_coupon_data || null) != null && plugins_coupon_data.data.length > 0" class="plugins-coupon-container-view pr oh padding-main border-radius-main bg-white text-size-xs spacing-mb flex-row jc-sb align-c">
+                    <view class="item-title padding-right-main self-c">{{$t('goods-detail.goods-detail.w3jma9')}}</view>
+                    <view class="flex-row align-c flex-1 flex-width">
+                        <view class="margin-right-main cp flex-1 flex-width flex-row coupon-srcoll">
+                            <block v-for="(item, index) in plugins_coupon_data.data" :key="index">
+                                <view class="coupon-padding margin-right-xs">
+                                    <view class="oh">
+                                        <view class="item margin-vertical-xs mini-coupon flex-row flex-nowrap" :class="item.status_type === 2 ? 'received-coupon mini-coupon-br' : 'not-received-coupon'">
+                                            <text class="nowrap" @tap="popup_coupon_event">{{ item.desc || item.name }}</text>
+                                            <text class="dis-inline-block nowrap margin-left-sm padding-left-sm divider-l" @tap="coupon_receive_event(index, item.id)">{{ item.status_operable_name }}</text>
+                                        </view>
+                                    </view>
+                                </view>
+                            </block>
+                        </view>
+                        <view @tap="popup_coupon_event">
+                            <text class="text-size-xs cr-grey-9">{{$t('user-order-detail.user-order-detail.423rmr')}}{{ plugins_coupon_data.data.length }}{{$t('buy.buy.5iuqow')}}</text>
+                            <iconfont name="icon-arrow-right" color="#999" propClass="va-m"></iconfont>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 规格选择 -->
+                <view v-if="!plugins_realstore_cart_nav_status && goods.is_exist_many_spec == 1 && (buy_button || null) != null && (buy_button.is_buy || 0) + (buy_button.is_cart || 0) + (buy_button.is_show || 0) > 0" class="spec-container-view oh padding-horizontal-main padding-main border-radius-main bg-white text-size-xs spacing-mb">
+                    <view class="fl item-title">{{$t('goods-detail.goods-detail.u401fi')}}</view>
+                    <view class="fr column-right-view border-radius-main single-text cp" @tap="nav_buy_submit_event" :data-type="(buy_button.is_buy || 0) == 1 ? 'buy' : (buy_button.is_cart || 0) == 1 ? 'cart' : 'spec-show'">
+                        <text class="text-size-xs cr-grey-9">{{ goods_spec_selected_text }}</text>
+                        <iconfont name="icon-arrow-right" color="#999" propClass="va-m"></iconfont>
+                    </view>
+                </view>
+            </view>
+
+            <view class="padding-horizontal-main">
+                <!-- 商品基础参数 -->
+                <view v-if="(goods.parameters || null) != null && (goods.parameters.base || null) != null && goods.parameters.base.length > 0" class="goods-parameters parameters-base border-radius-main padding-main bg-white text-size-xs spacing-mb flex-row jc-sb align-c" @tap="popup_params_event" data-value="base">
+                    <view class="single-text padding-right-main flex-1 flex-width">
+                        <block v-for="(item, index) in goods.parameters.base" :key="index">
+                            <text v-if="index > 0">，</text>
+                            <text>{{ item.value }}</text>
+                        </block>
+                    </view>
+                    <iconfont name="icon-arrow-right" color="#999"></iconfont>
+                </view>
+
+                <!-- 商品服务 -->
+                <view v-if="(plugins_goodsservice_data || null) != null && plugins_goodsservice_data.length > 0" class="plugins-goodsservice-view-container border-radius-main padding-main bg-white text-size-xs spacing-mb flex-row jc-sb align-c" @tap="popup_goodsservice_event">
+                    <view class="padding-right-main single-text border-radius-right-main flex-1 flex-width">
+                        <block v-for="(item, index) in plugins_goodsservice_data" :key="index">
+                            <view :class="'item dis-inline-block ' + (index > 0 ? 'margin-left-xxl' : '')">
+                                <image class="va-m radius" :src="item.images" mode="widthFix"></image>
+                                <text class="cr-base va-m margin-left-sm">{{ item.name }}</text>
+                            </view>
+                        </block>
+                    </view>
+                    <iconfont name="icon-arrow-right" color="#999" propClass="va-m"></iconfont>
+                </view>
+
+                <!-- 组合搭配 -->
+                <block v-if="plugins_binding_data != null">
+                    <component-binding-detail-list :propData="plugins_binding_data" :propLabel="plugins_label_data"></component-binding-detail-list>
+                </block>
+
+                <!-- 门店 -->
+                <view v-if="plugins_realstore_data != null && ((plugins_realstore_data.data || null) != null) && plugins_realstore_data.data.length > 0" class="plugins-realstore-container">
+                    <view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                        <text class="text-wrapper title-left-border single-text flex-1 flex-width padding-right-main">{{$t('goods-detail.goods-detail.317jp2')}}</text>
+                        <text :data-value="'/pages/plugins/realstore/search/search?goods_id='+goods.id" @tap="url_event" class="arrow-right padding-right cr-grey cp">{{$t('common.more')}}</text>
+                    </view>
+                    <component-realstore-list :propData="{...{data: plugins_realstore_data.data}, ...{random: random_value}}" :propRealstoreDetailQuery="'&source_goods_id='+goods.id" :propIsFavor="false"></component-realstore-list>
+                </view>
+
+                <!-- 多商户 -->
+                <block v-if="plugins_shop_data != null">
+                    <component-shop-list :propData="{...{data: [plugins_shop_data]}, ...{random: random_value}}"></component-shop-list>
+                </block>
+
+                <!-- 商品评价 -->
+                <view v-if="common_is_goods_detail_show_comments == 1" class="goods-comment spacing-mb">
+                    <view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                        <view class="title-left">
+                            <text class="text-wrapper title-left-border">{{$t('goods-detail.goods-detail.znz76d')}}</text>
+                            <text class="vice-name cr-grey">({{ goods.comments_count || 0 }})</text>
+                        </view>
+                        <text :data-value="'/pages/goods-comment/goods-comment?goods_id=' + goods.id" @tap="url_event" class="arrow-right padding-right cr-grey cp">{{$t('goods-detail.goods-detail.1rqkjt')}}{{ (goods.comments_score || null) == null ? 0 : (goods.comments_score.rate || 0) }}%</text>
+                    </view>
+                    <view class="border-radius-main padding-main bg-white">
+                        <!-- 商品数据 -->
+                        <component-goods-comments :propData="goods.comments_data"></component-goods-comments>
+                        <!-- 是否开启评论入口 -->
+                        <view v-if="(plugins_intellectstools_data || null) !== null && (plugins_intellectstools_data.is_comments_add || 0) == 1">
+                            <view data-value="/pages/plugins/intellectstools/goods-comments/goods-comments?goods_id=' + goods.id" @tap="url_event" class="cp">
+                                <view class="br-t-e padding-top-main cr-base flex-row jc-c align-c">{{$t('goods-detail.goods-detail.6k7808')}}<iconfont name="icon-arrow-right" color="#666" propClass="margin-left-sm pr top-xs"></iconfont>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <!-- 问答 -->
+                <view v-if="(plugins_ask_data || null) !== null && (plugins_ask_data.is_ask_add || 0) == 1" class="goods-comment spacing-mb">
+                    <view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                        <view class="title-left">
+                            <text class="text-wrapper title-left-border">{{$t('goods-detail.goods-detail.k5u755')}}</text>
+                            <text class="vice-name cr-grey">({{ goods.comments_count }})</text>
+                        </view>
+                        <text :data-value="'/pages/plugins/ask/goods-list/goods-list?goods_id=' + goods.id" @tap="url_event" class="arrow-right padding-right cr-grey cp">{{$t('goods-detail.goods-detail.q8e577')}}</text>
+                    </view>
+                    <view class="border-radius-main padding-main bg-white">
+                        <component-ask-comments-goods :propData="plugins_ask_data.ask_data"></component-ask-comments-goods>
+                        <view :data-value="'/pages/plugins/ask/form/form?goods_id='+goods.id" @tap="url_event" class="cp">
+                            <view class="br-t-e padding-top-main cr-base flex-row jc-c align-c">{{$t('goods-detail.goods-detail.7ulh8b')}}<iconfont name="icon-arrow-right" color="#666" propClass="pr top-sm margin-left-sm"></iconfont>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 智能工具-详情顶部提示信息 -->
+                <view
+                    v-if="(plugins_intellectstools_data || null) != null && (plugins_intellectstools_data.content_top || null) != null && (plugins_intellectstools_data.content_top.msg || null) != null && plugins_intellectstools_data.content_top.msg.length > 0"
+                    class="plugins-intellectstools-content-top-container panel-item panel-item-only padding-main border-radius-main text-size-xs spacing-mb"
+                >
+                    <view v-if="(plugins_intellectstools_data.content_top.title || null) != null" class="panel-title padding-bottom-main fw-b text-size margin-bottom-main">
+                        {{ plugins_intellectstools_data.content_top.title }}
+                    </view>
+                    <view class="panel-content oh">
+                        <view v-for="(item, index) in plugins_intellectstools_data.content_top.msg" :key="index" class="item padding-top-sm padding-bottom-sm">
+                            <view class="content">{{ item }}</view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 商品详情参数 -->
+                <view v-if="(goods.parameters || null) != null && (goods.parameters.detail || null) != null && goods.parameters.detail.length > 0" class="spacing-mb">
+                    <view class="spacing-nav-title">
+                        <text class="line"></text>
+                        <text class="text-wrapper">{{$t('goods-detail.goods-detail.l7dzv2')}}</text>
+                    </view>
+                    <view class="goods-parameters border-radius-main padding-main bg-white">
+                        <view class="content-item oh">
+                            <view class="oh">
+                                <block v-for="(item, index) in goods.parameters.detail" :key="index">
+                                    <view v-if="index <= 3" class="item single-text cr-base text-size-xs">
+                                        <text class="name">{{ item.name }}:</text>
+                                        <text class="value">{{ item.value }}</text>
+                                    </view>
+                                </block>
+                            </view>
+                            <view class="tc margin-top-lg">
+                                <text class="cr-grey text-size-xs" @tap="popup_params_event" data-value="detail">查看全部参数 >></text>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 商品详情 -->
+                <view class="goods-detail">
+                    <view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                        <text class="text-wrapper title-left-border">{{$t('goods-detail.goods-detail.2j44o2')}}</text>
+                    </view>
+                    <view class="border-radius-main oh bg-white">
+                        <block v-if="(common_is_goods_detail_content_show_photo == 1 && goods_photo.length > 0) || (common_app_is_use_mobile_detail == 0 && (goods.content_web || null) != null) || (common_app_is_use_mobile_detail == 1 && goods_content_app.length > 0)">
+                            <!-- 是否详情展示相册 -->
+                            <block v-if="common_is_goods_detail_content_show_photo == 1 && goods_photo.length > 0">
+                                <view v-for="(item, index) in goods_photo" :key="index" class="goods-detail-photo">
+                                    <image v-if="(item.images || null) != null" @tap="goods_detail_images_view_event" :data-value="item.images" class="wh-auto dis-block" :src="item.images" mode="widthFix"></image>
+                                </view>
+                            </block>
+                            <!-- web详情 -->
+                            <view v-if="common_app_is_use_mobile_detail == 0 && (goods.content_web || null) != null" class="padding-main web-html-content">
+                                <mp-html :content="goods.content_web" />
+                            </view>
+                            <!-- 手机独立详情 -->
+                            <block v-if="common_app_is_use_mobile_detail == 1 && goods_content_app.length > 0">
+                                <view v-for="(item, index) in goods_content_app" :key="index" class="goods-detail-app">
+                                    <image v-if="(item.images || null) != null" @tap="goods_detail_images_view_event" :data-value="item.images" class="wh-auto dis-block" :src="item.images" mode="widthFix"></image>
+                                    <view v-if="(item.content || null) != null" class="content-items">
+                                        <view v-for="(items, index2) in item.content" :key="index2">{{ items }}</view>
+                                    </view>
+                                </view>
+                            </block>
+                        </block>
+                        <block v-else>
+                            <view class="cr-grey tc padding-top-xxl padding-bottom-xxl">{{$t('goods-detail.goods-detail.27wudx')}}</view>
+                        </block>
+                    </view>
+                </view>
+
+                <!-- 猜你喜欢 -->
+                <view v-if="guess_you_like.length > 0" class="padding-horizontal-main margin-top-main">
+                    <view class="tc spacing-mb">
+                        <view class="guess-like fw-b text-size-md">{{$t('goods-detail.goods-detail.v2974w')}}</view>
+                    </view>
+                    <div class="spacing-mt">
+                        <component-goods-list :propData="{ style_type: 1, goods_list: guess_you_like }"  :propCurrencySymbol="currency_symbol"></component-goods-list>
+                    </div>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+
+            <!-- 底部操作先展示加载 -->
+            <block v-if="goods_bottom_nav_status">
+                <view v-if="plugins_realstore_cart_nav_status || data_loading_status == 0" class="bottom-fixed" :style="bottom_fixed_style">
+                    <view class="bottom-line-exclude">
+                        <view class="item goods-buy-nav oh round bg-white flex-row jc-sb align-c padding-vertical-sm padding-horizontal-xs">
+                            <button class="bg-white br-white round tc text-size-md wh-auto margin-horizontal-main cr-grey" type="default" :loading="true">{{ $t('realstore-cart.realstore-cart.50lf68') }}</button>
+                        </view>
+                    </view>
+                </view>
+                <block v-else>
+                    <!-- 底部操作 -->
+                    <view v-if="goods_bottom_opt_nav_status" class="bottom-fixed" :style="bottom_fixed_style">
+                        <view class="bottom-line-exclude">
+                            <view class="item goods-buy-nav oh round bg-white flex-row jc-sb align-c padding-vertical-sm padding-horizontal-xs">
+                                <!-- 左侧集合操作 -->
+                                <view class="tc flex-row jc-sa align-c flex-width-half padding-right-sm">
+                                    <!-- 是否指定返回操作 -->
+                                    <view v-if="is_opt_back == 1" class="cp" @tap="bottom_nav_back_event">
+                                        <image :src="common_static_url + 'back-icon.png'" mode="scaleToFill" class="image"></image>
+                                        <text class="dis-block text-size-xs cr-grey">{{$t('common.return')}}</text>
+                                    </view>
+                                    <!-- 左侧购买导航列表 -->
+                                    <block v-if="buy_left_nav.length > 0">
+                                        <block v-for="(item, index) in buy_left_nav" :key="index">
+                                            <!-- 不展示收藏 -->
+                                            <block v-if="item.type != 'favor'">
+                                                <!-- 客服 -->
+                                                <block v-if="item.type == 'chat'">
+                                                    <component-online-service
+                                                        :propIsGoods="true"
+                                                        :propIsNav="true"
+                                                        :propCard="true"
+                                                        :propTitle="goods.title"
+                                                        :propImg="goods.images"
+                                                        :propPath="'/pages/goods-detail/goods-detail?id=' + goods.id"
+                                                        :propChatUrl="item.url || ''"
+                                                    ></component-online-service>
+                                                </block>
+                                                <!-- 首页 -->
+                                                <block v-else-if="item.type == 'home'">
+                                                    <view v-if="is_opt_back != 1" class="cp" :data-value="item.url || default_home_url" :data-type="item.type" @tap="buy_left_nav_event">
+                                                        <image :src="item.icon" mode="scaleToFill" class="image"></image>
+                                                        <text class="dis-block text-size-xs cr-grey">{{ item.name }}</text>
+                                                    </view>
+                                                </block>
+                                                <!-- 其他通用的 -->
+                                                <block v-else>
+                                                    <view class="cp" :data-value="item.url" :data-type="item.type" @tap="buy_left_nav_event">
+                                                        <image :src="item.icon" mode="scaleToFill" class="image"></image>
+                                                        <text class="dis-block text-size-xs cr-grey">{{ item.name }}</text>
+                                                    </view>
+                                                </block>
+                                            </block>
+                                        </block>
+                                    </block>
+                                    <!-- 购物车 -->
+                                    <view v-if="is_opt_cart == 1" class="cp pr" data-value="/pages/cart-page/cart-page" @tap="url_event">
+                                        <view class="badge-icon">
+                                            <component-badge :propNumber="quick_nav_cart_count"></component-badge>
+                                        </view>
+                                        <image :src="common_static_url + 'cart-icon.png'" mode="scaleToFill" class="image"></image>
+                                        <text class="dis-block text-size-xs cr-grey">{{$t('common.cart')}}</text>
+                                    </view>
+                                </view>
+                                <!-- 右侧主操作 -->
+                                <view :class="'btn-items flex-row jc-sa align-c flex-width-half goods-buy-nav-btn-number-' + (buy_button.count || 0)">
+                                    <block v-if="(buy_button.data || null) != null && buy_button.data.length > 0">
+                                        <block v-for="(item, index) in buy_button.data" :key="index">
+                                            <block v-if="(item.name || null) != null && (item.type || null) != null">
+                                                <button :class="'btn fl cr-white text-size-md round bg-' + ((item.color || 'main') == 'main' ? 'main' : 'main-pair')" type="default" @tap="nav_buy_submit_event" :data-type="item.type" :data-value="item.value || ''" :data-business="item.business || ''" hover-class="none">{{ item.name }}</button>
+                                            </block>
+                                        </block>
+                                    </block>
+                                    <button v-else class="btn fl round text-size-md cr-grey" type="default" hover-class="none" disabled>{{ buy_button.error }}</button>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </block>
+            </block>
+
+            <!-- 商品参数弹窗 -->
+            <component-popup :propShow="popup_params_status" propPosition="bottom" @onclose="popup_params_close_event">
+                <view class="padding-horizontal-main padding-top-main bg-white">
+                    <view class="close oh">
+                        <view class="fr" @tap.stop="popup_params_close_event">
+                            <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                        </view>
+                    </view>
+                    <view class="popup-params-container">
+                        <block v-if="(goods.parameters || null) != null && (goods.parameters[popup_params_type_field] || null) != null && goods.parameters[popup_params_type_field].length > 0">
+                            <block v-for="(item, index) in goods.parameters[popup_params_type_field]" :key="index">
+                                <view class="item padding-vertical-main br-b oh">
+                                    <view class="name fl br-r">{{ item.name }}</view>
+                                    <view class="value fr">{{ item.value }}</view>
+                                </view>
+                            </block>
+                        </block>
+                        <block v-else>
+                            <view class="cr-grey tc padding-top-xl padding-bottom-xxxl">{{$t('goods-detail.goods-detail.0gx41x')}}</view>
+                        </block>
+                    </view>
+                </view>
+            </component-popup>
+
+            <!-- 优惠券弹层 -->
+            <component-popup :propShow="popup_coupon_status" propPosition="bottom" @onclose="popup_coupon_close_event">
+                <view class="padding-horizontal-main padding-top-main bg-white">
+                    <view class="close oh">
+                        <view class="fr" @tap.stop="popup_coupon_close_event">
+                            <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                        </view>
+                    </view>
+                    <view class="plugins-coupon-container padding-bottom-main">
+                        <block v-if="(plugins_coupon_data || null) != null && plugins_coupon_data.data.length > 0">
+                            <block v-for="(item, index) in plugins_coupon_data.data" :key="index">
+                                <component-coupon-card :propData="item" :propStatusType="item.status_type" :propStatusOperableName="item.status_operable_name" :propIndex="index" propIsProgress @call-back="coupon_receive_event"></component-coupon-card>
+                            </block>
+                        </block>
+                        <block v-else>
+                            <view class="cr-grey tc padding-top-xl padding-bottom-xxxl">{{$t('goods-detail.goods-detail.96y691')}}</view>
+                        </block>
+                    </view>
+                </view>
+            </component-popup>
+
+            <!-- 门店弹层 -->
+            <component-popup :propShow="popup_realstore_status" propPosition="bottom" @onclose="popup_realstore_close_event">
+                <view class="padding-horizontal-main padding-top-main bg-grey-f5">
+                    <view class="close oh">
+                        <view class="fr" @tap.stop="popup_realstore_close_event">
+                            <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                        </view>
+                    </view>
+                    <view class="plugins-realstore-popup">
+                        <block v-if="(plugins_realstore_data || null) != null && ((plugins_realstore_data.data || null) != null) && plugins_realstore_data.data.length > 0">
+                            <component-realstore-list :propData="{...{data: plugins_realstore_data.data}, ...{random: random_value}}" :propRealstoreDetailQuery="'&source_goods_id='+goods.id" :propIsFavor="false"></component-realstore-list>
+                            <view class="tc margin-top-sm margin-bottom-lg">
+                                <text :data-value="'/pages/plugins/realstore/search/search?goods_id='+goods.id" @tap="url_event" class="arrow-right padding-right cr-grey cp">{{$t('common.more')}}{{$t('goods-detail.goods-detail.317jp2')}}</text>
+                            </view>
+                        </block>
+                        <block v-else>
+                            <view class="cr-grey tc padding-top-xl padding-bottom-xxxl">{{$t('goods-detail.goods-detail.gwwf19')}}</view>
+                        </block>
+                    </view>
+                </view>
+            </component-popup>
+
+            <!-- 商品服务弹层 -->
+            <component-popup :propShow="popup_goodsservice_status" propPosition="bottom" @onclose="popup_goodsservice_close_event">
+                <view class="padding-horizontal-main padding-top-main bg-white">
+                    <view class="close oh">
+                        <view class="fr" @tap.stop="popup_goodsservice_close_event">
+                            <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                        </view>
+                    </view>
+                    <view class="plugins-goodsservice-container">
+                        <block v-if="(plugins_goodsservice_data || null) != null && plugins_goodsservice_data.length > 0">
+                            <block v-for="(item, index) in plugins_goodsservice_data" :key="index">
+                                <view :class="'item oh padding-vertical-main ' + (index > 0 ? 'br-t' : '')">
+                                    <view class="fl left">
+                                        <image class="dis-block radius" :src="item.images" mode="widthFix"></image>
+                                    </view>
+                                    <view class="fr right tl">
+                                        <view class="cr-base fw-b text-size-sm">{{ item.name }}</view>
+                                        <view class="cr-grey text-size-xs margin-top-xs">{{ item.describe }}</view>
+                                    </view>
+                                </view>
+                            </block>
+                        </block>
+                        <block v-else>
+                            <view class="cr-grey tc padding-top-xl padding-bottom-xxxl">{{$t('goods-detail.goods-detail.8ej346')}}</view>
+                        </block>
+                    </view>
+                </view>
+            </component-popup>
+
+            <!-- 购买记录 -->
+            <view v-if="(plugins_salerecords_tips_content || null) != null" :class="'plugins-salerecords-tips' + plugins_salerecords_tips_ent">
+                <image mode="widthFix" :src="plugins_salerecords_tips_content.user.avatar" class="va-m br"></image>
+                <text class="margin-left-sm">{{ plugins_salerecords_tips_content.tips }}</text>
+            </view>
+        </view>
+
+        <!-- 提示信息 -->
+        <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg" propPage="goods" :propIsHeader="true"></component-no-data>
+
+        <!-- 分享弹窗 -->
+        <component-share-popup ref="share"></component-share-popup>
+
+        <!-- 商品购买 -->
+        <component-goods-buy ref="goods_buy" :propParams="params" :propCurrencySymbol="currency_symbol" v-on:BackSuccessEvent="goods_buy_back_success_event" v-on:CartSuccessEvent="goods_cart_back_event" v-on:SpecChoiceEvent="goods_spec_back_event"></component-goods-buy>
+
+        <!-- 商品批量下单 -->
+        <component-goods-batch-buy ref="goods_batch_buy" v-on:BatchCartSuccessEvent="batch_goods_cart_back_event"></component-goods-batch-buy>
+
+        <!-- 门店购物车 -->
+        <component-realstore-cart ref="realstore_cart" :propStatus="plugins_realstore_cart_nav_status" v-on:BuyTypeSwitchEvent="refresh_loading_event" v-on:RefreshLoadingEvent="refresh_loading_event" :propCurrencySymbol="currency_symbol"></component-realstore-cart>
+
+        <!-- 品类限制温馨提示 -->
+        <block v-if="(plugins_categorylimit_data || null) != null">
+            <component-categorylimit-warm-tips :propData="plugins_categorylimit_data"></component-categorylimit-warm-tips>
+        </block>
+        
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentGoodsBuy from '@/components/goods-buy/goods-buy';
+    import componentGoodsBatchBuy from '@/components/goods-batch-buy/goods-batch-buy';
+    import componentPopup from '@/components/popup/popup';
+    import componentBadge from '@/components/badge/badge';
+    import componentTrnNav from '@/components/trn-nav/trn-nav';
+    import componentCountdown from '@/components/countdown/countdown';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentOnlineService from '@/components/online-service/online-service';
+    import componentRealstoreList from '@/components/realstore-list/realstore-list';
+    import componentShopList from '@/components/shop-list/shop-list';
+    import componentBindingDetailList from '@/components/binding-detail-list/binding-detail-list';
+    import componentSharePopup from '@/components/share-popup/share-popup';
+    import componentGoodsComments from '@/components/goods-comments/goods-comments';
+    import componentAskCommentsGoods from '@/components/ask-comments-goods/ask-comments-goods';
+    import componentCouponCard from '@/components/coupon-card/coupon-card';
+    import componentRealstoreCart from '@/components/realstore-cart/realstore-cart';
+    import componentGoodsList from '@/components/goods-list/goods-list';
+    import componentWholesaleRules from '@/components/wholesale-rules/wholesale-rules';
+    import componentCategorylimitWarmTips from '@/components/categorylimit-warm-tips/categorylimit-warm-tips';
+
+    var common_static_url = app.globalData.get_static_url('common');
+    var ask_static_url = app.globalData.get_static_url('ask', true) + 'app/';
+    var system_info = app.globalData.get_system_info() || {};
+    var bar_height = parseInt(system_info.statusBarHeight || 0);
+    var win_width = parseInt(system_info.windowWidth || system_info.screenWidth || 0);
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                status_bar_height: bar_height,
+                common_static_url: common_static_url,
+                ask_static_url: ask_static_url,
+                bottom_fixed_style: '',
+                indicator_dots: false,
+                indicator_color: 'rgba(0, 0, 0, .2)',
+                indicator_active_color: '#666',
+                autoplay: true,
+                circular: true,
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_loading_status: 0,
+                params: null,
+                system_info: system_info,
+                photo_height: win_width <= 0 ? '55vh' : app.globalData.window_width_handle(win_width) + 'px',
+                goods: null,
+                guess_you_like: [],
+                goods_photo: [],
+                goods_specifications_choose: [],
+                goods_content_app: [],
+                popup_buy_status: false,
+                buy_event_type: 'buy',
+                buy_button: {},
+                buy_left_nav: [],
+                goods_spec_base_price: 0,
+                goods_spec_base_original_price: 0,
+                goods_spec_selected_text: this.$t('goods-detail.goods-detail.6brk57'),
+                show_field_price_text: null,
+                goods_video_is_autoplay: false,
+                // 增加随机数，避免无法监听数据列表内部数据更新
+                random_value: 0,
+                // 是否显示底部购买导航
+                goods_bottom_nav_status: true,
+                // 底部导航展示状态、如果已开启多门店默认展示、则先展示加载
+                goods_bottom_opt_nav_status: app.globalData.get_config('plugins_base.realstore', null) == null,
+                // 更多导航
+                nav_more_status: false,
+                nav_more_timer: null,
+                nav_more_list: [],
+                // 默认首页地址
+                default_home_url: app.globalData.app_tabbar_pages()[0],
+                // 导航收藏按钮
+                nav_favor_button_info: {
+                    text: this.$t('goods-detail.goods-detail.dco1sc'),
+                    status: 0,
+                },
+                // 购物车快捷导航
+                quick_nav_cart_count: 0,
+                // 基础配置
+                currency_symbol: app.globalData.currency_symbol(),
+                plugins_is_goods_detail_poster: 0,
+                common_app_is_use_mobile_detail: 0,
+                common_is_goods_detail_content_show_photo: 0,
+                common_is_goods_detail_show_comments: 1,
+                common_app_customer_service_tel: null,
+                // 是否单页预览
+                is_single_page: app.globalData.is_current_single_page() || 0,
+                // 是否底部导航展示返回按钮
+                is_opt_back: 0,
+                // 是否开启购物车
+                is_opt_cart: 1,
+                // 滚动监听值
+                scroll_value: 0,
+                // 顶部导航信息
+                // #ifdef MP || APP
+                top_nav_icon_top_value: bar_height + 8,
+                top_nav_more_top_value: bar_height + 48,
+                // #endif
+                // #ifdef H5
+                top_nav_icon_top_value: 6,
+                top_nav_more_top_value: 50,
+                // #endif
+                // #ifdef H5 || APP
+                top_nav_right_icon_left_value: win_width <= 800 ? win_width - 40 : win_width - (win_width - 800) / 2 - 40,
+                // #endif
+                top_nav_height: 20,
+                top_nav_title_index: 0,
+                top_nav_title_scroll: true,
+                top_nav_title_timer: null,
+                top_nav_title_data: [],
+                // 详情参数弹窗
+                popup_params_status: false,
+                popup_params_type_field: 'base',
+                // 自定义分享信息
+                share_info: {},
+                // 限时秒杀插件
+                plugins_seckill_data: null,
+                plugins_seckill_is_valid: false,
+                // 优惠劵插件
+                plugins_coupon_data: null,
+                temp_coupon_receive_index: null,
+                temp_coupon_receive_value: null,
+                popup_coupon_status: false,
+                // 购买记录插件
+                plugins_salerecords_data: null,
+                plugins_salerecords_timer: null,
+                plugins_salerecords_tips_content: null,
+                plugins_salerecords_tips_ent: '',
+                // 多商户插件
+                plugins_shop_data: null,
+                // 标签插件
+                plugins_label_data: null,
+                // 智能工具插件
+                plugins_intellectstools_data: null,
+                // 客服插件
+                plugins_chat_data: null,
+                // 门店插件
+                plugins_realstore_data: null,
+                plugins_realstore_cart_nav_status: false,
+                popup_realstore_status: false,
+                // 组合搭配插件
+                plugins_binding_data: null,
+                // 商品服务插件
+                plugins_goodsservice_data: null,
+                popup_goodsservice_status: false,
+                // 商品批量下单插件
+                plugins_batchbuy_data: null,
+                // 问答插件
+                plugins_ask_data: null,
+                // 批发插件
+                plugins_wholesale_data: null,
+                // 品类限制插件
+                plugins_categorylimit_data: null,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentGoodsBuy,
+            componentGoodsBatchBuy,
+            componentPopup,
+            componentBadge,
+            componentCountdown,
+            componentNoData,
+            componentTrnNav,
+            componentBottomLine,
+            componentOnlineService,
+            componentRealstoreList,
+            componentShopList,
+            componentBindingDetailList,
+            componentSharePopup,
+            componentGoodsComments,
+            componentAskCommentsGoods,
+            componentCouponCard,
+            componentRealstoreCart,
+            componentGoodsList,
+            componentWholesaleRules,
+            componentCategorylimitWarmTips
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            params = app.globalData.launch_params_handle(params);
+            this.setData({
+                params: params,
+                // 是否自定义购买事件
+                buy_event_type: params.opt_buy_event_type || 'buy',
+                // 是否指定开启购买弹窗、默认0否、1是
+                popup_buy_status: parseInt(params.is_opt_buy_status || 0) == 1,
+                // 是否底部导航展示返回按钮
+                is_opt_back: parseInt(params.is_opt_back || 0) == 1 && (app.globalData.data.is_goods_bottom_opt_back || 0) == 1 ? 1 : 0,
+                // 是否自定义购物车状态
+                is_opt_cart: params.is_opt_cart === undefined ? app.globalData.data.is_goods_bottom_opt_cart || 0 : parseInt(params.is_opt_cart || 0),
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 初始化配置
+            this.init_config();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        // 页面销毁时执行
+        onUnload: function () {
+            clearInterval(this.plugins_salerecords_timer);
+        },
+
+        // 监听滚动
+        onPageScroll(e) {
+            // 位置记录
+            var upd_data = { scroll_value: e.scrollTop };
+
+            // 更多导航状态处理
+            if (this.nav_more_status) {
+                upd_data['nav_more_status'] = false;
+                clearInterval(this.nav_more_timer);
+            }
+            this.setData(upd_data);
+
+            // 顶部导航选中处理
+            if (this.top_nav_title_scroll) {
+                var self = this;
+                var data = this.top_nav_title_data;
+                var query = uni.createSelectorQuery();
+                for (var i in data) {
+                    query.select(data[i]['ent']).boundingClientRect();
+                }
+                query.exec(function (res) {
+                    if((res || null) != null) {
+                        var bar_h = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
+                        var nav_h = self.top_nav_height;
+                        var length = res.length - 1;
+                        for (var i = length; i >= 0; i--) {
+                            if((res[i] || null) != null) {
+                                var temp = res[i]['top'] - bar_h - nav_h;
+                                if (temp <= 0) {
+                                    if (self.top_nav_title_index != i) {
+                                        self.top_nav_title_index = i;
+                                    }
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                });
+            }
+        },
+
+        methods: {
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    this.setData({
+                        currency_symbol: app.globalData.get_config('currency_symbol'),
+                        common_app_is_use_mobile_detail: app.globalData.get_config('config.common_app_is_use_mobile_detail'),
+                        common_is_goods_detail_content_show_photo: app.globalData.get_config('config.common_is_goods_detail_content_show_photo'),
+                        common_is_goods_detail_show_comments: app.globalData.get_config('config.common_is_goods_detail_show_comments', 1),
+                        common_app_customer_service_tel: app.globalData.get_config('config.common_app_customer_service_tel'),
+                        plugins_is_goods_detail_poster: app.globalData.get_config('plugins_base.distribution.data.is_goods_detail_poster'),
+                    });
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 获取数据
+            init() {
+                // 缓存数据
+                if((this.goods || null) == null) {
+                    var goods = app.globalData.goods_data_cache_handle(this.params.id);
+                    if(goods != null) {
+                        this.init_result_data_handle(goods);
+                    }
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('detail', 'goods'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var goods = data.goods;
+
+                            // 商品数据
+                            this.init_result_data_handle(goods);
+
+                            // 基础数据
+                            var plugins_seckill_data = data.plugins_seckill_data || null;
+                            var upd_data = {
+                                random_value: Math.random(),
+                                data_loading_status: 1,
+                                goods_bottom_nav_status: true,
+                                goods_bottom_opt_nav_status: true,
+                                guess_you_like: data.guess_you_like || [],
+                                nav_more_list: data.nav_more_list || [],
+                                buy_button: data.buy_button || null,
+                                buy_left_nav: data.buy_left_nav || [],
+                                top_nav_title_data: data.middle_tabs_nav || [],
+                                plugins_seckill_data: plugins_seckill_data,
+                                plugins_seckill_is_valid:  plugins_seckill_data != null && (plugins_seckill_data.time || null) != null && plugins_seckill_data.time.status == 1,
+                                plugins_coupon_data: data.plugins_coupon_data || null,
+                                quick_nav_cart_count: data.cart_total.buy_number || 0,
+                                plugins_salerecords_data: data.plugins_salerecords_data || null,
+                                plugins_shop_data: data.plugins_shop_data || null,
+                                plugins_wholesale_data: (data.plugins_wholesale_data || null) == null ? null : data.plugins_wholesale_data,
+                                plugins_label_data: (data.plugins_label_data || null) == null || (data.plugins_label_data.base || null) == null || (data.plugins_label_data.data || null) == null || data.plugins_label_data.data.length <= 0 ? null : data.plugins_label_data,
+                                plugins_intellectstools_data: data.plugins_intellectstools_data || null,
+                                plugins_chat_data: data.plugins_chat_data || null,
+                                plugins_realstore_data: data.plugins_realstore_data || null,
+                                plugins_binding_data: data.plugins_binding_data || null,
+                                plugins_goodsservice_data: data.plugins_goodsservice_data || null,
+                                plugins_batchbuy_data: data.plugins_batchbuy_data || null,
+                                plugins_ask_data: data.plugins_ask_data || null,
+                                plugins_categorylimit_data: data.plugins_categorylimit_data || null,
+                            };
+                            this.setData(upd_data);
+
+                            // 如果已默认开启购买弹窗，库存为0则不开启
+                            if (this.popup_buy_status && parseInt(goods.inventory) > 0) {
+                                if ((this.$refs.goods_buy || null) != null) {
+                                    this.$refs.goods_buy.init(this.goods, {...{buy_event_type: this.buy_event_type, buy_button: this.buy_button}, ...this.params});
+                                }
+                            }
+
+                            // 是否展示门店购物车导航
+                            if((this.plugins_realstore_data || null) != null) {
+                                // 当前门店信息
+                                if((this.plugins_realstore_data.info || null) != null) {
+                                    this.setData({
+                                        plugins_realstore_cart_nav_status: true,
+                                        goods_bottom_nav_status: false,
+                                        goods_bottom_opt_nav_status: false,
+                                    });
+                                    this.$refs.realstore_cart.init({...{source: 'goods', base: this.plugins_realstore_data.base, info: this.plugins_realstore_data.info, realstore_goods_data: {...{buy_button: this.buy_button}, ...this.goods}}, ...this.params});
+                                }
+
+                                // 是否需要隐藏购物车
+                                if(parseInt(this.plugins_realstore_data.is_hide_cart || 0) == 1) {
+                                    this.setData({is_opt_cart: 0});
+                                }
+                            }
+
+                            // 分享配置
+                            this.setData({
+                                // 基础自定义分享
+                                share_info: {
+                                    title: goods.seo_title || goods.title,
+                                    kds: goods.seo_keywords || goods.simple_desc,
+                                    desc: goods.seo_desc || goods.simple_desc,
+                                    path: '/pages/goods-detail/goods-detail',
+                                    query: 'id=' + goods.id,
+                                    img: goods.share_images || goods.images,
+                                    video: goods.video,
+                                },
+                            });
+
+                            // 购买记录提示
+                            this.plugins_salerecords_tips_handle();
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 0,
+                                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: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 初始化数据处理
+            init_result_data_handle(goods) {
+                // 价格字段
+                var price_text_arr = [this.$t('goods-detail.goods-detail.bogx42'), this.$t('goods-category.goods-category.g2u3lf'), this.$t('goods-detail.goods-detail.3kdgjl')];
+                // 相册处理
+                var photo = goods.photo || [];
+                if(photo.length == 0 && (goods.images || null) != null) {
+                    photo.push({images: goods.images});
+                }
+                this.setData({
+                    data_bottom_line_status: true,
+                    data_list_loding_status: 3,
+                    goods: goods,
+                    indicator_dots: photo.length > 1,
+                    autoplay: photo.length > 1,
+                    goods_photo: photo,
+                    goods_content_app: goods.content_app || [],
+                    nav_favor_button_info: {
+                        text: (goods.user_is_favor == 1 ? this.$t('goods-detail.goods-detail.by7052') : '') + this.$t('goods-detail.goods-detail.dco1sc'),
+                        status: goods.user_is_favor,
+                    },
+                    goods_spec_base_price: goods.price,
+                    goods_spec_base_original_price: goods.original_price || 0,
+                    show_field_price_text: price_text_arr.indexOf(goods.show_field_price_text) != -1 ? null : goods.show_field_price_text.replace(/<[^>]+>/g, '') || null,
+                });
+            },
+
+            // 返回事件
+            top_nav_left_back_event(e) {
+                app.globalData.page_back_prev_event();
+            },
+
+            // 更多事件
+            top_nav_left_more_event(e) {
+                if (this.nav_more_list.length <= 0) {
+                    app.globalData.showToast(this.$t('common.not_more_list_data_tips'));
+                    return false;
+                }
+
+                // 已开启则关闭并取消定时任务
+                var data = {};
+                clearInterval(this.nav_more_timer);
+                if (this.nav_more_status) {
+                    data['nav_more_status'] = false;
+                } else {
+                    var self = this;
+                    data['nav_more_status'] = true;
+                    data['nav_more_timer'] = setTimeout(function () {
+                        self.setData({
+                            nav_more_status: false,
+                        });
+                    }, 5000);
+                }
+                this.setData(data);
+            },
+
+            // 顶部导航事件
+            top_nav_title_event(e) {
+                var self = this;
+                var index = e.currentTarget.dataset.index || 0;
+                var value = e.currentTarget.dataset.value || null;
+
+                // 清除定时任务并禁止滚动改变
+                clearTimeout(self.top_nav_title_timer);
+                self.top_nav_title_scroll = false;
+
+                // 获取节点位置
+                var query = uni.createSelectorQuery();
+                query.select(value).boundingClientRect();
+                query.selectViewport().scrollOffset();
+                query.exec(function (res) {
+                    // 选中
+                    self.top_nav_title_index = index;
+
+                    // 距离计算
+                    var bar_h = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
+                    var nav_h = self.top_nav_height;
+                    var top = res[0].top + res[1].scrollTop - nav_h - bar_h;
+                    uni.pageScrollTo({
+                        scrollTop: top,
+                        duration: 300,
+                    });
+                });
+
+                // 滚动完成后等待2秒解除滚动改变状态
+                self.top_nav_title_timer = setTimeout(function () {
+                    self.top_nav_title_scroll = true;
+                }, 500);
+            },
+
+            // 导航左侧操作事件
+            buy_left_nav_event(e) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                var type = e.currentTarget.dataset.type || null;
+                var value = e.currentTarget.dataset.value || null;
+                app.globalData.url_open(value);
+            },
+
+            // 导航购买按钮事件
+            nav_buy_submit_event(e) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                var type = e.currentTarget.dataset.type || 'buy';
+                var value = e.currentTarget.dataset.value || null;
+                switch (type) {
+                    // 展示型、拨打电话
+                    case 'show':
+                    case 'tel':
+                        app.globalData.call_tel(value || this.common_app_customer_service_tel);
+                        break;
+                    // 规格选择(展示模式)、购买、加入购物车
+                    case 'spec-show':
+                    case 'buy':
+                    case 'cart':
+                        this.setData({ buy_event_type: type });
+                        if ((this.$refs.goods_buy || null) != null) {
+                            this.$refs.goods_buy.init(this.goods, {...{buy_event_type: this.buy_event_type, buy_button: this.buy_button, is_init: 0}, ...this.params});
+                        }
+                        break;
+                    // url事件
+                    case 'url':
+                    case 'link':
+                        if (value == null) {
+                            app.globalData.showToast(this.$t('goods-detail.goods-detail.tq1976'));
+                            return false;
+                        }
+                        app.globalData.url_open(value);
+                        break;
+                    // 复制事件
+                    case 'copy':
+                        if (value == null) {
+                            app.globalData.showToast(this.$t('goods-detail.goods-detail.uyghj2'));
+                            return false;
+                        }
+                        app.globalData.text_copy_event(value);
+                        break;
+                    // 门店
+                    case 'plugins-realstore':
+                        if((this.plugins_realstore_data || null) == null || (this.plugins_realstore_data.data || null) == null) {
+                            app.globalData.showToast(this.$t('goods-detail.goods-detail.98v424'));
+                            return false;
+                        }
+                        var temp_data_list = this.plugins_realstore_data.data || [];
+                        if (temp_data_list.length == 1) {
+                            app.globalData.url_open(temp_data_list[0]['url']+'&source_goods_id='+this.goods.id);
+                        } else {
+                            this.setData({
+                                popup_realstore_status: true,
+                            });
+                        }
+                        break;
+                    // 商品批量下单-购买
+                    case 'plugins-batchbuy-button-buy':
+                    // 商品批量下单-加入购物车
+                    case 'plugins-batchbuy-button-cart':
+                        if ((this.$refs.goods_batch_buy || null) != null) {
+                            this.$refs.goods_batch_buy.init({goods: this.goods, batchbuy_data: this.plugins_batchbuy_data, buy_button: this.buy_button, plugins_wholesale_data: this.plugins_wholesale_data});
+                        }
+                        break;
+                    // 默认
+                    default:
+                        app.globalData.showToast(this.$t('goods-detail.goods-detail.721e2h')+type+')');
+                }
+            },
+
+            // 数量和规格详情回调成功
+            goods_buy_back_success_event(e) {
+                if((e.back_data.plugins_wholesale_data || null) != null) {
+                    this.setData({
+                        plugins_wholesale_data: e.back_data.plugins_wholesale_data
+                    });
+                }
+            },
+
+            // 加入购物车成功回调
+            goods_cart_back_event(e) {
+                this.goods_spec_back_event(e);
+                this.goods_cart_count_handle(e.cart_number);
+            },
+
+            // 规格选择回调
+            goods_spec_back_event(e) {
+                var temp_goods = this.goods;
+                // 存在多规格则使用已选规格覆盖现有规格
+                if ((temp_goods.specifications || null) != null) {
+                    temp_goods['specifications']['choose'] = e.goods_spec_choose;
+                }
+                this.setData({
+                    goods_spec_selected_text: (e.spec || null) == null ? '' : e.spec.map(function (v) {return v.value;}).join(' / '),
+                    goods: temp_goods,
+                });
+            },
+
+            // 购物车总数处理
+            goods_cart_count_handle(cart_number) {
+                this.setData({
+                    quick_nav_cart_count: cart_number,
+                });
+            },
+
+            // 收藏事件
+            goods_favor_event(e) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                var user = app.globalData.get_user_info(this, 'goods_favor_event', e);
+                if (user != false) {
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('favor', 'goods'),
+                        method: 'POST',
+                        data: {
+                            id: this.goods.id,
+                        },
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                this.setData({
+                                    'goods.user_is_favor': res.data.data.status,
+                                    nav_favor_button_info: {
+                                        text: res.data.data.text,
+                                        status: res.data.data.status,
+                                    },
+                                });
+                                app.globalData.showToast(res.data.msg, 'success');
+                            } else {
+                                if (app.globalData.is_login_check(res.data, this, 'goods_favor_event')) {
+                                    app.globalData.showToast(res.data.msg);
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 详情图片查看
+            goods_detail_images_view_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value != null) {
+                    uni.previewImage({
+                        current: value,
+                        urls: [value],
+                    });
+                }
+            },
+
+            // 商品相册图片查看
+            goods_photo_view_event(e) {
+                var index = e.currentTarget.dataset.index;
+                var all = [];
+                for (var i in this.goods_photo) {
+                    all.push(this.goods_photo[i]['images']);
+                }
+                uni.previewImage({
+                    current: all[index],
+                    urls: all,
+                });
+            },
+
+            // 视频播放
+            goods_video_play_event(e) {
+                this.setData({
+                    goods_video_is_autoplay: true,
+                });
+            },
+
+            // 视频关闭
+            goods_video_close_event(e) {
+                this.setData({
+                    goods_video_is_autoplay: false,
+                });
+            },
+
+            // 分享开启弹层
+            popup_share_event(e) {
+                if ((this.$refs.share || null) != null) {
+                    this.$refs.share.init({
+                        status: true,
+                        is_goods_poster: this.plugins_is_goods_detail_poster,
+                        goods_id: this.goods.id,
+                        share_info: this.share_info
+                    });
+                }
+            },
+
+            // 优惠券开启弹层
+            popup_coupon_event(e) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                this.setData({
+                    popup_coupon_status: true,
+                });
+            },
+
+            // 优惠券弹层关闭
+            popup_coupon_close_event(e) {
+                this.setData({
+                    popup_coupon_status: false,
+                });
+            },
+
+            // 优惠劵领取事件
+            coupon_receive_event(index, value) {
+                // 参数处理
+                if ((index || null) == null && (value || null) == null) {
+                    var index = this.temp_coupon_receive_index;
+                    var value = this.temp_coupon_receive_value;
+                } else {
+                    this.setData({
+                        temp_coupon_receive_index: index,
+                        temp_coupon_receive_value: value,
+                    });
+                }
+
+                // 登录校验
+                var user = app.globalData.get_user_info(this, 'coupon_receive_event');
+                if (user != false) {
+                    var temp_list = this.plugins_coupon_data.data;
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('receive', 'coupon', 'coupon'),
+                        method: 'POST',
+                        data: {
+                            coupon_id: value,
+                        },
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                                temp_list[index] = res.data.data.coupon;
+                                this.setData({
+                                    'plugins_coupon_data.data': temp_list,
+                                });
+                            } else {
+                                if (app.globalData.is_login_check(res.data, this, 'coupon_receive_event')) {
+                                    app.globalData.showToast(res.data.msg);
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 购买记录提示处理
+            plugins_salerecords_tips_handle() {
+                // 销毁之前的任务
+                clearInterval(this.plugins_salerecords_timer);
+                // 是否存在数据
+                var data = this.plugins_salerecords_data || null;
+                if (data != null && (data.data || null) != null && data.data.length > 0) {
+                    var self = this;
+                    var base = data.base || null;
+                    var location = base == null || (base.goods_detail_tips_location || null) == null ? '' : '-' + base.goods_detail_tips_location;
+                    var pause = (base == null ? 5 : base.goods_detail_time_pause || 5) * 1000;
+                    var interval = (base == null ? 10 : base.goods_detail_time_interval || 10) * 1000;
+                    var index = 0;
+                    var list = data.data;
+                    var count = list.length;
+                    var timer = setInterval(function () {
+                        self.setData({
+                            plugins_salerecords_tips_content: list[index],
+                        });
+                        setTimeout(function () {
+                            self.setData({
+                                plugins_salerecords_tips_content: null,
+                            });
+                        }, pause);
+                        index++;
+                        if (index >= count) {
+                            index = 0;
+                        }
+                    }, interval);
+                    self.setData({
+                        plugins_salerecords_timer: timer,
+                        plugins_salerecords_tips_ent: location,
+                    });
+                }
+            },
+
+            // 门店弹层关闭
+            popup_realstore_close_event(e) {
+                this.setData({
+                    popup_realstore_status: false,
+                });
+            },
+
+            // 更多导航事件
+            nav_more_event(e) {
+                app.globalData.operation_event(e);
+                this.setData({ nav_more_status: false });
+            },
+
+            // 商品参数开启弹层
+            popup_params_event(e) {
+                this.setData({
+                    popup_params_status: true,
+                    popup_params_type_field: e.currentTarget.dataset.value || 'base',
+                });
+            },
+
+            // 商品参数关闭弹层
+            popup_params_close_event(e) {
+                this.setData({
+                    popup_params_status: false,
+                });
+            },
+
+            // 商品服务开启弹层
+            popup_goodsservice_event(e) {
+                this.setData({
+                    popup_goodsservice_status: true,
+                });
+            },
+
+            // 商品服务弹层关闭
+            popup_goodsservice_close_event(e) {
+                this.setData({
+                    popup_goodsservice_status: false,
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 底部导航操作返回事件
+            bottom_nav_back_event(e) {
+                var pages = getCurrentPages();
+                if (pages.length > 1) {
+                    uni.navigateBack();
+                } else {
+                    // 默认首页
+                    var url = app.globalData.app_tabbar_pages()[0];
+
+                    // 是否有参数定义
+                    if (this.is_opt_back == 1) {
+                        // 门店详情来源
+                        if ((this.params.realstore_id || null) != null) {
+                            url = '/pages/plugins/realstore/detail/detail?id=' + this.params.realstore_id;
+                        }
+                    }
+                    app.globalData.url_open(url);
+                }
+            },
+
+            // 商品批量下单加入购物车回调
+            batch_goods_cart_back_event(e) {
+                this.goods_cart_count_handle(e.cart_number);
+            },
+
+            // 下单类型切换事件、数据刷新事件
+            refresh_loading_event(params) {
+                console.log(params)
+                this.setData({params: {...this.params, ...params}});
+                this.init();
+            }
+        }
+    };
+</script>
+<style>
+    @import './goods-detail.css';
+</style>
diff --git a/pages/goods-search-start/goods-search-start.css b/pages/goods-search-start/goods-search-start.css
new file mode 100644
index 0000000..fd58511
--- /dev/null
+++ b/pages/goods-search-start/goods-search-start.css
@@ -0,0 +1,16 @@
+.ranking-list .ranking-item {
+    width: 65vw;
+}
+.ranking-list .goods-list .goods-image {
+    width: 100rpx;
+    height: 100rpx;
+}
+.ranking-list .goods-list .goods-title {
+    width: calc(100% - 120rpx);
+}
+.ranking-list .goods-list .single-text {
+    width: 59vw;
+}
+.ranking-list .goods-list .icon {
+    width: 38rpx;
+}
\ No newline at end of file
diff --git a/pages/goods-search-start/goods-search-start.vue b/pages/goods-search-start/goods-search-start.vue
new file mode 100644
index 0000000..80fe0d0
--- /dev/null
+++ b/pages/goods-search-start/goods-search-start.vue
@@ -0,0 +1,208 @@
+<template>
+    <view :class="theme_view">
+        <view class="padding-bottom-main">
+            <view class="padding-horizontal-main padding-top-main">
+                <!-- 搜索 -->
+                <view class="margin-bottom-xxxl">
+                    <component-search ref="search" :propIsBtn="true" :propIsOnEvent="true" propSize="sm" @onsearch="search_history_handle" :propPlaceholderValue="search_placeholder_keywords_value" :propPlaceholder="search_keywords_value" :propDefaultValue="search_keywords_value" propBrColor="#eee" propPlaceholderClass="cr-grey-c" propIconColor="#999" propBgColor="#fff"></component-search>
+                </view>
+                <!-- 历史搜索关键字 -->
+                <view v-if="history_keywords.length > 0" class="history-keywords margin-bottom-xxxl">
+                    <view class="margin-bottom flex-row jc-sb align-c">
+                        <text class="text-size-sm fw-b">历史搜索</text>
+                        <view class="dis-inline-block" @tap="history_delete_event">
+                            <iconfont name="icon-delete" size="30rpx" color="#999"></iconfont>
+                        </view>
+                    </view>
+                    <view class="oh">
+                        <block v-for="(item, index) in history_keywords" :key="index">
+                            <view class="dis-inline-block bg-grey-e cr-base round padding-vertical-xs padding-horizontal-lg margin-right margin-bottom" :data-value="item" @tap="keywords_event">{{item}}</view>
+                        </block>
+                    </view>
+                </view>
+                <!-- 推荐搜索关键字 -->
+                <view v-if="recommend_keywords.length > 0" class="recommend-keywords margin-bottom-xxxl">
+                    <view class="text-size-sm fw-b margin-bottom">热门搜索</view>
+                    <view class="oh">
+                        <block v-for="(item, index) in recommend_keywords" :key="index">
+                            <view class="dis-inline-block bg-grey-e cr-base round padding-vertical-xs padding-horizontal-lg margin-right margin-bottom" :data-value="item" @tap="keywords_event">{{item}}</view>
+                        </block>
+                    </view>
+                </view>
+            </view>
+            <!-- 排行榜 -->
+            <view v-if="ranking_list.length > 0" class="ranking-list scroll-view-horizontal oh">
+                <scroll-view scroll-x="true">
+                    <block v-for="(item, index) in ranking_list" :key="index">
+                        <view class="ranking-item dis-inline-grid bg-main-light padding-sm border-radius-main margin-right-main" :class="index == 0 ? 'margin-left-main' : ''">
+                            <view class="padding-vertical-sm padding-left-sm">
+                                <view v-if="(item.icon || null) != null" class="dis-inline-block margin-right-sm">
+                                    <iconfont :name="item.icon" size="26rpx" propClass="cr-main"></iconfont>
+                                </view>
+                                <text class="text-size-sm fw-b cr-main">{{item.name}}</text>
+                            </view>
+                            <view class="goods-list bg-white border-radius-main padding-main margin-top-xs">
+                                <block v-for="(item2, index2) in item.data" :key="index2">
+                                    <view class="goods-item oh margin-bottom-main" :data-value="item2.goods_url" @tap="url_event">
+                                        <view v-if="index2 > 2" class="single-text">
+                                            <view class="dis-inline-block pr va-m margin-right-sm">
+                                                <iconfont name="icon-label" size="38rpx" propClass="cr-grey-c"></iconfont>
+                                                <view class="icon pa top-xs left-xs tc cr-white text-size-xs">{{index2+1}}</view>
+                                            </view>
+                                            <text class="text-size-sm va-m">{{item2.title}}</text>
+                                        </view>
+                                        <view v-else class="pr">
+                                            <view class="pa top-sm left-sm z-i tc">
+                                                <iconfont name="icon-label" size="38rpx" :propClass="index2 == 0 ? 'cr-red' : (index2 == 1 ? 'cr-yellow' : 'cr-blue-dark')"></iconfont>
+                                                <view class="icon pa top-xs left-xs tc cr-white text-size-xs">{{index2+1}}</view>
+                                            </view>
+                                            <image class="goods-image radius fl" :src="item2.images" mode="aspectFill"></image>
+                                            <view class="goods-title text-size-sm multi-text fr">{{item2.title}}</view>
+                                        </view>
+                                    </view>
+                                </block>
+                            </view>
+                        </view>
+                    </block>
+                </scroll-view>
+            </view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common" :propIsFooterSeat="false"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentSearch from '@/components/search/search';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                history_keywords: [],
+                recommend_keywords: [],
+                ranking_list: [],
+                search_placeholder_keywords_value: '',
+                search_keywords_value: '',
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentSearch,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            params = app.globalData.launch_params_handle(params);
+            this.setData({
+                params: params,
+                search_placeholder_keywords_value: params.keywords || '',
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 历史搜索
+            this.setData({
+                history_keywords: uni.getStorageSync(app.globalData.data.cache_search_history_key) || [],
+            });
+
+            // 获取数据
+            this.get_data();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        methods: {
+            // 获取数据
+            get_data(params = {}) {
+                uni.request({
+                    url: app.globalData.get_request_url("start", "search"),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                recommend_keywords: data.search_keywords || [],
+                                ranking_list: data.ranking_list || [],
+                            });
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                    },
+                });
+            },
+
+            // 搜索历史记录删除事件
+            history_delete_event(e) {
+                uni.removeStorageSync(app.globalData.data.cache_search_history_key);
+                this.setData({
+                    history_keywords: []
+                });
+                app.globalData.showToast(this.$t('common.del_success'), 'success');
+            },
+
+            // 搜索历史处理
+            search_history_handle(value  = '') {
+                // 记录缓存
+                var key = app.globalData.data.cache_search_history_key;
+                var data = uni.getStorageSync(key) || [];
+                var index = data.indexOf(value);
+                if(index != -1) {
+                    data.splice(index, 1);
+                }
+                data.unshift(value);
+                uni.setStorageSync(key, data);
+
+                // 数据存储
+                this.setData({
+                    search_keywords_value: value
+                });
+
+                // 执行搜索
+                this.search_submit_confirm_event();
+            },
+
+            // 搜索关键字事件
+            keywords_event(e) {
+                this.search_history_handle(e.currentTarget.dataset.value);
+            },
+
+            // 搜索事件
+            search_submit_confirm_event() {
+                if ((this.$refs.search || null) != null) {
+                    this.$refs.search.search_submit_confirm(this.search_keywords_value);
+                }
+            },
+
+            // 打开url
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import './goods-search-start.css';
+</style>
diff --git a/pages/goods-search/goods-search.css b/pages/goods-search/goods-search.css
new file mode 100644
index 0000000..defcd4d
--- /dev/null
+++ b/pages/goods-search/goods-search.css
@@ -0,0 +1,156 @@
+/**
+ * 顶部搜索
+ */
+.top-search-input {
+    padding-right: 80rpx;
+}
+.top-search-right {
+    top: 20rpx;
+    right: 20rpx;
+}
+.top-search-submit {
+    line-height: 66rpx;
+    height: 66rpx;
+}
+.top-search-right .badge-icon {
+    top: -4px;
+    right: 10rpx;
+}
+
+/**
+* 排序导航
+*/
+.nav-sort-content .item {
+    height: 80rpx;
+    line-height: 80rpx;
+    width: calc(20% - 33.33rpx);
+}
+.nav-sort-content .item .icon {
+    width: 26rpx;
+    height: 26rpx !important;
+}
+.screening-submit,
+.show-type-submit {
+    width: 46rpx;
+    height: 46rpx !important;
+    top: 20rpx;
+}
+.screening-submit {
+    right: 82rpx;
+}
+.show-type-submit {
+    right: 16rpx;
+}
+
+/**
+* 商品列表
+*/
+.scroll-box {
+    height: calc(100vh - 176rpx);
+}
+.data-list .item {
+    width: calc(50% - 10rpx);
+}
+.data-list .item:nth-child(2n) {
+    float: right;
+}
+.data-list .item:nth-child(2n+1) {
+    float: left;
+}
+.data-list .item .goods-img {
+    width: 100%;
+    height: 380rpx !important;
+}
+
+/**
+* 条件
+*/
+.search-map {
+    height: calc(100vh - 160rpx);
+    overflow-y: scroll;
+    overflow-x: hidden;
+}
+.search-map,
+.search-map .search-submit {
+    width: 660rpx;
+}
+.map-keywords {
+    padding: 0 20rpx;
+    line-height: 66rpx;
+    height: 66rpx;
+    font-size: 26rpx;
+    box-sizing: border-box;
+}
+.map-nav text:first-child {
+    font-weight: bold;
+}
+.map-nav .arrow-bottom {
+    top: 0;
+    right: 10rpx;
+    padding-right: 46rpx;
+}
+.map-item {
+    line-height: 66rpx;
+}
+.map-content {
+    line-height: 60rpx;
+}
+.map-content .item {
+    margin-bottom: 20rpx;
+}
+.map-text-item .item,
+.map-images-text-item .item {
+    padding: 0 15rpx;
+    border: 1px solid transparent;
+}
+.map-images-text-item .item {
+    vertical-align: middle;
+    border: 1px solid #eee;
+    width: 150rpx;
+    height: 72rpx;
+    line-height: 72rpx;
+}
+.map-images-text-item .item image {
+    width: 150rpx;
+    height: calc(100% - 8rpx);
+    display: block;
+    margin: 0 auto;
+    margin-top: 4rpx;
+}
+.search-map .search-submit {
+    left: 0;
+    bottom: 0;
+}
+.search-map .search-submit button {
+    height: 80rpx;
+    line-height: 80rpx;
+}
+
+/**
+* 品牌基础信息
+*/
+.brand-info {
+    height: 160rpx;
+}
+.brand-info image,
+.brand-info .info-logo-empty {
+    width: 300rpx;
+    height: 130rpx;
+    border: 1px solid #eee;
+}
+.brand-info .info-logo-empty {
+    line-height: 130rpx;
+    font-weight: bold;
+}
+.brand-info .info-right {
+    width: calc(100% - 330rpx);
+}
+.brand-info .info-name {
+    line-height: 56rpx;
+    font-weight: bold;
+}
+.brand-info .info-desc {
+    font-size: 28rpx;
+    line-height: 40rpx;
+    min-height: 80rpx;
+}
\ No newline at end of file
diff --git a/pages/goods-search/goods-search.vue b/pages/goods-search/goods-search.vue
new file mode 100644
index 0000000..957dbfe
--- /dev/null
+++ b/pages/goods-search/goods-search.vue
@@ -0,0 +1,816 @@
+<template>
+    <view :class="theme_view">
+        <view class="bg-white">
+            <!-- 搜索关键字 -->
+            <view class="padding-horizontal-main padding-top-main padding-bottom-sm pr">
+                <view class="top-search-input">
+                    <component-search :propDefaultValue="post_data.wd || ''" propBrColor="#ddd" @onsearch="search_input_confirm_event" :propIsOnEvent="true" @oninput="search_input_value_event" :propIsOnInputEvent="true"
+                        @onfocus="search_input_focus_event" :propIsOnFocusEvent="true" @onblur="search_input_blur_event" :propIsOnBlurEvent="true" :propIsRequired="false"
+                        :propPlaceholder="$t('customview.customview.726k7y')"></component-search>
+                </view>
+                <view class="pa top-search-right">
+                    <view v-if="top_search_right_type_status" class="pr cp" @tap="search_submit_confirm_event">
+                        <uni-icons type="search" size="60rpx" color="#bbb"></uni-icons>
+                    </view>
+                    <view v-if="!top_search_right_type_status" class="pr cp" data-value="/pages/cart-page/cart-page" @tap="url_event">
+                        <uni-icons type="cart" size="60rpx" color="#bbb"></uni-icons>
+                        <view v-if="top_right_cart_total != 0" class="badge-icon pa">
+                            <component-badge :propNumber="top_right_cart_total"></component-badge>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 排序 -->
+            <view class="nav-sort oh pr">
+                <view class="nav-sort-content">
+                    <block v-for="(item, index) in search_nav_sort_list" :key="index">
+                        <view class="item tc fl cp" :data-index="index" @tap="nav_sort_event">
+                            <text class="cr-base va-m text-size-sm">{{item.name}}</text>
+                            <image v-if="(item.icon || null) != null" class="icon va-m" :src="common_static_url + 'sort-' + item.icon + '-icon.png'" mode="aspectFill"></image>
+                        </view>
+                    </block>
+                </view>
+                <image class="screening-submit pa cp" :src="common_static_url+'search-submit-icon.png'" mode="aspectFill" @tap="popup_form_event_show"></image>
+                <image class="show-type-submit pa cp" :src="common_static_url+'show-'+(data_show_type_value == 0 ? 'list' : 'grid')+'-icon.png'" mode="aspectFill" @tap="data_show_type_event"></image>
+            </view>
+        </view>
+
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="padding-horizontal-main padding-top-main oh">
+                <component-goods-list :propData="{style_type: (data_show_type_value) == 0 ? 1 : 0, goods_list: data_list, random: random_value}" :propLabel="plugins_label_data" :propCurrencySymbol="currency_symbol"
+                    :propIsCartParaCurve="true"></component-goods-list>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 筛选条件 popup -->
+        <component-popup :propShow="is_show_popup_form" propPosition="left" @onclose="popup_form_event_close">
+            <form @submit="form_submit_event" class="popup-form oh">
+                <view class="search-map padding-main bg-base">
+                    <view class="padding-main border-radius-main bg-white">
+                        <view class="map-item map-base br-b">
+                            <text>{{$t('goods-search.goods-search.j8o278')}}</text>
+                            <text class="cr-main"> {{data_total}} </text>
+                            <text>{{$t('goods-search.goods-search.t9nikq')}}</text>
+                            <text class="fr cr-red cp" @tap="map_remove_event">{{$t('goods-search.goods-search.pxk051')}}</text>
+                        </view>
+                        <!-- 搜索关键字 -->
+                        <input type="text" confirm-type="search" :placeholder="$t('customview.customview.726k7y')" name="wd" :value="(post_data.wd || '')" class="map-keywords wh-auto round bg-base margin-top-lg"
+                            placeholder-class="cr-grey">
+                    </view>
+
+                    <!-- 品牌 -->
+                    <view v-if="((search_map_list.brand_list || null) != null && search_map_list.brand_list.length > 0) || ((search_map_info.brand || null) != null)"
+                        class="map-item padding-horizontal-main padding-top-main border-radius-main bg-white spacing-mt">
+                        <view class="map-nav br-b pr">
+                            <text>{{$t('goods-search.goods-search.6n8316')}}</text>
+                            <text class="arrow-bottom pa cr-grey cp" v-if="search_map_list.brand_list.length > 3" @tap="more_event" data-value="brand_list">{{$t('common.more')}}</text>
+                        </view>
+                        <view v-if="(search_map_info.brand || null) != null && (params.brand || null) != null" class="map-content brand-info oh margin-top-lg">
+                            <image v-if="(search_map_info.brand.logo || null) != null" :src="search_map_info.brand.logo" mode="aspectFit" class="fl"></image>
+                            <view v-else class="info-logo-empty tc fl">{{search_map_info.brand.name}}</view>
+                            <view class="info-right fr">
+                                <view v-if="(search_map_info.brand.logo || null) != null" class="info-name">{{search_map_info.brand.name}}</view>
+                                <view v-if="(search_map_info.brand.describe || null) != null" class="info-desc multi-text cr-grey">{{search_map_info.brand.describe}}</view>
+                            </view>
+                        </view>
+                        <view v-else class="map-content map-images-text-item map-brand-container oh margin-top-lg" :style="'height:' + map_fields_list.brand_list.height + ';'">
+                            <block v-for="(item, index) in search_map_list.brand_list" :key="index">
+                                <view :class="'item fl cr-base radius cp single-text tc '+  (index > 0 ? 'margin-left-sm ' : '') + (item.active == 1 ? 'cr-main br-main' : '')" @tap="map_item_event" :data-index="index"
+                                    data-field="brand_list">
+                                    <image v-if="(item.logo || null) != null" :src="item.logo" mode="aspectFit"></image>
+                                    <text v-else>{{item.name}}</text>
+                                </view>
+                            </block>
+                        </view>
+                    </view>
+
+                    <!-- 分类 -->
+                    <view v-if="(search_map_list.category_list || null) != null && search_map_list.category_list.length > 0"
+                        class="map-item padding-horizontal-main padding-top-main border-radius-main bg-white spacing-mt">
+                        <view class="map-nav pr br-b">
+                            <text>{{$t('common.category')}}</text>
+                            <text class="arrow-bottom pa cr-grey cp" v-if="search_map_list.category_list.length > 3" @tap="more_event" data-value="category_list">{{$t('common.more')}}</text>
+                        </view>
+                        <view class="map-content map-text-item map-category-container oh margin-top-lg" :style="'height:' + map_fields_list.category_list.height + ';'">
+                            <block v-for="(item, index) in search_map_list.category_list" :key="index">
+                                <view :class="'item fl cr-base radius cp margin-right-sm ' + (item.active == 1 ? 'cr-main br-main' : '')" @tap="map_item_event" :data-index="index" data-field="category_list">
+                                    {{item.name}}</view>
+                            </block>
+                        </view>
+                    </view>
+
+                    <!-- 价格 -->
+                    <view v-if="(search_map_list.screening_price_list || null) != null && search_map_list.screening_price_list.length > 0"
+                        class="map-item padding-horizontal-main padding-top-main border-radius-main bg-white spacing-mt">
+                        <view class="map-nav br-b pr">
+                            <text>{{$t('goods-category.goods-category.g2u3lf')}}</text>
+                            <text class="arrow-bottom pa cr-grey cp" v-if="search_map_list.screening_price_list.length > 3" @tap="more_event" data-value="screening_price_list">{{$t('common.more')}}</text>
+                        </view>
+                        <view class="map-content map-text-item screening-price-container oh margin-top-lg" :style="'height:' + map_fields_list.screening_price_list.height + ';'">
+                            <block v-for="(item, index) in search_map_list.screening_price_list" :key="index">
+                                <view :class="'item fl cr-base radius cp margin-right-sm ' + (item.active == 1 ? 'cr-main br-main' : '')" @tap="map_item_event" :data-index="index" data-field="screening_price_list">
+                                    {{item.name}}</view>
+                            </block>
+                        </view>
+                    </view>
+
+                    <!-- 商品产地 -->
+                    <view v-if="(search_map_list.goods_place_origin_list || null) != null && search_map_list.goods_place_origin_list.length > 0"
+                        class="map-item padding-horizontal-main padding-top-main border-radius-main bg-white spacing-mt">
+                        <view class="map-nav br-b pr">
+                            <text>{{$t('goods-search.goods-search.4eerty')}}</text>
+                            <text class="arrow-bottom pa cr-grey cp" v-if="search_map_list.goods_place_origin_list.length > 3" @tap="more_event" data-value="goods_place_origin_list">{{$t('common.more')}}</text>
+                        </view>
+                        <view class="map-content map-text-item screening-price-container oh margin-top-lg" :style="'height:' + map_fields_list.goods_place_origin_list.height + ';'">
+                            <block v-for="(item, index) in search_map_list.goods_place_origin_list" :key="index">
+                                <view :class="'item fl cr-base radius cp margin-right-sm ' + (item.active == 1 ? 'cr-main br-main' : '')" @tap="map_item_event" :data-index="index" data-field="goods_place_origin_list">
+                                    {{item.name}}</view>
+                            </block>
+                        </view>
+                    </view>
+
+                    <!-- 属性 -->
+                    <view v-if="(search_map_list.goods_params_list || null) != null && search_map_list.goods_params_list.length > 0"
+                        class="map-item padding-horizontal-main padding-top-main border-radius-main bg-white spacing-mt">
+                        <view class="map-nav br-b pr">
+                            <text>{{$t('goods-search.goods-search.v6e5b7')}}</text>
+                            <text class="arrow-bottom pa cr-grey cp" v-if="search_map_list.goods_params_list.length > 3" @tap="more_event" data-value="goods_params_list">{{$t('common.more')}}</text>
+                        </view>
+                        <view class="map-content map-text-item goods-params-container oh margin-top-lg" :style="'height:' + map_fields_list.goods_params_list.height + ';'">
+                            <block v-for="(item, index) in search_map_list.goods_params_list" :key="index">
+                                <view :class="'item fl cr-base radius cp margin-right-sm ' + (item.active == 1 ? 'cr-main br-main' : '')" @tap="map_item_event" :data-index="index" data-field="goods_params_list">
+                                    {{item.value}}</view>
+                            </block>
+                        </view>
+                    </view>
+
+                    <!-- 规格 -->
+                    <view v-if="(search_map_list.goods_spec_list || null) != null && search_map_list.goods_spec_list.length > 0"
+                        class="map-item padding-horizontal-main padding-top-main border-radius-main bg-white spacing-mt">
+                        <view class="map-nav br-b pr">
+                            <text>{{$t('goods-detail.goods-detail.u401fi')}}</text>
+                            <text class="arrow-bottom pa cr-grey cp" v-if="search_map_list.goods_spec_list.length > 3" @tap="more_event" data-value="goods_spec_list">{{$t('common.more')}}</text>
+                        </view>
+                        <view class="map-content map-text-item goods-spec-container oh margin-top-lg" :style="'height:' + map_fields_list.goods_spec_list.height + ';'">
+                            <block v-for="(item, index) in search_map_list.goods_spec_list" :key="index">
+                                <view :class="'item fl cr-base radius cp margin-right-sm ' + (item.active == 1 ? 'cr-main br-main' : '')" @tap="map_item_event" :data-index="index" data-field="goods_spec_list">
+                                    {{item.value}}</view>
+                            </block>
+                        </view>
+                    </view>
+
+                    <view class="search-submit padding-main pa">
+                        <button form-type="submit" class="bg-main cr-white text-size wh-auto round" :disabled="popup_form_loading_status" hover-class="none">{{$t('common.confirm')}}</button>
+                    </view>
+                </view>
+            </form>
+        </component-popup>
+
+        <!-- 快捷导航 -->
+        <component-quick-nav></component-quick-nav>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentQuickNav from "@/components/quick-nav/quick-nav";
+    import componentPopup from "@/components/popup/popup";
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+    import componentGoodsList from "@/components/goods-list/goods-list";
+    import componentSearch from "@/components/search/search";
+    import componentBadge from "@/components/badge/badge";
+
+    var common_static_url = app.globalData.get_static_url('common');
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                params: null,
+                post_data: {},
+                is_show_popup_form: false,
+                popup_form_loading_status: false,
+                top_search_right_type_status: false,
+                load_status: 0,
+                // 增加随机数，避免无法监听数据列表内部数据更新
+                random_value: 0,
+                // 购物车
+                top_right_cart_total: 0,
+                // 自定义分享信息
+                share_info: {},
+                // 排序导航
+                search_nav_sort_index: 0,
+                search_nav_sort_list: [{
+                        name: this.$t('goods-category.goods-category.x69aow'),
+                        field: 'default',
+                        sort: 'asc',
+                        icon: null
+                    },
+                    {
+                        name: this.$t('goods-category.goods-category.at5p35'),
+                        field: 'sales_count',
+                        sort: 'asc',
+                        icon: 'default'
+                    },
+                    {
+                        name: this.$t('goods-category.goods-category.283ot0'),
+                        field: 'access_count',
+                        sort: 'asc',
+                        icon: 'default'
+                    },
+                    {
+                        name: this.$t('goods-category.goods-category.g2u3lf'),
+                        field: 'min_price',
+                        sort: 'asc',
+                        icon: 'default'
+                    },
+                    {
+                        name: this.$t('goods-category.goods-category.5p4ksj'),
+                        field: 'id',
+                        sort: 'asc',
+                        icon: 'default'
+                    }
+                ],
+                // 数据展示样式（0九方格、1图文）
+                data_show_type_value: 0,
+                // 基础配置
+                currency_symbol: app.globalData.currency_symbol(),
+                // 搜素条件
+                search_map_list: {
+                    brand_list: [],
+                    category_list: [],
+                    screening_price_list: [],
+                    goods_place_origin_list: [],
+                    goods_params_list: [],
+                    goods_spec_list: []
+                },
+                search_map_info: [],
+                map_fields_list: {
+                    brand_list: {
+                        height: "96rpx",
+                        default: "96rpx",
+                        form_key: "brand_ids"
+                    },
+                    category_list: {
+                        height: "82rpx",
+                        default: "82rpx",
+                        form_key: "category_ids"
+                    },
+                    screening_price_list: {
+                        height: "82rpx",
+                        default: "82rpx",
+                        form_key: "screening_price_values"
+                    },
+                    goods_place_origin_list: {
+                        height: "82rpx",
+                        default: "82rpx",
+                        form_key: "place_origin_ids"
+                    },
+                    goods_params_list: {
+                        height: "82rpx",
+                        default: "82rpx",
+                        form_key: "goods_params_values"
+                    },
+                    goods_spec_list: {
+                        height: "82rpx",
+                        default: "82rpx",
+                        form_key: "goods_spec_values"
+                    }
+                },
+                // 标签插件
+                plugins_label_data: null
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentQuickNav,
+            componentPopup,
+            componentNoData,
+            componentBottomLine,
+            componentGoodsList,
+            componentSearch,
+            componentBadge
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 参数处理
+            params = app.globalData.launch_params_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+                post_data: {
+                    wd: params.keywords || ''
+                }
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 初始化配置
+            this.init_config();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    this.setData({
+                        currency_symbol: app.globalData.get_config('currency_symbol'),
+                        data_show_type_value: parseInt(app.globalData.get_config('config.home_search_goods_show_type', 0))
+                    });
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 获取数据
+            init() {
+                // 获取数据
+                this.get_data();
+            },
+
+            // 初始化数据
+            get_data() {
+                var post_data = this.request_map_handle();
+                uni.request({
+                    url: app.globalData.get_request_url("index", "search"),
+                    method: 'POST',
+                    data: post_data,
+                    dataType: 'json',
+                    success: res => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var temp_load_status = this.load_status;
+                            var data = res.data.data;
+                            this.setData({
+                                search_map_info: data.search_map_info || [],
+                                search_map_list: {
+                                    brand_list: data.brand_list || [],
+                                    category_list: data.category_list || [],
+                                    screening_price_list: data.screening_price_list || [],
+                                    goods_place_origin_list: data.goods_place_origin_list || [],
+                                    goods_params_list: data.goods_params_list || [],
+                                    goods_spec_list: data.goods_spec_list || []
+                                },
+                                load_status: 1,
+                                top_right_cart_total: data.cart_total.buy_number || 0,
+                                plugins_label_data: (data.plugins_label_data || null) == null || (data.plugins_label_data.base || null) == null || (data.plugins_label_data.data ||
+                                    null) == null || data.plugins_label_data.data.length <= 0 ? null : data.plugins_label_data
+                            });
+
+                            // 获取数据列表
+                            if (temp_load_status == 0) {
+                                this.get_data_list(1);
+                            } else {
+                                // 如果购物车为0则处理列表，避免存在购物车数量
+                                if (this.top_right_cart_total == 0 && this.data_list.length > 0) {
+                                    var temp_data_list = this.data_list;
+                                    for (var i in temp_data_list) {
+                                        temp_data_list[i]['user_cart_count'] = '';
+                                    }
+                                    this.setData({
+                                        data_list: temp_data_list,
+                                        random_value: Math.random()
+                                    });
+                                }
+                            }
+
+                            // 导航购物车处理
+                            this.set_tab_bar_badge_handle();
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg
+                            });
+                            app.globalData.is_login_check(res.data, this, 'get_data');
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    }
+                });
+            },
+
+            // 获取数据列表
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 基础自定义分享
+                this.share_info_handle();
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1
+                });
+
+                // 获取数据
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+                var post_data = this.request_map_handle();
+                uni.request({
+                    url: app.globalData.get_request_url("datalist", "search"),
+                    method: 'POST',
+                    data: post_data,
+                    dataType: 'json',
+                    success: res => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            if (data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    random_value: Math.random(),
+                                    data_total: data.total,
+                                    data_page_total: data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_list_loding_msg: '',
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total)
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list_loding_msg: res.data.msg,
+                                    data_total: 0,
+                                    data_is_loading: 0
+                                });
+                                if (this.data_page <= 1) {
+                                    this.setData({
+                                        data_list: [],
+                                        data_bottom_line_status: false
+                                    });
+                                }
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                                data_is_loading: 0
+                            });
+                            app.globalData.is_login_check(res.data, this, 'get_data_list', is_mandatory);
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                            data_is_loading: 0
+                        });
+                    }
+                });
+            },
+
+            // 搜索条件处理
+            request_map_handle() {
+                var params = this.params;
+                var post_data = this.post_data;
+                post_data['page'] = this.data_page;
+
+                // 指定分类、品牌
+                post_data['category_id'] = params['category_id'] || 0;
+                post_data['brand'] = params['brand'] || 0;
+
+                // 搜索条件
+                var temp_field = this.map_fields_list;
+                var temp_list = this.search_map_list;
+                for (var i in temp_field) {
+                    if (temp_list[i] != null != null && temp_list[i].length > 0) {
+                        var temp = {};
+                        var index = 0;
+                        for (var k in temp_list[i]) {
+                            if ((temp_list[i][k]['active'] || 0) == 1) {
+                                switch (i) {
+                                    // 价格
+                                    case 'screening_price_list':
+                                        temp[index] = temp_list[i][k]['min_price'] + '-' + temp_list[i][k]['max_price'];
+                                        break;
+                                        // 属性、规格
+                                    case 'goods_params_list':
+                                    case 'goods_spec_list':
+                                        temp[index] = temp_list[i][k]['value'];
+                                        break;
+                                        // 默认取值id
+                                    default:
+                                        temp[index] = temp_list[i][k]['id'];
+                                }
+                                index++;
+                            }
+                        }
+                        post_data[temp_field[i]['form_key']] = app.globalData.get_length(temp) > 0 ? JSON.stringify(temp) : '';
+                    }
+                }
+
+                // 排序
+                var temp_index = this.search_nav_sort_index;
+                var temp_search_nav_sort = this.search_nav_sort_list;
+                post_data['order_by_type'] = temp_search_nav_sort[temp_index]['sort'] == 'desc' ? 'asc' : 'desc';
+                post_data['order_by_field'] = temp_search_nav_sort[temp_index]['field'];
+
+                return post_data;
+            },
+
+            // 分享设置处理
+            share_info_handle() {
+                var category_id = this.params.category_id || 0;
+                var brand = this.params.brand || 0;
+                var keywords = this.post_data.wd || '';
+                this.setData({
+                    share_info: {
+                        path: '/pages/goods-search/goods-search',
+                        query: 'category_id=' + category_id + '&brand=' + brand + '&keywords=' + keywords
+                    }
+                });
+
+                // 分享菜单处理
+                app.globalData.page_share_handle(this.share_info);
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 搜索条件
+            form_submit_event(e) {
+                this.setData({
+                    post_data: e.detail.value,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+                this.popup_form_event_close();
+            },
+
+            // 筛选条件关闭
+            popup_form_event_close(e) {
+                this.setData({
+                    is_show_popup_form: false
+                });
+            },
+
+            // 筛选条件开启
+            popup_form_event_show(e) {
+                this.setData({
+                    is_show_popup_form: true
+                });
+            },
+
+            // 排序事件
+            nav_sort_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var temp_search_nav_sort = this.search_nav_sort_list;
+                var temp_sort = temp_search_nav_sort[index]['sort'] == 'desc' ? 'asc' : 'desc';
+                for (var i in temp_search_nav_sort) {
+                    if (i != index) {
+                        if (temp_search_nav_sort[i]['icon'] != null) {
+                            temp_search_nav_sort[i]['icon'] = 'default';
+                        }
+                        temp_search_nav_sort[i]['sort'] = 'desc';
+                    }
+                }
+                temp_search_nav_sort[index]['sort'] = temp_sort;
+                if (temp_search_nav_sort[index]['icon'] != null) {
+                    temp_search_nav_sort[index]['icon'] = temp_sort;
+                }
+
+                this.setData({
+                    search_nav_sort_index: index,
+                    search_nav_sort_list: temp_search_nav_sort,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 条件-更多数据展示事件
+            more_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                var temp_more = this.map_fields_list;
+                if (value != null && (temp_more[value] || null) != null) {
+                    temp_more[value]['height'] = temp_more[value]['height'] == 'auto' ? temp_more[value]['default'] : 'auto';
+                    this.setData({
+                        map_fields_list: temp_more
+                    });
+                }
+            },
+
+            // 条件-选择事件
+            map_item_event(e) {
+                var index = e.currentTarget.dataset.index;
+                var field = e.currentTarget.dataset.field;
+                var temp_list = this.search_map_list;
+                if ((temp_list[field] || null) != null && (temp_list[field][index] || null) != null) {
+                    temp_list[field][index]['active'] = (temp_list[field][index]['active'] || 0) == 0 ? 1 : 0;
+                    this.setData({
+                        search_map_list: temp_list
+                    });
+                }
+            },
+
+            // 条件-清空
+            map_remove_event(e) {
+                var temp_list = this.search_map_list;
+                var temp_post = this.post_data;
+
+                // 关键字
+                temp_post['wd'] = '';
+
+                // 品牌、分类、价格、属性、规格
+                for (var i in temp_list) {
+                    if ((temp_list[i] || null) != null && temp_list[i].length > 0) {
+                        for (var k in temp_list[i]) {
+                            temp_list[i][k]['active'] = 0;
+                        }
+                    }
+                }
+
+                // 排序导航
+                var temp_search_nav_sort = this.search_nav_sort_list;
+                for (var i in temp_search_nav_sort) {
+                    temp_search_nav_sort[i]['sort'] = 'asc';
+                    temp_search_nav_sort[i]['icon'] = (temp_search_nav_sort[i]['field'] == 'default') ? null : 'default';
+                }
+
+                // 关闭弹窗、分页恢复1页、重新获取数据
+                this.setData({
+                    search_map_list: temp_list,
+                    post_data: temp_post,
+                    is_show_popup_form: false,
+                    search_nav_sort_list: temp_search_nav_sort,
+                    search_nav_sort_index: 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 数据展示类型
+            data_show_type_event(e) {
+                this.setData({
+                    data_show_type_value: this.data_show_type_value == 0 ? 1 : 0
+                });
+            },
+
+            // 购物车导航角标
+            set_tab_bar_badge_handle() {
+                app.globalData.set_tab_bar_badge('cart', this.top_right_cart_total);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 搜索输入事件
+            search_input_value_event(value) {
+                var temp_post = this.post_data;
+                temp_post['wd'] = value;
+                this.setData({
+                    post_data: temp_post
+                });
+            },
+
+            // 搜索输入框输入失去焦点事件
+            search_input_blur_event(value) {
+                if (value == '') {
+                    this.setData({
+                        top_search_right_type_status: false
+                    });
+                }
+            },
+
+            // 搜索输入框输入获取焦点事件
+            search_input_focus_event() {
+                this.setData({
+                    top_search_right_type_status: true
+                });
+            },
+
+            // 搜索输入确认事件
+            search_input_confirm_event(value) {
+                var temp_post = this.post_data;
+                temp_post['wd'] = value;
+                this.setData({
+                    top_search_right_type_status: false,
+                    post_data: temp_post,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 搜索确认事件
+            search_submit_confirm_event() {
+                this.setData({
+                    top_search_right_type_status: false,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 购物车总数处理
+            goods_cart_count_handle(cart_number) {
+                this.setData({
+                    top_right_cart_total: cart_number
+                });
+                // 导航购物车处理
+                this.set_tab_bar_badge_handle();
+            }
+        }
+    };
+</script>
+<style>
+    @import './goods-search.css';
+</style>
\ No newline at end of file
diff --git a/pages/index/index.css b/pages/index/index.css
new file mode 100644
index 0000000..8416dd0
--- /dev/null
+++ b/pages/index/index.css
@@ -0,0 +1,168 @@
+/**
+ * 顶部内容
+ */
+.home-top-nav-content {
+    background-repeat: no-repeat;
+    background-size: 100% auto;
+    padding-top: calc(var(--status-bar-height) + 5px);
+}
+.home-top-nav {
+    min-height: 56rpx;
+    /* #ifdef MP-ALIPAY */
+    padding-left: 60rpx;
+    /* #endif */
+}
+.home-top-nav-location {
+    max-width: calc(100% - 200rpx);
+}
+.home-top-nav-logo {
+    text-align: left;
+    height: 56rpx;
+}
+.home-top-nav-logo-image {
+    width: 56rpx;
+    height: 100% !important;
+}
+.home-top-nav-logo-title {
+    font-weight: bold;
+    font-size: 42rpx;
+    /* #ifdef H5 || MP-TOUTIAO || APP */
+    font-size: 24px;
+    /* #endif */
+}
+
+/**
+ * 右侧图标导航
+ */
+/* #ifdef H5 || APP */
+.nav-top-right-icon {
+    line-height: 56rpx;
+}
+.nav-top-right-icon .item:not(:last-child) {
+    margin-right: 40rpx;
+}
+.nav-top-right-icon .badge-icon {
+    top: -10px;
+    right: 2px;
+}
+/* #endif */
+
+/**
+ * 搜索
+ */
+.search-fixed-seat {
+    padding-top: 78rpx;
+}
+.search-fixed-seat.nav-enable-search {
+    padding-top: 146rpx;
+}
+.search-content-fixed {
+    position: fixed !important;
+    top: 0;
+    z-index: 11;
+    width: 100%;
+}
+.search-content-fixed-content {
+    background-repeat: no-repeat;
+    background-size: 100% auto;
+    background-position: top;
+    padding-bottom: 6rpx;
+    /* #ifdef H5 */
+    padding-top: 15rpx !important;
+    /* #endif */
+}
+.search-content-fixed-content.nav-enable-search {
+    padding-bottom: 24rpx;
+}
+
+/* #ifdef H5 || MP-TOUTIAO */
+.search-content-fixed .nav-top-right-icon {
+    top: 8px !important;
+}
+/* #endif */
+
+/**
+ * 推荐文章
+ */
+.article-list .new-icon {
+    width: 130rpx !important;
+    height: 42rpx !important;
+}
+.article-list .right-content {
+    width: calc(100% - 150rpx);
+}
+.article-list .right-content swiper {
+    height: 40rpx;
+}
+.notice {
+    margin: 20rpx 0 14rpx 0;
+}
+
+/*
+ * 限时秒杀 - 插件
+ */
+
+.plugins-seckill-data {
+    background-size: 100% auto;
+    background-repeat: no-repeat;
+    background-position: top;
+    background-color: #fff;
+
+}
+.plugins-seckill-data .icon {
+    max-width: 140rpx;
+    max-height: 34rpx;
+}
+.plugins-seckill-data .goods-list .swiper {
+    height: 310rpx !important;
+}
+.plugins-seckill-data .goods-list .item .goods-img {
+    width: 100%;
+    height: 210rpx;
+}
+.plugins-seckill-data .goods-list .goods-base .icon {
+    right: 20rpx;
+    bottom: 13rpx;
+}
+
+/**
+ * 购买记录 - 插件
+ */
+.plugins-salerecords swiper {
+    height: 506rpx;
+}
+.plugins-salerecords image {
+    width: 40rpx !important;
+    height: 40rpx !important;
+    border-radius: 50%;
+}
+.plugins-salerecords .item-content {
+    width: 24%;
+}
+.plugins-salerecords .item-content:nth-child(1) {
+    width: 36%;
+}
+.plugins-salerecords .item-content:nth-child(2) {
+    width: 40%;
+}
+
+/**
+ * 标签 - 秒杀单独修改样式
+ */
+.plugins-seckill-data .plugins-label-bottom-left,
+.plugins-seckill-data .plugins-label-bottom-center,
+.plugins-seckill-data .plugins-label-bottom-right {
+    bottom: calc(100% - 240rpx);
+}
+
+/**
+ * 首页中间广告- 插件
+ */
+.plugins-homemiddleadv {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 20rpx;
+}
+.plugins-homemiddleadv .item {
+    flex: 1 1 calc(50% - 20rpx);
+}
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
new file mode 100644
index 0000000..dff2f97
--- /dev/null
+++ b/pages/index/index.vue
@@ -0,0 +1,665 @@
+<template>
+    <view :class="theme_view">
+        <view :class="(plugins_mourning_data_is_app ? ' grayscale' : '') + (is_single_page == 1 ? ' single-page-top' : '')">
+            <!-- diy模式 -->
+            <block v-if="data_mode == 3">
+                <block v-if="(data_list || null) != null && (data_list.config || null) != null">
+                    <componentDiy :propValue="data_list.config" :propDataId="data_list.id" :propKey="random_value" @onLocationBack="user_back_choice_location">
+                        <!-- 底部内容 -->
+                        <template slot="diy-bottom-content">
+                            <!-- 结尾 -->
+                            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+                            <!-- 版权信息 -->
+                            <component-copyright></component-copyright>
+                        </template>
+                        <!-- 底部公共 -->
+                        <template slot="diy-bottom-common">
+                            <component-common ref="common" :propIsGrayscale="plugins_mourning_data_is_app"></component-common>
+                        </template>
+                    </componentDiy>
+                </block>
+                <block v-else>
+                    <component-no-data propStatus="0" propPage="home"></component-no-data>
+                </block>
+            </block>
+            <!-- 自动和手动模式 -->
+            <block v-else>
+                <!-- 顶部内容、如果没有轮播和导航则使用矮的浮动导航背景样式，则使用高的背景样式 -->
+                <view v-if="load_status == 1" class="home-top-nav-content pr" :style="(banner_list.length > 0 || navigation.length > 0 ? top_content_bg_color : top_content_search_bg_color) + top_content_style">
+                    <!-- 顶部背景图片 -->
+                    <view class="pa top-0 left-0 right-0">
+                        <image class="bg-img wh-auto" mode="widthFix" :src="static_url + 'nav-top.png'"></image>
+                    </view>
+
+                    <!-- 搜索 -->
+                    <view v-if="common_app_is_header_nav_fixed == 1" :class="'search-fixed-seat ' + (common_app_is_enable_search == 1 ? 'nav-enable-search' : '')"></view>
+                    <view :class="'pr ' + (common_app_is_header_nav_fixed == 1 ? 'search-content-fixed' : '')" :style="common_app_is_header_nav_fixed == 1 ? top_content_search_bg_color : ''">
+                        <view :class="'search-content-fixed-content ' + (common_app_is_enable_search == 1 ? 'nav-enable-search' : '')" :style="(common_app_is_header_nav_fixed == 1 ? top_content_style : '') + (common_app_is_header_nav_fixed == 1 ? top_content_search_content_style : '')">
+                            <view class="home-top-nav margin-bottom-sm pr padding-right-main">
+                                <!-- 定位 -->
+                                <view v-if="is_home_location_choice == 1" class="home-top-nav-location dis-inline-block va-m single-text cr-white pr bs-bb padding-left-main padding-right-lg">
+                                    <component-choice-location @onBack="user_back_choice_location"></component-choice-location>
+                                </view>
+                                <block v-else>
+                                    <!-- logo/标题 -->
+                                    <view class="home-top-nav-logo dis-inline-block va-m padding-left-main">
+                                        <block v-if="is_home_logo_use_text == 0 && (application_logo || null) != null">
+                                            <image :src="application_logo" mode="heightFix" class="home-top-nav-logo-image"></image>
+                                        </block>
+                                        <block v-else>
+                                            <view v-if="(application_title || null) != null" class="home-top-nav-logo-title cr-white single-text">{{ application_title }}</view>
+                                        </block>
+                                    </view>
+                                </block>
+                                <!-- #ifdef H5 || APP -->
+                                <!-- 右上角icon列表 -->
+                                <view v-if="(right_icon_list || null) != null && right_icon_list.length > 0" class="nav-top-right-icon fr">
+                                    <block v-for="(item, index) in right_icon_list">
+                                        <view class="item dis-inline-block cp pr" :data-value="item.url || ''" @tap="url_event">
+                                            <iconfont :name="item.icon" size="38rpx" color="#fff"></iconfont>
+                                            <view v-if="(item.badge || null) != null" class="badge-icon pa">
+                                                <component-badge :propNumber="item.badge"></component-badge>
+                                            </view>
+                                        </view>
+                                    </block>
+                                </view>
+                                <!-- #endif -->
+                            </view>
+                            <view v-if="common_app_is_enable_search == 1" class="search-content-input padding-horizontal-main">
+                                <!-- 是否开启搜索框前面icon扫一扫 -->
+                                <block v-if="is_home_search_scan == 1">
+                                    <component-search :propIsBtn="true" propSize="sm" :propPlaceholder="$t('customview.customview.726k7y')" propPlaceholderClass="cr-grey-c" propIconColor="#999" propBgColor="#fff"
+                                        <!-- #ifndef H5 -->
+                                        @onicon="search_icon_event" propIcon="icon-scan" :propIsIconOnEvent="true"
+                                        <!-- #endif -->
+                                    ></component-search>
+                                </block>
+                                <block v-else>
+                                    <component-search :propIsBtn="true" propSize="sm" :propPlaceholder="$t('customview.customview.726k7y')" propPlaceholderClass="cr-grey-c" propIconColor="#999" propBgColor="#fff"></component-search>
+                                </block>
+                            </view>
+                        </view>
+                    </view>
+
+                    <!-- 轮播 -->
+                    <view class="banner-content padding-horizontal-main margin-top-xs" v-if="banner_list.length > 0">
+                        <component-banner :propData="banner_list" @changeBanner="change_banner"></component-banner>
+                    </view>
+                    <!-- 导航 -->
+                    <view v-if="navigation.length > 0" class="spacing-mt" :class="load_status == 1 && (common_shop_notice || null) != null ? '' : ' spacing-mb'">
+                        <view class="padding-horizontal-main">
+                            <view class="bg-white border-radius-main">
+                                <component-icon-nav :propData="{ ...{ data: navigation }, ...{ random: random_value } }"></component-icon-nav>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 内容 -->
+                <view class="content padding-horizontal-main pr">
+                    <!-- 商城公告 -->
+                    <view v-if="load_status == 1 && (common_shop_notice || null) != null" class="notice">
+                        <uni-notice-bar show-icon scrollable :text="common_shop_notice" background-color="transparent" color="#666" />
+                    </view>
+                    <!-- 推荐文章 -->
+                    <view v-if="article_list.length > 0" class="article-list padding-main border-radius-main oh bg-white spacing-mb">
+                        <view mode="aspectFit" class="new-icon va-m fl cp pr divider-r" data-value="/pages/article-category/article-category" @tap="url_event">
+                            <text>{{ $t('index.index.t8bll8') }}</text
+                            ><text class="cr-red">{{ $t('index.index.t8bll9') }}</text>
+                        </view>
+                        <view class="right-content fr va-m">
+                            <swiper :vertical="true" :autoplay="true" :circular="true" display-multiple-items="1" interval="3000">
+                                <block v-for="(item, index) in article_list" :key="index">
+                                    <swiper-item class="single-text">
+                                        <text class="cr-base text-size-sm cp" :data-value="item.category_url" @tap="url_event">[{{ item.article_category_name }}]</text>
+                                        <text class="cr-base text-size-sm margin-left-xs cp" :style="(item.title_color || null) != null ? 'color:' + item.title_color + ' !important;' : ''" :data-value="item.url" @tap="url_event">{{ item.title }}</text>
+                                    </swiper-item>
+                                </block>
+                            </swiper>
+                        </view>
+                    </view>
+
+                    <!-- 按照插件顺序渲染插件数据 -->
+                    <block v-if="plugins_sort_list.length > 0">
+                        <block v-for="(pv, pi) in plugins_sort_list" :key="pi">
+                            <!-- 首页中间广告 - 插件 -->
+                            <view v-if="pv.plugins == 'homemiddleadv' && (plugins_homemiddleadv_data || null) != null && plugins_homemiddleadv_data.length > 0" class="plugins-homemiddleadv oh spacing-mb">
+                                <view v-for="(item, index) in plugins_homemiddleadv_data" :key="index" class="item border-radius-main oh cp" :data-value="item.url || ''" @tap="url_event">
+                                    <image class="dis-block wh-auto border-radius-main" :src="item.images" mode="widthFix"> </image>
+                                </view>
+                            </view>
+
+                            <!-- 限时秒杀 - 插件 -->
+                            <view v-if="pv.plugins == 'seckill' && (plugins_seckill_data || null) != null && (plugins_seckill_data.data || null) != null && (plugins_seckill_data.data.goods || null) != null && plugins_seckill_data.data.goods.length > 0" class="plugins-seckill-data border-radius-main spacing-mb bg-white" :style="'background-image: url(' + seckill_static_url + 'seckill-bg.png);'">
+                                <view class="flex-row jc-sb align-c padding-top-main padding-horizontal-main">
+                                    <view class="flex-1">
+                                        <image class="dis-inline-block va-m icon" :src="plugins_seckill_data.data.home_title_icon" mode="widthFix"></image>
+                                        <view class="dis-inline-block va-m margin-left-sm">
+                                            <component-countdown :propHour="plugins_seckill_data.data.time.hours" :propMinute="plugins_seckill_data.data.time.minutes" :propSecond="plugins_seckill_data.data.time.seconds"></component-countdown>
+                                        </view>
+                                    </view>
+                                    <text data-value="/pages/plugins/seckill/index/index" @tap="url_event" class="arrow-right padding-right cr-grey text-size-xs cp">{{ $t('common.more') }}</text>
+                                </view>
+                                <component-goods-list :propData="{ style_type: 2, goods_list: plugins_seckill_data.data.goods }" :propLabel="plugins_label_data" :propCurrencySymbol="currency_symbol" :propIsCartParaCurve="true" propSource="index" :propOpenCart="false"></component-goods-list>
+                            </view>
+
+                            <!-- 活动配置-楼层顶部 - 插件 -->
+                            <view v-if="pv.plugins == 'activity' && (plugins_activity_data || null) != null">
+                                <component-activity-list :propConfig="plugins_activity_data.base" :propData="plugins_activity_data.data" propLocation="0" :propLabel="plugins_label_data" :propCurrencySymbol="currency_symbol" :propIsCartParaCurve="true" propSource="index"></component-activity-list>
+                            </view>
+
+                            <!-- 门店 - 插件 -->
+                            <view v-if="pv.plugins == 'realstore' && (plugins_realstore_data || null) != null">
+                                <view v-if="(plugins_realstore_data.base.home_data_list_title || null) != null" class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                                    <text class="text-wrapper title-left-border single-text flex-1 flex-width padding-right-main">{{ plugins_realstore_data.base.home_data_list_title }}</text>
+                                    <text data-value="/pages/plugins/realstore/search/search" @tap="url_event" class="arrow-right padding-right cr-grey cp">{{ $t('common.more') }}</text>
+                                </view>
+                                <component-realstore-list :propData="{ ...{ data: plugins_realstore_data.data }, ...{ random: random_value } }"></component-realstore-list>
+                            </view>
+
+                            <!-- 多商户 - 插件 -->
+                            <view v-if="pv.plugins == 'shop' && (plugins_shop_data || null) != null">
+                                <view v-if="(plugins_shop_data.base.home_data_list_title || null) != null" class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                                    <text class="text-wrapper title-left-border single-text flex-1 flex-width padding-right-main">{{ plugins_shop_data.base.home_data_list_title }}</text>
+                                    <text data-value="/pages/plugins/shop/index/index" @tap="url_event" class="arrow-right padding-right cr-grey cp">{{ $t('common.more') }}</text>
+                                </view>
+                                <component-shop-list :propConfig="plugins_shop_data.base" :propData="{ ...{ data: plugins_shop_data.data }, ...{ random: random_value } }"></component-shop-list>
+                            </view>
+
+                            <!-- 组合搭配 - 插件 -->
+                            <view v-if="pv.plugins == 'binding' && (plugins_binding_data || null) != null">
+                                <view v-if="(plugins_binding_data.base.home_data_list_title || null) != null" class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                                    <text class="text-wrapper title-left-border single-text flex-1 flex-width padding-right-main">{{ plugins_binding_data.base.home_data_list_title }}</text>
+                                    <text data-value="/pages/plugins/binding/index/index" @tap="url_event" class="arrow-right padding-right cr-grey cp">{{ $t('common.more') }}</text>
+                                </view>
+                                <component-binding-list :propConfig="plugins_binding_data.base" :propData="{ ...{ data: plugins_binding_data.data }, ...{ random: random_value } }" :propCurrencySymbol="currency_symbol"></component-binding-list>
+                            </view>
+
+                            <!-- 博客-楼层顶部 - 插件 -->
+                            <view v-if="pv.plugins == 'blog' && (plugins_blog_data || null) != null">
+                                <component-blog-list :propConfig="plugins_blog_data.base" :propData="plugins_blog_data.data" propLocation="0"></component-blog-list>
+                            </view>
+
+                            <!-- 魔方 - 插件 -->
+                            <view v-if="pv.plugins == 'magic' && (plugins_magic_data || null) != null">
+                                <component-magic-list :propData="{ ...plugins_magic_data, ...{ random: random_value } }" :propCurrencySymbol="currency_symbol" :propLabel="plugins_label_data"></component-magic-list>
+                            </view>
+                        </block>
+                    </block>
+
+                    <!-- 楼层数据 -->
+                    <block v-if="(data_list || null) != null && data_list.length > 0">
+                        <!-- 数据模式0,1自动+手动、2拖拽 -->
+                        <block v-if="data_mode == 2">
+                            <!-- 引入拖拽数据模块 -->
+                            <component-layout :propData="data_list"></component-layout>
+                        </block>
+                        <block v-else>
+                            <!-- 自动+手动 -->
+                            <view v-for="(floor, index) in data_list" :key="index" class="floor">
+                                <view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                                    <view class="title-left">
+                                        <text class="text-wrapper title-left-border" :style="'color:' + (floor.bg_color || '#333') + ';'">{{ floor.name }}</text>
+                                        <text v-if="(floor.describe || null) != null" class="vice-name margin-left-lg cr-grey">{{ floor.describe }}</text>
+                                    </view>
+                                    <text :data-value="'/pages/goods-search/goods-search?category_id=' + floor.id" @tap="url_event" class="arrow-right padding-right cr-grey cp">{{ $t('common.more') }}</text>
+                                </view>
+                                <view class="floor-list wh-auto oh pr">
+                                    <block v-if="(floor.goods || null) != null && floor.goods.length > 0">
+                                        <component-goods-list :propData="{ style_type: 1, goods_list: floor.goods }" :propLabel="plugins_label_data" :propCurrencySymbol="currency_symbol" :propIsCartParaCurve="true" propSource="index"></component-goods-list>
+                                    </block>
+                                </view>
+                            </view>
+                        </block>
+                    </block>
+
+                    <!-- 按照插件顺序渲染插件数据 -->
+                    <block v-if="plugins_sort_list.length > 0">
+                        <block v-for="(pv, pi) in plugins_sort_list" :key="pi">
+                            <!-- 活动配置-楼层底部 - 插件 -->
+                            <view v-if="pv.plugins == 'activity' && (plugins_activity_data || null) != null">
+                                <component-activity-list :propConfig="plugins_activity_data.base" :propData="plugins_activity_data.data" propLocation="1" :propLabel="plugins_label_data" :propCurrencySymbol="currency_symbol" propSource="index" :propOpenCart="false"></component-activity-list>
+                            </view>
+
+                            <!-- 博客-楼层底部 - 插件 -->
+                            <view v-if="pv.plugins == 'blog' && (plugins_blog_data || null) != null">
+                                <component-blog-list :propConfig="plugins_blog_data.base" :propData="plugins_blog_data.data" propLocation="1"></component-blog-list>
+                            </view>
+
+                            <!--- 底部购买记录 - 插件 -->
+                            <view v-if="pv.plugins == 'salerecords' && (plugins_salerecords_data || null) != null && (plugins_salerecords_data.data || null) != null && plugins_salerecords_data.data.length > 0" class="plugins-salerecords bg-white border-radius-main padding-main spacing-mb">
+                                <view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                                    <view class="title-left">
+                                        <text class="text-wrapper">{{ plugins_salerecords_data.base.home_bottom_title || $t('index.index.s5r784') }}</text>
+                                        <text v-if="(plugins_salerecords_data.base || null) != null && (plugins_salerecords_data.base.home_bottom_desc || null) != null" class="vice-name margin-left-sm cr-grey-9">{{ plugins_salerecords_data.base.home_bottom_desc }}</text>
+                                    </view>
+                                </view>
+                                <view class="oh">
+                                    <swiper :vertical="true" :autoplay="true" :circular="true" :display-multiple-items="plugins_salerecords_data.data.length < 6 ? plugins_salerecords_data.data.length : 6" interval="3000" :style="plugins_salerecords_data.data.length < 6 ? 'height:' + plugins_salerecords_data.data.length * 84.33 + 'rpx;' : ''">
+                                        <block v-for="(item, index) in plugins_salerecords_data.data" :key="index">
+                                            <swiper-item>
+                                                <view class="item oh padding-vertical-main">
+                                                    <view class="item-content single-text fl">
+                                                        <image mode="widthFix" :src="item.user.avatar" class="va-m br"> </image>
+                                                        <text class="margin-left-sm">{{ item.user.user_name_view }}</text>
+                                                        <text v-if="(item.user.province || null) != null"><text class="padding-left-xs padding-right-xs">-</text>{{ item.user.province }}</text>
+                                                    </view>
+                                                    <view class="item-content fl">
+                                                        <view :data-value="item.goods_url" @tap="url_event" class="cp single-text">
+                                                            <image mode="widthFix" :src="item.images" class="va-m br"> </image>
+                                                            <text class="margin-left-sm single-text">{{ item.title }}</text>
+                                                        </view>
+                                                    </view>
+                                                    <view class="item-content single-text fr tr cr-grey padding-top-xs">
+                                                        {{ item.add_time }}
+                                                    </view>
+                                                </view>
+                                            </swiper-item>
+                                        </block>
+                                    </swiper>
+                                </view>
+                            </view>
+                        </block>
+                    </block>
+                </view>
+            </block>
+
+            <!-- 提示信息 -->
+            <block v-if="load_status == 0">
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg" propPage="home" :propIsHeader="true"></component-no-data>
+            </block>
+        </view>
+
+        <!-- 页面已加载、模式 -->
+        <block v-if="load_status == 1 && data_mode != 3">
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+
+            <!-- 版权信息 -->
+            <component-copyright></component-copyright>
+
+            <!-- 在线客服 -->
+            <component-online-service :propIsNav="true" :propIsBar="true" :propIsGrayscale="plugins_mourning_data_is_app"></component-online-service>
+
+            <!-- 快捷导航 -->
+            <component-quick-nav :propIsNav="true" :propIsBar="true" :propIsGrayscale="plugins_mourning_data_is_app"></component-quick-nav>
+
+            <!-- 公共 -->
+            <component-common ref="common" :propIsGrayscale="plugins_mourning_data_is_app"></component-common>
+        </block>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentSearch from '@/components/search/search';
+    import componentQuickNav from '@/components/quick-nav/quick-nav';
+    import componentIconNav from '@/components/icon-nav/icon-nav';
+    import componentBanner from '@/components/slider/slider';
+    import componentCountdown from '@/components/countdown/countdown';
+    import componentLayout from '@/components/layout/layout';
+    import componentBadge from '@/components/badge/badge';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentCopyright from '@/components/copyright/copyright';
+    import componentOnlineService from '@/components/online-service/online-service';
+    import componentActivityList from '@/components/activity-list/activity-list';
+    import componentBlogList from '@/components/blog-list/blog-list';
+    import componentRealstoreList from '@/components/realstore-list/realstore-list';
+    import componentShopList from '@/components/shop-list/shop-list';
+    import componentGoodsList from '@/components/goods-list/goods-list';
+    import componentBindingList from '@/components/binding-list/binding-list';
+    import componentMagicList from '@/components/magic-list/magic-list';
+    import componentDiy from '@/components/diy/diy';
+    import componentChoiceLocation from '@/components/choice-location/choice-location';
+
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        data() {
+            return {
+                theme_view: '',
+                theme_color: '',
+                common_static_url: '',
+                seckill_static_url: '',
+                static_url: '',
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                load_status: 0,
+                currency_symbol: app.globalData.currency_symbol(),
+                is_home_search_scan: app.globalData.data.is_home_search_scan,
+                data_list: [],
+                banner_list: [],
+                navigation: [],
+                article_list: [],
+                cart_total: 0,
+                message_total: 0,
+                right_icon_list: [],
+                // 首页数据模式
+                data_mode: 0,
+                // 增加随机数，避免无法监听数据列表内部数据更新
+                random_value: 0,
+                // 基础配置
+                common_shop_notice: null,
+                common_app_is_enable_search: 0,
+                common_app_is_header_nav_fixed: 0,
+                common_app_is_online_service: 0,
+                // 顶部导航、名称、logo、定位
+                application_title: app.globalData.data.application_title,
+                application_logo: app.globalData.data.application_logo,
+                is_home_logo_use_text: app.globalData.data.is_home_logo_use_text,
+                is_home_location_choice: app.globalData.data.is_home_location_choice,
+                // 顶部+搜索样式配置
+                top_content_bg_color: '',
+                top_content_search_bg_color: '',
+                top_content_search_content_style: '',
+                // #ifdef MP
+                top_content_style: 'padding-top:' + (bar_height + 10) + 'px;',
+                // #endif
+                // #ifdef H5 || MP-TOUTIAO
+                top_content_style: 'padding-top:' + (bar_height + 14) + 'px;',
+                // #endif
+                // #ifdef APP
+                top_content_style: 'padding-top:' + bar_height + 'px;',
+                // #endif
+                // 是否单页预览
+                is_single_page: app.globalData.is_current_single_page() || 0,
+                // 轮播滚动时，背景色替换
+                slider_bg: null,
+                // 插件顺序列表
+                plugins_sort_list: [],
+                // 限时秒杀插件
+                plugins_seckill_data: null,
+                // 购买记录插件
+                plugins_salerecords_data: null,
+                // 活动配置插件
+                plugins_activity_data: null,
+                // 标签插件
+                plugins_label_data: null,
+                // 首页中间广告插件
+                plugins_homemiddleadv_data: null,
+                // 哀悼灰度插件
+                plugins_mourning_data_is_app: app.globalData.is_app_mourning(),
+                // 标签插件
+                plugins_blog_data: null,
+                // 门店插件
+                plugins_realstore_data: null,
+                // 多商户插件
+                plugins_shop_data: null,
+                // 组合搭配插件
+                plugins_binding_data: null,
+                // 魔方插件
+                plugins_magic_data: null,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentSearch,
+            componentQuickNav,
+            componentIconNav,
+            componentBanner,
+            componentCountdown,
+            componentLayout,
+            componentBadge,
+            componentNoData,
+            componentBottomLine,
+            componentCopyright,
+            componentOnlineService,
+            componentActivityList,
+            componentBlogList,
+            componentRealstoreList,
+            componentShopList,
+            componentGoodsList,
+            componentBindingList,
+            componentMagicList,
+            componentDiy,
+            componentChoiceLocation,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 初始化配置
+            this.init_config();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show({object: this, method: 'init'});
+            }
+
+            // 设置顶部导航的默认颜色
+            this.set_navigation_bar_color();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            if (this.data_list_loding_status === 1) {
+                uni.stopPullDownRefresh();
+            } else {
+                this.init();
+            }
+        },
+
+        methods: {
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    this.setData({
+                        currency_symbol: app.globalData.get_config('currency_symbol'),
+                        common_shop_notice: app.globalData.get_config('config.common_shop_notice'),
+                        common_app_is_enable_search: app.globalData.get_config('config.common_app_is_enable_search'),
+                        common_app_is_header_nav_fixed: app.globalData.get_config('config.common_app_is_header_nav_fixed'),
+                        common_app_is_online_service: app.globalData.get_config('config.common_app_is_online_service'),
+                        application_title: app.globalData.get_application_title(),
+                        application_logo: app.globalData.get_application_logo(),
+                    });
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 获取数据
+            init(params = {}) {
+                // 还没有数据则读取缓存
+                var cache_key = app.globalData.data.cache_index_data_key;
+                if (this.load_status == 0) {
+                    // 本地缓存数据
+                    var upd_data = uni.getStorageSync(cache_key) || null;
+                    if (upd_data != null) {
+                        // 先使用缓存数据展示
+                        this.setData(upd_data);
+
+                        // 初始化返回公共处理
+                        this.init_result_common_handle();
+
+                        // 已有本地缓存则直接取远程有效数据（默认首次取的是远程缓存数据）
+                        params['is_cache'] = 0;
+
+                        // 设置顶部导航的默认颜色
+                        this.set_navigation_bar_color();
+                    }
+                } else {
+                    // 已有本地缓存则直接取远程有效数据（默认首次取的是远程缓存数据）
+                    params['is_cache'] = 0;
+                }
+
+                // 网络检查
+                if ((params || null) == null || (params.loading || 0) == 0) {
+                    app.globalData.network_type_handle(this, 'init', params);
+                    return false;
+                }
+
+                // 没有缓存数据则开启加载层
+                if (upd_data == null) {
+                    this.setData({
+                        data_list_loding_status: 1,
+                    });
+                }
+                // 请求远程数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'index'),
+                    method: 'POST',
+                    data: params,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        // 数据处理
+                        var data = res.data.data;
+                        if (res.data.code == 0) {
+                            var data_list = data.data_list || null;
+                            var upd_data = {
+                                random_value: Math.random(),
+                                data_bottom_line_status: true,
+                                banner_list: data.banner_list || [],
+                                navigation: data.navigation || [],
+                                article_list: data.article_list || [],
+                                data_mode: data.data_mode || 0,
+                                data_list: data_list,
+                                cart_total: data.cart_total.buy_number || 0,
+                                message_total: parseInt(data.message_total || 0),
+                                right_icon_list: data.right_icon_list || [],
+                                data_list_loding_status: data_list == null || data_list.length == 0 ? 0 : 3,
+                                plugins_sort_list: data.plugins_sort_list || [],
+                                plugins_seckill_data: data.plugins_seckill_data || null,
+                                plugins_salerecords_data: (data.plugins_salerecords_data || null) == null || data.plugins_salerecords_data.length <= 0 ? null : data.plugins_salerecords_data,
+                                plugins_activity_data: (data.plugins_activity_data || null) == null || data.plugins_activity_data.length <= 0 ? null : data.plugins_activity_data,
+                                plugins_label_data: (data.plugins_label_data || null) == null || (data.plugins_label_data.base || null) == null || (data.plugins_label_data.data || null) == null || data.plugins_label_data.data.length <= 0 ? null : data.plugins_label_data,
+                                plugins_homemiddleadv_data: (data.plugins_homemiddleadv_data || null) == null || data.plugins_homemiddleadv_data.length <= 0 ? null : data.plugins_homemiddleadv_data,
+                                plugins_mourning_data_is_app: parseInt(data.plugins_mourning_data || 0) == 1,
+                                plugins_blog_data: data.plugins_blog_data || null,
+                                plugins_realstore_data: data.plugins_realstore_data || null,
+                                plugins_shop_data: data.plugins_shop_data || null,
+                                plugins_binding_data: data.plugins_binding_data || null,
+                                plugins_magic_data: data.plugins_magic_data || null,
+                            };
+                            // 如果开启了哀悼灰色则不固定导航
+                            if (upd_data.plugins_mourning_data_is_app == 1) {
+                                upd_data['common_app_is_header_nav_fixed'] = 0;
+                            }
+                            this.setData(upd_data);
+
+                            // 存储缓存
+                            uni.setStorageSync(cache_key, upd_data);
+
+                            // 设置顶部导航的默认颜色
+                            this.set_navigation_bar_color();
+
+                            // 是否需要重新加载数据
+                            if (parseInt(data.is_result_data_cache || 0) == 1) {
+                                this.init({ is_cache: 0 });
+                            } else {
+                                // 购物车导航角标
+                                app.globalData.set_tab_bar_badge('cart', this.cart_total);
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                                data_bottom_line_status: true,
+                            });
+                        }
+
+                        // 初始化返回公共处理
+                        this.init_result_common_handle();
+                    },
+                    fail: () => {
+                        // 轮播数据处理
+                        if (this.load_status == 0 || (this.top_content_search_bg_color || null) == null) {
+                            this.change_banner(app.globalData.get_theme_color());
+                        }
+
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                            data_bottom_line_status: true,
+                            load_status: 1,
+                        });
+                    },
+                });
+            },
+
+            // 设置顶部导航的默认颜色
+            set_navigation_bar_color() {
+                if(this.data_mode == 3) {
+                    app.globalData.set_navigation_bar_color(parseInt(app.globalData.get_key_data(this.data_list, 'config.header.com_data.style.function_buttons_type', 0)) == 1);
+                }
+            },
+
+            // 初始化返回公共处理
+            init_result_common_handle() {
+                var theme_view = app.globalData.get_theme_value_view();
+                var theme_color = app.globalData.get_theme_color();
+                var common_static_url = app.globalData.get_static_url('common');
+                var seckill_static_url = app.globalData.get_static_url('seckill', true) + 'app/';
+                var static_url = app.globalData.get_static_url('home');
+
+                // 轮播数据处理
+                if (this.load_status == 0 || (this.top_content_search_bg_color || null) == null) {
+                    var color = this.banner_list && this.banner_list.length > 0 && (this.banner_list[0]['bg_color'] || null) != null ? this.banner_list[0]['bg_color'] : theme_color;
+                    this.change_banner(color);
+                }
+
+                // 公共数据
+                this.setData({
+                    top_content_search_content_style: 'background-image: url("' + static_url + 'nav-top.png");',
+                    theme_view: theme_view,
+                    theme_color: theme_color,
+                    common_static_url: common_static_url,
+                    seckill_static_url: seckill_static_url,
+                    static_url: static_url,
+                    load_status: 1,
+                });
+
+                // 分享菜单处理、延时执行，确保基础数据已加载完成
+                setTimeout(function () {
+                    app.globalData.page_share_handle();
+                }, 3000);
+            },
+
+            // 选择用户地理位置回调
+            user_back_choice_location(e) {
+                // 重新刷新数据
+                this.init();
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 轮播改变、背景色处理
+            change_banner(color) {
+                if ((color || null) == null) {
+                    color = this.theme_color;
+                }
+                this.setData({
+                    top_content_bg_color: 'background: linear-gradient(180deg, ' + color + ' 0%, #f5f5f5 80%);',
+                    top_content_search_bg_color: 'background: linear-gradient(180deg, ' + color + ' 0%, #f5f5f5 300%);',
+                });
+            },
+
+            // 搜索icon扫码事件
+            search_icon_event(e) {
+                app.globalData.scan_handle();
+            }
+        },
+    };
+</script>
+<style>
+    @import './index.css';
+</style>
diff --git a/pages/login/login.css b/pages/login/login.css
new file mode 100644
index 0000000..aa6c1e8
--- /dev/null
+++ b/pages/login/login.css
@@ -0,0 +1,137 @@
+page {
+    background: #fff;
+}
+
+/**
+ * 基础
+ */
+.content .icon {
+    width: 130rpx;
+    height: 130rpx !important;
+}
+.dom-content {
+    min-height: 100vh;
+}
+
+/**
+ * 表单内容
+ */
+.form-content {
+    padding: 34rpx;
+}
+.form-content .form-item,
+.form-content .code,
+.form-content .verify {
+    height: 50px;
+    line-height: 50px;
+    background: #F9F9F9;
+    border-radius: 25px;
+    border: 0;
+}
+.form-content .code input,
+.form-content .verify input {
+    height: 50px;
+    line-height: 50px;
+}
+.form-content .form-item,
+.form-content .code input,
+.form-content .verify input {
+    padding: 0 36rpx;
+    box-sizing: border-box;
+}
+.form-content .form-item ::v-deep .input-placeholder,
+.form-content .form-item ::v-deep .uni-input-input,
+.form-content .form-item ::v-deep .input-placeholder,
+.form-content .code input ::v-deep .input-placeholder,
+.form-content .verify input ::v-deep .input-placeholder {
+    font-size: 30rpx;
+}
+.form-content .code input,
+.form-content .verify input {
+    width: 63%;
+}
+.form-content .form-item ::v-deep .uni-input-input:-webkit-autofill {
+    /* //这个地方的颜色是字体颜色，可以根据实际情况修改 */
+    /* -webkit-text-fill-color: #ededed !important;  */
+    /* //设置input输入框的背景颜色为透明色 */
+    -webkit-box-shadow: 0 0 0px 1000px #f9f9f9 inset !important;
+    /* //设置input输入框的背景颜色为透明色 */
+    background-color: #f9f9f9;
+    background-image: none;
+    transition: background-color 50000s ease-in-out 0s;
+}
+.form-content .code ::v-deep .uni-input-input:-webkit-autofill {
+    /* //设置input输入框的背景颜色为透明色 */
+    background-color: #f9f9f9;
+    background-image: none;
+    transition: background-color 50000s ease-in-out 0s;
+}
+.form-content .code .verify-submit {
+    padding: 0 12px;
+    height: 28px;
+    line-height: 28px;
+    top: 11px;
+    right: 36rpx;
+}
+.form-content .verify .verify-image {
+    width: 35%;
+    height: 50px;
+    line-height: 50px;
+    top: 0;
+    right: 36rpx;
+}
+.opt-type-list text:not(:last-child) {
+    margin-right: 50rpx;
+}
+
+/**
+ * 第三方登录 - 插件
+ */
+.plugins-thirdpartylogin .item {
+    width: 76rpx;
+    height: 76rpx;
+    padding: 5rpx;
+}
+.plugins-thirdpartylogin .item:not(:last-child) {
+    margin-right: 54rpx;
+}
+.plugins-thirdpartylogin .item image {
+    width: 50rpx !important;
+    height: 50rpx !important;
+}
+.plugins-thirdpartylogin .item.more-submit image {
+    width: 76rpx !important;
+    height: 76rpx !important;
+}
+.plugins-thirdpartylogin-bind image {
+    width: 40rpx !important;
+    height: 40rpx !important;
+}
+.plugins-thirdpartylogin-bind button {
+    line-height: 40rpx;
+}
+.popup-login .content,
+.popup-login .footer .cancel-btn {
+    border-radius: 32rpx;
+}
+.popup-login .content .item:not(:last-child) {
+    border-bottom: 1px solid #eee;
+}
+.popup-login .content .item image {
+    width: 36rpx !important;
+    height: 36rpx !important;
+}
+.popup-login .content .item .login-width {
+    width: 180rpx;
+}
+
+/**
+ * 多语言
+ */
+.popup-language {
+    height: 100vh;
+}
+.popup-language .list {
+    height: calc(100vh - 95rpx);
+    overflow-y: auto;
+}
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
new file mode 100644
index 0000000..825c992
--- /dev/null
+++ b/pages/login/login.vue
@@ -0,0 +1,1758 @@
+<template>
+    <view :class="theme_view">
+        <view class="content">
+            <block v-if="(is_exist_base_data || 0) == 1">
+                <view class="flex-col jc-sb dom-content">
+                    <view>
+                        <!-- 多语言切换、绑定账户不展示语言切换 -->
+                        <view v-if="home_use_multilingual_status == 1 && current_opt_form != 'bind_platform'" class="flex-row tr padding-top-sm padding-horizontal-lg padding-bottom-lg margin-bottom-xl">
+                            <view class="flex-1 cr-base text-size" @tap="open_language_event">
+                                <view class="pr top-sm margin-right-sm dis-inline-block">
+                                    <iconfont name="icon-login-language" size="32rpx"></iconfont>
+                                </view>
+                                {{ language }}
+                                <view class="margin-left-sm dis-inline-block">
+                                    <iconfont name="icon-login-down-arrow" size="16rpx"></iconfont>
+                                </view>
+                            </view>
+                        </view>
+
+                        <!-- 绑定手机 -->
+                        <view v-if="current_opt_form == 'bind_verify'" class="form-content">
+                            <form @submit="form_submit_bind_mobile">
+                                <view class="tc">
+                                    <image class="icon circle auto dis-block margin-bottom-xxl br" :src="user.avatar || home_site_logo_square || '/static/images/common/user.png'" mode="widthFix"></image>
+                                    <view v-if="(user.user_name_view || null) != null" class="cr-base">{{ user.user_name_view || '' }}</view>
+                                </view>
+                                <view class="margin-top-xxxl padding-top-xxxl">
+                                    <input type="number" :placeholder="$t('login.login.28k91h')" maxlength="11" name="mobile" @input="form_input_mobile_event" class="form-item margin-vertical-main wh-auto" />
+                                    <view class="code pr margin-vertical-main">
+                                        <input type="number" :placeholder="$t('login.login.t3951j')" name="verify" maxlength="4" />
+                                        <button :class="'verify-submit pa round br text-size-sm cr-base ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">{{ verify_submit_text }}</button>
+                                    </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">{{ $t('login.login.tfl656') }}</button>
+                                </view>
+                                <view class="margin-top-xxxl padding-top-xxxl padding-horizontal-main padding-bottom-xxxl tc">
+                                    <text class="cr-blue" data-value="bind" @tap="opt_form_event">{{ $t('login.login.483nho') }}</text>
+                                </view>
+                            </form>
+                        </view>
+                        <view v-if="current_opt_form == 'bind_email'" class="form-content">
+                            <form @submit="form_submit_bind_email">
+                                <view class="tc">
+                                    <image class="icon circle auto dis-block margin-bottom-xxl br" :src="user.avatar || home_site_logo_square || '/static/images/common/user.png'" mode="widthFix"></image>
+                                    <view v-if="(user.user_name_view || null) != null" class="cr-base">{{ user.user_name_view || '' }}</view>
+                                </view>
+                                <view class="margin-top-xxxl padding-top-xxxl">
+                                    <input type="text" :placeholder="$t('login.login.db1rf4')" maxlength="60" name="email" @input="form_input_email_event" key="login_email_1" class="form-item margin-vertical-xl wh-auto" />
+                                    <view class="code pr margin-vertical-main">
+                                        <input type="number" :placeholder="$t('login.login.t3951j')" name="verify" maxlength="4" />
+                                        <button :class="'verify-submit pa round br text-size-sm cr-base ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">{{ verify_submit_text }}</button>
+                                    </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">{{ $t('login.login.tfl656') }}</button>
+                                </view>
+                                <view class="margin-top-xxxl padding-top-xxxl padding-horizontal-main padding-bottom-xxxl tc">
+                                    <text class="cr-blue" data-value="bind" @tap="opt_form_event">{{ $t('login.login.483nho') }}</text>
+                                </view>
+                            </form>
+                        </view>
+
+                        <!-- 存在用户信息 -->
+                        <block v-if="user != null">
+                            <!-- 确认绑定方式 -->
+                            <view v-if="current_opt_form == 'bind' || current_opt_form == 'success'" class="form-content">
+                                <view class="tc">
+                                    <image class="icon circle auto dis-block margin-bottom-xxl br" :src="user.avatar || home_site_logo_square || '/static/images/common/user.png'" mode="widthFix"></image>
+                                    <view v-if="(user.user_name_view || null) != null" class="cr-base">{{ user.user_name_view || '' }}</view>
+                                </view>
+                                <block v-if="current_opt_form == 'bind'">
+                                    <view v-if="(common_user_verify_bind_mobile_list.length > 0 && common_user_verify_bind_mobile_list.indexOf(client_value) != -1) || (common_user_onekey_bind_mobile_list.length > 0 && common_user_onekey_bind_mobile_list.indexOf(client_value) != -1)" class="margin-top-xxxl padding-top-xxxl">
+                                        <button v-if="common_user_verify_bind_mobile_list.length > 0 && common_user_verify_bind_mobile_list.indexOf(client_value) != -1" class="bg-main-pair br-main-pair cr-white round text-size" type="warn" hover-class="none" data-value="bind_verify" @tap="opt_form_event">{{ $t('login.login.31r6p2') }}</button>
+                                        <button v-if="common_user_onekey_bind_mobile_list.length > 0 && common_user_onekey_bind_mobile_list.indexOf(client_value) != -1" class="margin-top-xxl bg-main br-main cr-white round text-size" type="default" hover-class="none" open-type="getPhoneNumber" @getphonenumber="confirm_phone_number_event">{{ $t('login.login.p3kxy2') }}</button>
+                                    </view>
+                                    <!-- 当前还没有账号的情况下才可以操作登录和注册绑定 -->
+                                    <view v-if="(user || null) == null || (user.id || null) == null" class="margin-top-xxxl padding-top-xxxl padding-horizontal-main padding-bottom-main">
+                                        <!-- 登录 -->
+                                        <view v-if="(home_user_login_type || null) != null && home_user_login_type.length > 0" class="margin-bottom-xxxl tc">
+                                            <text class="cr-main round padding-top-xs padding-bottom-xs padding-horizontal-main" data-value="login" @tap="opt_form_event">{{ $t('login.login.54l805') }}</text>
+                                        </view>
+                                        <!-- 注册 -->
+                                        <view v-if="(home_user_reg_type || null) != null && home_user_reg_type.length > 0" class="margin-bottom-xl tc">
+                                            <text class="cr-main-pair round padding-top-xs padding-bottom-xs padding-horizontal-main" data-value="reg" @tap="opt_form_event">{{ $t('login.login.q11t73') }}</text>
+                                        </view>
+                                    </view>
+                                </block>
+                                <view v-if="current_opt_form == 'success'" class="tc margin-top-xxxl">
+                                    <view class="cr-green">{{ $t('login.login.s51ed9') }}</view>
+                                    <button type="default" size="mini" class="dis-inline-block auto bg-main br-main cr-white round text-size-sm padding-left-xxxl padding-right-xxxl padding-top-xs padding-bottom-xs margin-top-xl" @tap="success_event">{{ $t('login.login.483nho') }}</button>
+                                </view>
+                            </view>
+                        </block>
+
+                        <!-- 账户绑定展示用户头像和名称 -->
+                        <view v-if="current_opt_form == 'bind_platform'" class="padding-top-xxxxl margin-top-xxxxl tc">
+                            <image class="icon circle auto dis-block margin-bottom-xxl br" :src="user.avatar || home_site_logo_square || '/static/images/common/user.png'" mode="widthFix"></image>
+                            <view v-if="(user.user_name_view || null) != null" class="cr-base">{{ user.user_name_view || '' }}</view>
+                        </view>
+
+                        <!-- 默认站点logo -->
+                        <image v-if="(home_site_logo_square || null) != null && current_opt_form != 'bind' && current_opt_form != 'bind_verify' && current_opt_form != 'bind_email' && current_opt_form != 'bind_platform' && current_opt_form != 'success'" class="icon circle auto dis-block br" :src="home_site_logo_square" mode="widthFix"></image>
+
+                        <!-- 非登录成功则需要展示的数据 -->
+                        <block v-if="current_opt_form != 'success'">
+                            <!-- 错误提示信息 -->
+                            <view v-if="(error_msg || null) != null" class="margin-top-xxxl margin-bottom-lg tc padding-horizontal-main">
+                                <icon type="warn" size="16" color="#f00" class="va-m" />
+                                <text class="cr-red va-m margin-left-sm">{{ error_msg }}</text>
+                            </view>
+
+                            <!-- 绑定账号提示 -->
+                            <view v-if="(plugins_thirdpartylogin_user || null) != null && (plugins_thirdpartylogin_user.is_force_bind_user || 0) == 1" class="plugins-thirdpartylogin-bind tc padding-horizontal-main margin-top-xl">
+                                <view class="margin-bottom-sm">
+                                    <image v-if="(plugins_thirdpartylogin_user.avatar || null) != null" :src="plugins_thirdpartylogin_user.avatar" mode="aspectFit" class="round br va-m"></image>
+                                    <text class="cr-blue margin-left-sm">{{ plugins_thirdpartylogin_user.nickname }}</text>
+                                    <button type="default" size="mini" class="br-red cr-red bg-white round va-m text-size-xs margin-left-lg padding-top-xs padding-bottom-xs" @tap="plugins_thirdpartylogin_cancel_event">{{ $t('common.cancel') }}</button>
+                                </view>
+                                <view class="cr-grey text-size-xs">{{ $t('login.login.e77788') }}{{ plugins_thirdpartylogin_user.platform_name }}{{ $t('login.login.1i4o86') }}</view>
+                            </view>
+                        </block>
+
+                        <!-- 登录 -->
+                        <view v-if="current_opt_form == 'login'" class="form-content">
+                            <form @submit="form_submit_login">
+                                <!-- form表单距离去除顶部沾满整个空间的高度 -->
+                                <view class="flex-col jc-sb">
+                                    <view>
+                                        <!-- 登录方式选择 -->
+                                        <view v-if="(home_user_login_type || null) != null && home_user_login_type.length > 0" class="opt-type-list margin-vertical-xxxl">
+                                            <text v-if="home_user_login_type.indexOf('username') != -1" class="padding-vertical-sm" :class="current_opt_type === 'login_username' ? 'cr-main nav-active-line' : ''" data-value="login_username" @tap="opt_type_event">{{ $t('login.login.n2pv70') }}</text>
+                                            <text v-if="home_user_login_type.indexOf('sms') != -1" class="padding-vertical-sm" :class="current_opt_type === 'login_sms' ? 'cr-main nav-active-line' : ''" data-value="login_sms" @tap="opt_type_event">{{ $t('login.login.1p7843') }}</text>
+                                            <text v-if="home_user_login_type.indexOf('email') != -1" class="padding-vertical-sm" :class="current_opt_type === 'login_email' ? 'cr-main nav-active-line' : ''" data-value="login_email" @tap="opt_type_event">{{ $t('login.login.p54kf1') }}</text>
+                                        </view>
+                                        <view v-else class="tc cr-grey padding-vertical-main">{{ $t('login.login.3i05ly') }}</view>
+                                        <!-- 账号密码 -->
+                                        <block v-if="current_opt_type == 'login_username'">
+                                            <input type="text" :placeholder="$t('login.login.qe8a37')" maxlength="60" name="accounts" key="login_username_1" class="form-item margin-vertical-xl wh-auto" />
+                                            <input type="text" :placeholder="$t('login.login.08fchn')" minlength="6" maxlength="18" name="pwd" password="true" key="login_username_2" class="form-item margin-vertical-xl wh-auto" />
+                                            <view v-if="home_user_login_img_verify_state == 1" class="verify pr margin-vertical-xl">
+                                                <input type="text" :placeholder="$t('login.login.t3951j')" name="verify" maxlength="4" :value="form_input_image_verify_value" key="login_username_3" @input="form_input_image_verify_event" />
+                                                <image v-if="(verify_image_url || null) != null" :src="verify_image_url" class="verify-image pa" mode="aspectFit" data-type="user_login" @tap="image_verify_event"></image>
+                                            </view>
+                                        </block>
+                                        <!-- 手机 -->
+                                        <block v-if="current_opt_type == 'login_sms'">
+                                            <input type="number" :placeholder="$t('login.login.28k91h')" maxlength="11" name="accounts" @input="form_input_mobile_event" key="login_sms_1" class="form-item margin-vertical-xl wh-auto" />
+                                            <view class="code pr margin-vertical-xl">
+                                                <input type="number" :placeholder="$t('login.login.t3951j')" name="verify" maxlength="4" key="login_sms_2" />
+                                                <button :class="'verify-submit pa round br text-size-sm cr-grey-9 ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">{{ verify_submit_text }}</button>
+                                            </view>
+                                        </block>
+                                        <!-- 邮箱 -->
+                                        <block v-if="current_opt_type == 'login_email'">
+                                            <input type="text" :placeholder="$t('login.login.db1rf4')" maxlength="60" name="accounts" @input="form_input_email_event" key="login_email_1" class="form-item margin-vertical-xl wh-auto" />
+                                            <view class="code pr margin-vertical-xl">
+                                                <input type="number" :placeholder="$t('login.login.t3951j')" name="verify" maxlength="4" key="login_email_1" />
+                                                <button :class="'verify-submit pa round br text-size-sm cr-grey-9 ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">{{ verify_submit_text }}</button>
+                                            </view>
+                                        </block>
+                                        <!-- 协议 -->
+                                        <view class="margin-top-xl cr-grey flex-row flex-wrap align-c">
+                                            <view class="dis-inline-block va-m" @tap="agreement_change">
+                                                <radio-group class="dis-inline-block va-m" style="transform: scale(0.6)">
+                                                    <label>
+                                                        <radio value="agreement" color="#20a53a" :checked="agreement_status" />
+                                                    </label>
+                                                </radio-group>
+                                            </view>
+                                            <view class="dis-inline-block va-m text-size-xs">
+                                                <text>{{ $t('login.login.nddg2x') }}</text>
+                                                <text class="cr-main" @tap="agreement_event" data-value="userregister">{{ $t('login.login.2v11we') }}</text>
+                                                <text>{{ $t('login.login.l3r4vr') }}</text>
+                                                <text class="cr-main" @tap="agreement_event" data-value="userprivacy">{{ $t('login.login.myno2x') }}</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">{{ $t('login.login.i1deai') }}</button>
+                                        <view class="margin-top-xxl oh flex-row jc-sb align-c">
+                                            <!-- 注册 -->
+                                            <view v-if="(home_user_reg_type || null) != null && home_user_reg_type.length > 0">
+                                                <text class="cr-grey-9" data-value="reg" @tap="opt_form_event">{{ $t('login.login.t75ee8') }}</text>
+                                            </view>
+                                            <text class="cr-grey-9" data-value="forget" @tap="opt_form_event">{{ $t('login.login.9d8gqi') }}</text>
+                                        </view>
+                                    </view>
+                                </view>
+                            </form>
+                        </view>
+
+                        <!-- 注册 -->
+                        <view v-else-if="current_opt_form == 'reg'" class="form-content">
+                            <form @submit="form_submit_reg">
+                                <!-- form表单距离去除顶部沾满整个空间的高度 -->
+                                <view class="flex-col jc-sb">
+                                    <view>
+                                        <!-- 注册方式选择 -->
+                                        <view v-if="(home_user_reg_type || null) != null && home_user_reg_type.length > 0" class="opt-type-list margin-vertical-xxxl">
+                                            <text v-if="home_user_reg_type.indexOf('username') != -1" class="padding-vertical-sm" :class="current_opt_type === 'reg_username' ? 'cr-main nav-active-line' : ''" data-value="reg_username" @tap="opt_type_event">{{ $t('login.login.n2pv70') }}</text>
+                                            <text v-if="home_user_reg_type.indexOf('sms') != -1" class="padding-vertical-sm" :class="current_opt_type === 'reg_sms' ? 'cr-main nav-active-line' : ''" data-value="reg_sms" @tap="opt_type_event">{{ $t('login.login.1p7843') }}</text>
+                                            <text v-if="home_user_reg_type.indexOf('email') != -1" class="padding-vertical-sm" :class="current_opt_type === 'reg_email' ? 'cr-main nav-active-line' : ''" data-value="reg_email" @tap="opt_type_event">{{ $t('login.login.p54kf1') }}</text>
+                                        </view>
+                                        <view v-else class="tc cr-grey padding-vertical-main">{{ $t('login.login.t59dho') }}</view>
+                                        <!-- 账号密码 -->
+                                        <block v-if="current_opt_type == 'reg_username'">
+                                            <input type="text" :placeholder="$t('login.login.6yfr9g')" maxlength="60" name="accounts" key="reg_username_1" class="form-item margin-vertical-xl wh-auto" />
+                                            <input type="text" :placeholder="$t('login.login.08fchn')" minlength="6" maxlength="18" name="pwd" password="true" key="reg_username_2" class="form-item margin-vertical-xl wh-auto" />
+                                            <view v-if="home_user_register_img_verify_state == 1" class="verify pr margin-vertical-xl">
+                                                <input type="text" :placeholder="$t('login.login.t3951j')" name="verify" maxlength="4" :value="form_input_image_verify_value" key="reg_username_3" @input="form_input_image_verify_event" />
+                                                <image v-if="(verify_image_url || null) != null" :src="verify_image_url" class="verify-image pa" mode="aspectFit" data-type="user_reg" @tap="image_verify_event"></image>
+                                            </view>
+                                        </block>
+                                        <!-- 手机 -->
+                                        <block v-if="current_opt_type == 'reg_sms'">
+                                            <input type="number" :placeholder="$t('login.login.28k91h')" maxlength="11" name="accounts" key="reg_sms_1" @input="form_input_mobile_event" class="form-item margin-vertical-xl wh-auto" />
+                                            <view class="code pr margin-vertical-xl">
+                                                <input type="number" :placeholder="$t('login.login.t3951j')" name="verify" maxlength="4" key="reg_sms_2" />
+                                                <button :class="'verify-submit pa round br text-size-sm cr-grey-9 ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">{{ verify_submit_text }}</button>
+                                            </view>
+                                            <input type="text" :placeholder="$t('login.login.08fchn')" minlength="6" maxlength="18" name="pwd" password="true" key="reg_sms_3" class="form-item margin-vertical-xl wh-auto" />
+                                        </block>
+                                        <!-- 邮箱 -->
+                                        <block v-if="current_opt_type == 'reg_email'">
+                                            <input type="text" :placeholder="$t('login.login.db1rf4')" maxlength="60" name="accounts" key="reg_email_1" @input="form_input_email_event" class="form-item margin-vertical-xl wh-auto" />
+                                            <view class="code pr margin-vertical-xl">
+                                                <input type="number" :placeholder="$t('login.login.t3951j')" name="verify" maxlength="4" key="reg_email_2" />
+                                                <button :class="'verify-submit pa round br text-size-sm cr-grey-9 ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">{{ verify_submit_text }}</button>
+                                            </view>
+                                            <input type="text" :placeholder="$t('login.login.08fchn')" minlength="6" maxlength="18" name="pwd" password="true" key="reg_email_3" class="form-item margin-vertical-xl wh-auto" />
+                                        </block>
+                                        <!-- 协议 -->
+                                        <view class="margin-top-xxxl cr-grey">
+                                            <view class="dis-inline-block va-m" @tap="agreement_change">
+                                                <radio-group class="dis-inline-block va-m" style="transform: scale(0.6)">
+                                                    <label>
+                                                        <radio value="agreement" color="#20a53a" :checked="agreement_status" />
+                                                    </label>
+                                                </radio-group>
+                                            </view>
+                                            <view class="dis-inline-block va-m text-size-xs">
+                                                <text>{{ $t('login.login.nddg2x') }}</text>
+                                                <text class="cr-main" @tap="agreement_event" data-value="userregister">{{ $t('login.login.2v11we') }}</text>
+                                                <text>{{ $t('login.login.l3r4vr') }}</text>
+                                                <text class="cr-main" @tap="agreement_event" data-value="userprivacy">{{ $t('login.login.myno2x') }}</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">{{ $t('login.login.hvunf8') }}</button>
+                                        <view class="margin-top-xxl oh flex-row jc-sb align-c">
+                                            <!-- 登录 -->
+                                            <view v-if="(home_user_login_type || null) != null && home_user_login_type.length > 0" class="tc">
+                                                <text class="cr-grey-9" data-value="login" @tap="opt_form_event">{{ $t('login.login.zy8tc4') }}</text>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </form>
+                        </view>
+
+                        <!-- 找回密码 -->
+                        <view v-else-if="current_opt_form == 'forget'" class="form-content">
+                            <form @submit="form_submit_forget">
+                                <!-- form表单距离去除顶部沾满整个空间的高度 -->
+                                <view class="flex-col jc-sb">
+                                    <view class="margin-bottom-xxxl">
+                                        <input type="text" :placeholder="$t('login.login.d178m0')" maxlength="60" name="accounts" @input="form_input_accounts_event" class="form-item margin-vertical-xl wh-auto" />
+                                        <view class="code pr margin-vertical-xl">
+                                            <input type="number" autocomplete="off" :placeholder="$t('login.login.t3951j')" name="verify" maxlength="4" />
+                                            <button :class="'verify-submit pa round br text-size-sm cr-base ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">{{ verify_submit_text }}</button>
+                                        </view>
+                                        <input type="text" autocomplete="off" :placeholder="$t('login.login.9wx3ch')" minlength="6" maxlength="18" name="pwd" password="true" class="form-item margin-vertical-xl wh-auto" />
+                                        <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">{{ $t('common.confirm_sub') }}</button>
+                                        <view class="margin-top-xxl oh flex-row jc-sb align-c">
+                                            <!-- 登录 -->
+                                            <view v-if="(home_user_login_type || null) != null && home_user_login_type.length > 0" class="tc">
+                                                <text class="cr-grey-9" data-value="login" @tap="opt_form_event">{{ $t('login.login.zy8tc4') }}</text>
+                                            </view>
+                                            <!-- 注册 -->
+                                            <view v-if="(home_user_reg_type || null) != null && home_user_reg_type.length > 0" class="tc">
+                                                <text class="cr-grey-9" data-value="reg" @tap="opt_form_event">{{ $t('login.login.b347k4') }}</text>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </form>
+                        </view>
+
+                        <!-- #ifdef MP -->
+                        <!-- 小程序授权 -->
+                        <view v-if="current_opt_form == 'auth' && (user || null) == null" class="margin-top-xxxl tc">
+                            <view class="cr-base">{{ $t('login.login.836o8e') }}</view>
+                            <view class="margin-top-sm cr-grey">
+                                <view class="dis-inline-block va-m" @tap="agreement_change">
+                                    <radio-group style="transform: scale(0.6)">
+                                        <label>
+                                            <radio value="agreement" color="#20a53a" :checked="agreement_status" />
+                                        </label>
+                                    </radio-group>
+                                </view>
+                                <view class="dis-inline-block va-m text-size-xs">
+                                    <text>{{ $t('login.login.nddg2x') }}</text>
+                                    <text class="cr-main" @tap="agreement_event" data-value="userregister">{{ $t('login.login.2v11we') }}</text>
+                                    <text>{{ $t('login.login.l3r4vr') }}</text>
+                                    <text class="cr-main" @tap="agreement_event" data-value="userprivacy">{{ $t('login.login.myno2x') }}</text>
+                                </view>
+                            </view>
+                            <view class="margin-top-xxl">
+                                <navigator open-type="navigateBack" hover-class="none" class="dis-inline-block margin-right-lg">
+                                    <button class="bg-yellow br-yellow cr-white round" type="default" size="mini" hover-class="none">{{ $t('common.cancel') }}</button>
+                                </navigator>
+                                <!-- #ifdef MP-WEIXIN || MP-TOUTIAO -->
+                                <button class="margin-left-lg bg-green br-green cr-white round" type="default" size="mini" @tap="get_user_info_event">{{ $t('buy.buy.33fugm') }}{{client_text}}{{ $t('login.login.tvl242') }}</button>
+                                <!-- #endif -->
+                                <!-- #ifdef MP-QQ || MP-BAIDU || MP-KUAISHOU -->
+                                <button class="margin-left-lg bg-green br-green cr-white round" type="default" size="mini" open-type="getUserInfo" @getuserinfo="get_user_info_event">{{ $t('buy.buy.33fugm') }}{{client_text}}{{ $t('login.login.tvl242') }}</button>
+                                <!-- #endif -->
+                                <!-- #ifdef MP-ALIPAY -->
+                                <button class="margin-left-lg bg-green br-green cr-white round" type="default" size="mini" open-type="getAuthorize" @getAuthorize="get_user_info_event" scope="userInfo">{{ $t('buy.buy.33fugm') }}{{client_text}}{{ $t('login.login.tvl242') }}</button>
+                                <!-- #endif -->
+                            </view>
+                        </view>
+                        <!-- #endif -->
+                    </view>
+
+                    <!-- 第三方登录 -->
+                    <view v-if="current_opt_form == 'login' || current_opt_form == 'reg'" class="padding-main margin-bottom-xxxl">
+                        <view class="bottom-line-exclude">
+                            <!-- #ifdef H5 || APP -->
+                            <view v-if="(plugins_thirdpartylogin_data || null) != null && (plugins_thirdpartylogin_config || null) != null" class="plugins-thirdpartylogin tc">
+                                <view class="text-size-xs cr-grey-c margin-bottom-main">{{ $t('login.login.9q27d8') }}</view>
+                                <view class="flex-row align-c jc-c">
+                                    <view v-for="(item, key, index) in plugins_thirdpartylogin_data" :key="index">
+                                        <block v-if="index < 3">
+                                            <view class="item round flex-row align-c jc-c margin-horizontal-sm" :style="'background-color:' + item.bg_color + ';'" :data-type="key" @tap="plugins_thirdpartylogin_event">
+                                                <image :src="item.icon" mode="aspectFit" class="dis-block auto"></image>
+                                            </view>
+                                        </block>
+                                    </view>
+                                    <view v-if="Object.keys(plugins_thirdpartylogin_data).length > 3" class="item dis-inline-block round more-submit margin-horizontal-sm" @tap="popup_login_open_event">
+                                        <image :src="login_static_url + 'more.png'" mode="aspectFit" class="dis-block auto"></image>
+                                    </view>
+                                </view>
+                            </view>
+                            <!-- #endif -->
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 图片验证码弹层 -->
+                <component-popup :propShow="popup_image_verify_status" propPosition="bottom" @onclose="popup_image_verify_close_event">
+                    <view class="bg-white padding-horizontal-main padding-top-main">
+                        <view class="fr oh">
+                            <view class="fr" @tap.stop="popup_image_verify_close_event">
+                                <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                            </view>
+                        </view>
+                        <view class="form-content margin-top-xxxl padding-top-xxl">
+                            <view class="verify pr margin-vertical-main">
+                                <input type="text" :placeholder="$t('login.login.t3951j')" name="verify" maxlength="4" :value="form_input_image_verify_value" @input="form_input_image_verify_event" />
+                                <image v-if="(verify_image_url || null) != null" :src="verify_image_url" class="verify-image pa" mode="aspectFit" :data-type="'user_' + current_opt_form" @tap="image_verify_event"></image>
+                            </view>
+                            <view class="margin-top-xxxl margin-bottom-xxxl">
+                                <button class="bg-main br-main cr-white round text-size" type="default" @tap="popup_image_verify_submit_event" hover-class="none" :disabled="verify_disabled">{{ $t('common.confirm') }}</button>
+                            </view>
+                        </view>
+                    </view>
+                </component-popup>
+
+                <!-- 打开语言选择弹层-->
+                <component-popup :propShow="popup_language_status" propPosition="bottom" :propIsRadius="false" @onclose="popup_language_close_event">
+                    <view class="popup-language">
+                        <view class="flex-row align-c jc-sb padding-main">
+                            <view @tap="popup_language_close_event">
+                                <iconfont name="icon-close-o" size="28rpx"></iconfont>
+                            </view>
+                            <view class="text-size" @tap="popup_sub_language_event">{{ $t('common.confirm') }}</view>
+                        </view>
+                        <view class="br-t-f5 padding-main list">
+                            <view v-for="(value, key) in language_list" :key="key" class="spacing-mb flex-row jc-sb align-c" :class="language_key == key ? 'cr-main' : ''" :data-key="key" :data-value="value" @tap="checked_language_event">
+                                {{ value }}
+                                <iconfont v-if="language_key == key" name="icon-checked" size="32rpx"></iconfont>
+                            </view>
+                        </view>
+                    </view>
+                </component-popup>
+                <!-- 选择登录方式 -->
+                <component-popup :propShow="popup_login_status" propMostClass="z-i-deep pr" propPosition="bottom" :propIsRadius="false" propStyle="background-color:transparent;" @onclose="popup_login_close_event">
+                    <view class="popup-login padding-sm">
+                        <view class="bg-white border-radius-main content">
+                            <view v-for="(item, key, index) in plugins_thirdpartylogin_data" :key="index">
+                                <block v-if="index > 2">
+                                    <view class="item padding-lg flex-col jc-c align-c" :data-type="key" @tap="plugins_thirdpartylogin_event">
+                                        <view class="flex-row align-c login-width text-size-lg"> <image :src="item.icon" mode="aspectFit" class="margin-right-main"></image>{{ item.name }} </view>
+                                    </view>
+                                </block>
+                            </view>
+                        </view>
+                        <view class="margin-top-main tc footer">
+                            <view class="padding-main text-size-lg fw-b bg-white cancel-btn" @tap="popup_login_close_event">{{ $t('common.cancel') }}</view>
+                        </view>
+                    </view>
+                </component-popup>
+            </block>
+            <view v-else class="padding-top-xxxl tc">
+                <view class="cr-red margin-top-xxxl">{{ $t('login.login.pgyv78') }}</view>
+                <view class="cr-grey-c text-size-xs margin-top-xxl">{{ $t('login.login.d76tgh') }}</view>
+                <view class="margin-top-xl">
+                    <button type="default" size="mini" class="br-main cr-white bg-main dis-inline-block padding-left-xxxl padding-right-xxxl padding-top-sm padding-bottom-sm round" @tap="cache_refresh_event">{{ $t('login.login.6fe6ra') }}</button>
+                </view>
+            </view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import base64 from '@/common/js/lib/base64.js';
+    import componentCommon from '@/components/common/common';
+    import componentPopup from '@/components/popup/popup';
+    let login_static_url = app.globalData.get_static_url('thirdpartylogin', true) + 'icon/';
+
+    export default {
+        data() {
+            return {
+                // 多语言
+                system_locale: '',
+                application_locale: '',
+                // 语言选择
+                popup_language_status: false,
+                language_list: '',
+                language_key: '',
+                // 实际提交的语言字段
+                language: '',
+                home_use_multilingual_status: 0,
+                theme_view: app.globalData.get_theme_value_view(),
+                login_static_url: login_static_url,
+                params: null,
+                user: null,
+                prev_page: null,
+                form_input_mobile_value: '',
+                form_input_email_value: '',
+                form_input_accounts_value: '',
+                form_input_image_verify_value: '',
+                verify_submit_text: '',
+                verify_loading: false,
+                verify_disabled: false,
+                form_submit_loading: false,
+                verify_time_total: 60,
+                temp_clear_time: null,
+                agreement_status: false,
+                verify_image_url: null,
+                popup_image_verify_status: false,
+                navigation_bar_title_key: '',
+                // 基础配置
+                is_refreshed_base_data: 0,
+                is_exist_base_data: 0,
+                common_user_verify_bind_mobile_list: [],
+                common_user_onekey_bind_mobile_list: [],
+                home_site_logo_square: null,
+                home_user_login_type: [],
+                home_user_reg_type: [],
+                home_user_login_img_verify_state: 0,
+                home_user_register_img_verify_state: 0,
+                common_img_verify_state: 0,
+                client_value: app.globalData.application_client_type(),
+                // 0 确认绑定方式, 1 验证码绑定
+                current_login_bind_type: 0,
+                // 当前操作方式
+                current_opt_form: 'auth',
+                current_opt_type: 'auth',
+                current_opt_type_title: {},
+                // 第三方登录
+                plugins_thirdpartylogin_data: null,
+                plugins_thirdpartylogin_user: null,
+                plugins_thirdpartylogin_is_call_app: 0,
+                // app第三方登录通道
+                app_login_provider_list: [],
+                // 错误提示信息
+                error_msg: null,
+                // 登录方式弹窗状态
+                popup_login_status: false,
+                // 客户端名称
+                client_text: '',
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentPopup,
+        },
+
+        // 页面加载初始化
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 资源设置
+            this.set_resources_data();
+
+            // #ifdef APP
+            // 获取app第三方登录通道设置
+            this.provider_action();
+            //#endif
+
+            // 多语言
+            let system_info = uni.getSystemInfoSync();
+            this.system_locale = system_info.language;
+            this.application_locale = app.globalData.get_language_value();
+            uni.onLocaleChange((e) => {
+                this.application_locale = e.locale;
+            });
+            var language_key = app.globalData.get_language_value();
+            var language_list = this.$t('language');
+            this.setData({
+                params: params,
+                language_list: language_list,
+                language_key: language_key,
+                language: language_list[language_key],
+            });
+
+            // 上一个页面记录
+            var page = app.globalData.prev_page();
+            if (page != null && page != 'pages/login/login') {
+                uni.setStorageSync(app.globalData.data.cache_prev_page_key, page);
+            }
+
+            // 错误提示信息
+            if ((params.msg || null) != null) {
+                var msg = base64.decode(decodeURIComponent(params.msg));
+                this.setData({
+                    error_msg: msg,
+                });
+            }
+
+            // 第三方登录成功处理
+            if ((params.thirdpartylogin || null) != null) {
+                var user = JSON.parse(base64.decode(decodeURIComponent(params.thirdpartylogin)));
+                this.setData({
+                    plugins_thirdpartylogin_user: user,
+                });
+                // 是否需要绑定账号
+                if ((user.is_force_bind_user || 0) != 1) {
+                    uni.setStorageSync(app.globalData.data.cache_user_info_key, user);
+                }
+            }
+        },
+
+        // 页面显示
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 异步初始化配置
+            this.init_config();
+
+            // 数据初始化
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        methods: {
+            // 资源设置
+            set_resources_data() {
+                this.setData({
+                    current_opt_type_title: {
+                        auth: this.$t('login.login.jw378f'),
+                        bind: this.$t('login.login.np9177'),
+                        bind_email: this.$t('login.login.tgsa4d'),
+                        login_username: this.$t('login.login.725312'),
+                        login_sms: this.$t('login.login.158yg2'),
+                        login_email: this.$t('login.login.r329eu'),
+                        reg_username: this.$t('login.login.39hn6v'),
+                        reg_sms: this.$t('login.login.z13km0'),
+                        reg_email: this.$t('login.login.jc0w0o'),
+                        forget: this.$t('login.login.8tmyuc'),
+                        success: this.$t('login.login.5p23c6'),
+                        bind_platform: this.$t('login.login.876tdf'),
+                    },
+                    verify_submit_text: this.$t('login.login.s665h5'),
+                    client_text: this.$t('client.'+this.client_value),
+                });
+            },
+
+            // 数据初始化
+            init() {
+                // 缓存初始化配置
+                this.init_config(true);
+
+                // 用户信息
+                var user = app.globalData.get_user_cache_info() || null;
+
+                // 数据处理
+                var type = user == null ? 'auth' : 'bind';
+                var form = type;
+                var is_base = app.globalData.data.common_data_init_status || 0;
+                // #ifdef H5 || APP
+                if (user == null) {
+                    // 非小程序：如果开启登录则取第一个登录方式
+                    if ((this.home_user_login_type || null) != null && this.home_user_login_type.length > 0) {
+                        form = 'login';
+                        // 开启登录则取第一个
+                        type = 'login_' + this.home_user_login_type[0];
+
+                        // 用户登录和验证码获取开启图片验证码
+                        if (this.home_user_login_img_verify_state == 1 || this.common_img_verify_state == 1) {
+                            this.image_verify_event('user_login');
+                        }
+                    } else {
+                        is_base = 0;
+                    }
+                } else {
+                    // 是否需要绑定手机
+                    if (type == 'bind' && app.globalData.user_is_bind_mobile(user)) {
+                        type = 'bind';
+                        // 是否打开了一键获取手机、则直接展示验证码输入表单
+                        if(this.common_user_onekey_bind_mobile_list.length > 0 && this.common_user_onekey_bind_mobile_list.indexOf(this.client_value) != -1) {
+                            form = 'bind';
+                        } else {
+                            form = 'bind_verify';
+                        }
+                    } else {
+                        form = 'success';
+                    }
+                }
+                // #endif
+
+                // 是否参数指定类型和表单
+                if ((this.params.opt_type || null) != null) {
+                    type = this.params.opt_type;
+                }
+                if ((this.params.opt_form || null) != null) {
+                    form = this.params.opt_form;
+                }
+
+                // 没有基础数据则刷新
+                if (is_base == 0 && this.is_refreshed_base_data == 0) {
+                    this.cache_refresh_event();
+                }
+
+                this.setData({
+                    user: user,
+                    current_opt_type: type,
+                    current_opt_form: form,
+                    is_exist_base_data: is_base,
+                    is_refreshed_base_data: 1,
+                    navigation_bar_title_key: type
+                });
+                this.set_navigation_bar_title();
+
+                // 调用登录处理
+                if(parseInt(this.plugins_thirdpartylogin_is_call_app || 0) == 0 && type == 'bind_platform' && form == 'bind_platform' && (this.params.platform_type || null) != null) {
+                    this.setData({
+                        plugins_thirdpartylogin_is_call_app: 1
+                    })
+                    this.plugins_thirdpartylogin_handle(this.params.platform_type);
+                    return false;
+                }
+
+                // 登录成功
+                if (this.current_opt_form == 'success') {
+                    var page = uni.getStorageSync(app.globalData.data.cache_prev_page_key) || null;
+                    if (page != null) {
+                        this.setData({ prev_page: page });
+                        setTimeout(function () {
+                            app.globalData.url_open('/' + page, true);
+                        }, 2000);
+                    }
+                }
+            },
+
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    this.setData({
+                        home_site_logo_square: app.globalData.get_config('config.home_site_logo_square'),
+                        common_user_verify_bind_mobile_list: app.globalData.get_config('config.common_user_verify_bind_mobile_list', []),
+                        common_user_onekey_bind_mobile_list: app.globalData.get_config('config.common_user_onekey_bind_mobile_list', []),
+                        home_user_login_type: app.globalData.get_config('config.home_user_login_type'),
+                        home_user_reg_type: app.globalData.get_config('config.home_user_reg_type'),
+                        home_user_login_img_verify_state: app.globalData.get_config('config.home_user_login_img_verify_state'),
+                        home_user_register_img_verify_state: app.globalData.get_config('config.home_user_register_img_verify_state'),
+                        common_img_verify_state: app.globalData.get_config('config.common_img_verify_state'),
+                        home_use_multilingual_status: app.globalData.get_config('config.home_use_multilingual_status'),
+                        plugins_thirdpartylogin_config: app.globalData.get_config('plugins_base.thirdpartylogin.data'),
+                        plugins_thirdpartylogin_data: app.globalData.get_config('plugins_thirdpartylogin_data'),
+                    });
+
+                    // #ifdef APP
+                    // app第三方登录通道隔离
+                    var thirdpartylogin = this.plugins_thirdpartylogin_data || {};
+                    if (Object.keys(thirdpartylogin).length) {
+                        var temp_thirdpartylogin = Object.keys(thirdpartylogin).reduce((pre, cur) => {
+                            if (this.app_login_provider_list.includes(cur)) {
+                                pre[cur] = thirdpartylogin[cur];
+                            }
+                            return pre;
+                        }, {});
+                        this.setData({
+                            plugins_thirdpartylogin_data: temp_thirdpartylogin,
+                        });
+                    }
+                    // #endif
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 登录授权事件
+            get_user_info_event(e) {
+                // 是否已同意协议
+                if (!this.agreement_status) {
+                    app.globalData.showToast(this.$t('login.login.btu2c1'));
+                    return false;
+                }
+
+                // #ifdef MP-WEIXIN
+                uni.getUserProfile({
+                    desc: this.$t('login.login.no8ts6'),
+                    lang: 'zh_CN',
+                    success: (res) => {
+                        this.user_auth_code(res.userInfo);
+                    },
+                    fail: (res) => {
+                        app.globalData.user_login_handle(this, 'user_auth_back_event');
+                    }
+                });
+                // #endif
+                // #ifdef MP-QQ
+                uni.getUserInfo({
+                    withCredentials: true,
+                    lang: 'zh_CN',
+                    success: (res) => {
+                        var userinfo = res.userInfo;
+                        userinfo['encrypted_data'] = res.encryptedData;
+                        userinfo['iv'] = res.iv;
+                        this.user_auth_code(userinfo);
+                    },
+                });
+                // #endif
+                // #ifdef MP-ALIPAY
+                uni.getOpenUserInfo({
+                    success: (res) => {
+                        var userinfo = JSON.parse(res.response).response;
+                        this.user_auth_code(userinfo);
+                    },
+                });
+                // #endif
+                // #ifdef MP-BAIDU
+                var userinfo = e.detail.userInfo;
+                userinfo['encrypted_data'] = e.detail.encryptedData;
+                userinfo['iv'] = e.detail.iv;
+                this.user_auth_code(userinfo);
+                // #endif
+                // #ifdef MP-TOUTIAO
+                uni.getUserProfile({
+                    force: true,
+                    success: (res) => {
+                        // 由于头条getUserProfile内置了login
+                        // 会刷新前面的login会导致后面获取手机号码数据解析失败
+                        // 这里重新获取sessionKey登录
+                        app.globalData.user_login_handle(null, null, false);
+                        // 用户授权登录
+                        this.user_auth_code(res.userInfo);
+                    },
+                });
+                // #endif
+                // #ifdef MP-KUAISHOU
+                var userinfo = e.target.userInfo;
+                this.user_auth_code(e.target.userInfo);
+                // #endif
+            },
+
+            // 用户授权登录
+            // auth_data  授权数据
+            user_auth_code(auth_data) {
+                if ((auth_data || null) != null) {
+                    app.globalData.user_auth_login(this, 'user_auth_back_event', null, auth_data);
+                } else {
+                    app.globalData.showToast(this.$t('login.login.3nmrg2'));
+                }
+            },
+
+            // 授权返回事件
+            user_auth_back_event() {
+                var user = app.globalData.get_user_cache_info() || null;
+                this.setData({
+                    user: user,
+                });
+
+                // 是否需要绑定手机号码
+                if (!app.globalData.user_is_bind_mobile(user)) {
+                    uni.navigateBack();
+                }
+
+                // 初始化
+                this.init();
+            },
+
+            // 输入手机号码事件
+            form_input_mobile_event(e) {
+                this.setData({
+                    form_input_mobile_value: e.detail.value,
+                });
+            },
+
+            // 输入邮箱事件
+            form_input_email_event(e) {
+                this.setData({
+                    form_input_email_value: e.detail.value,
+                });
+            },
+
+            // 输入手机和邮箱事件
+            form_input_accounts_event(e) {
+                this.setData({
+                    form_input_accounts_value: e.detail.value,
+                });
+            },
+
+            // 输入图片验证码事件
+            form_input_image_verify_event(e) {
+                this.setData({
+                    form_input_image_verify_value: e.detail.value,
+                });
+            },
+
+            // 弹层图片验证码关闭
+            popup_image_verify_close_event(e) {
+                this.setData({
+                    popup_image_verify_status: false,
+                });
+            },
+
+            // 弹层图片验证码确认
+            popup_image_verify_submit_event(e) {
+                this.verify_send_handle();
+            },
+
+            // 短信验证码发送事件
+            verify_send_event() {
+                // 手机号码验证：手机登录、手机注册、手机绑定
+                if (this.current_opt_type == 'login_sms' || this.current_opt_type == 'reg_sms' || this.current_opt_type == 'bind') {
+                    if ((this.form_input_mobile_value || null) == null) {
+                        app.globalData.showToast(this.$t('login.login.4c5n8o'));
+                        return false;
+                    }
+                }
+                // 邮箱验证：邮箱登录、邮箱注册
+                if (this.current_opt_type == 'login_email' || this.current_opt_type == 'reg_email' || this.current_opt_type == 'bind_email') {
+                    if ((this.form_input_email_value || null) == null) {
+                        app.globalData.showToast(this.$t('login.login.xak8g1'));
+                        return false;
+                    }
+                }
+                // 密码找回：邮箱或手机
+                if (this.current_opt_type == 'forget' && (this.form_input_accounts_value || null) == null) {
+                    app.globalData.showToast(this.$t('login.login.ku05ty'));
+                    return false;
+                }
+                // 是否开启图片验证码、绑定操作不使用图片验证码
+                if (this.current_opt_form != 'bind' && this.current_opt_form != 'bind_verify' && this.current_opt_form != 'bind_email') {
+                    if (this.common_img_verify_state == 1) {
+                        this.setData({
+                            popup_image_verify_status: true,
+                        });
+                        return false;
+                    }
+                }
+
+                // 发送验证码处理
+                this.verify_send_handle();
+            },
+
+            // 短信验证码发送处理
+            verify_send_handle() {
+                // 是否开启图片验证码
+                if (this.current_opt_form != 'bind' && this.current_opt_form != 'bind_verify' && this.current_opt_form != 'bind_email') {
+                    if (this.common_img_verify_state == 1) {
+                        if ((this.form_input_image_verify_value || null) == null || this.form_input_image_verify_value.length < 4) {
+                            app.globalData.showToast(this.$t('login.login.7r5h37'));
+                            return false;
+                        }
+                    }
+                }
+
+                // 请求数据
+                var action = '';
+                var image_verify_type = '';
+                if (this.current_opt_form == 'bind' || this.current_opt_form == 'bind_email' || this.current_opt_form == 'bind_verify') {
+                    image_verify_type = 'user_bind';
+                    if (this.current_opt_form == 'bind_email') {
+                        action = 'appemailbindverifysend';
+                        var post_data = {
+                            email: this.form_input_email_value || '',
+                        };
+                        if ((post_data.email || null) == null) {
+                            app.globalData.showToast(this.$t('login.login.xak8g1'));
+                            return false;
+                        }
+                    } else if (this.current_opt_form == 'bind_verify') {
+                        action = 'appmobilebindverifysend';
+                        var post_data = {
+                            mobile: this.form_input_mobile_value || '',
+                        };
+                        if ((post_data.mobile || null) == null) {
+                            app.globalData.showToast(this.$t('login.login.4c5n8o'));
+                            return false;
+                        }
+                    }
+                } else {
+                    if (this.current_opt_form == 'login') {
+                        action = 'loginverifysend';
+                        image_verify_type = 'user_login';
+                    } else if (this.current_opt_form == 'reg') {
+                        action = 'regverifysend';
+                        image_verify_type = 'user_reg';
+                    } else if (this.current_opt_form == 'forget') {
+                        action = 'forgetpwdverifysend';
+                        image_verify_type = 'user_forget';
+                    }
+                    var accounts = (this.current_opt_type == 'bind_verify' || this.current_opt_type == 'login_sms' || this.current_opt_type == 'reg_sms' ? this.form_input_mobile_value : this.current_opt_type == 'forget' ? this.form_input_accounts_value : this.form_input_email_value) || null;
+                    if (accounts == null) {
+                        app.globalData.showToast(this.$t('login.login.24mvbh'));
+                        return false;
+                    }
+                    var post_data = {
+                        accounts: accounts,
+                        verify: this.form_input_image_verify_value,
+                        type: this.current_opt_type.replace('login_', '').replace('reg_', ''),
+                    };
+                }
+
+                // 网络请求
+                var self = this;
+                uni.showLoading({
+                    title: this.$t('common.sending_in_text'),
+                });
+                this.setData({
+                    verify_submit_text: this.$t('common.sending'),
+                    verify_loading: true,
+                    verify_disabled: true,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url(action, 'user'),
+                    method: 'POST',
+                    data: post_data,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            // 是否开启图片验证码
+                            if (this.common_img_verify_state == 1) {
+                                this.setData({
+                                    popup_image_verify_status: false,
+                                });
+                            }
+
+                            // 倒计时处理
+                            this.setData({
+                                verify_loading: false,
+                            });
+                            var temp_time = this.verify_time_total;
+                            this.temp_clear_time = setInterval(function () {
+                                if (temp_time <= 1) {
+                                    clearInterval(self.temp_clear_time);
+                                    self.setData({
+                                        verify_submit_text: self.$t('login.login.s665h5'),
+                                        verify_disabled: false,
+                                    });
+                                } else {
+                                    temp_time--;
+                                    self.setData({
+                                        verify_submit_text: self.$t('login.login.n24i5u') + temp_time + self.$t('login.login.4306xr'),
+                                    });
+                                }
+                            }, 1000);
+                        } else {
+                            this.setData({
+                                verify_submit_text: this.$t('login.login.s665h5'),
+                                verify_loading: false,
+                                verify_disabled: false,
+                                form_input_image_verify_value: '',
+                            });
+                            this.image_verify_event(image_verify_type);
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        this.setData({
+                            verify_submit_text: this.$t('login.login.s665h5'),
+                            verify_loading: false,
+                            verify_disabled: false,
+                            form_input_image_verify_value: '',
+                        });
+                        this.image_verify_event(image_verify_type);
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+            form_submit_bind_mobile(e) {
+                // 数据验证
+                var validation = [
+                    { fields: 'mobile', msg: this.$t('login.login.4c5n8o') },
+                    { fields: 'verify', msg: this.$t('login.login.01xmab') },
+                ];
+                this.formBind(e, validation, app.globalData.get_request_url('appmobilebind', 'user'));
+            },
+            // 绑定手机表单提交
+            form_submit_bind_email(e) {
+                // 数据验证
+                var validation = [
+                    { fields: 'email', msg: this.$t('login.login.xak8g1') },
+                    { fields: 'verify', msg: this.$t('login.login.01xmab') },
+                ];
+                this.formBind(e, validation, app.globalData.get_request_url('appemailbind', 'user'));
+            },
+            // 绑定表单提交
+            formBind(e, validation, url) {
+                // 其他数据
+                var client_type = app.globalData.application_client_type();
+                var user = this.user || this.plugins_thirdpartylogin_user || app.globalData.get_login_cache_info() || {};
+                e.detail.value['nickname'] = user.nickname;
+                e.detail.value['avatar'] = user.avatar;
+                e.detail.value['province'] = user.province;
+                e.detail.value['city'] = user.city;
+                e.detail.value['gender'] = user.gender;
+
+                // 小程序数据
+                // #ifdef MP
+                var field_openid = client_type + '_openid';
+                var field_unionid = client_type + '_unionid';
+                e.detail.value[field_openid] = user[field_openid] || '';
+                e.detail.value[field_unionid] = user[field_unionid] || '';
+                // #endif
+                // #ifdef MP
+                validation.push({ fields: field_openid, msg: this.$t('login.login.prqvf1') });
+                // #endif
+                if (app.globalData.fields_check(e.detail.value, validation)) {
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    this.setData({
+                        form_submit_loading: true,
+                    });
+
+                    // 网络请求
+                    uni.request({
+                        url: url,
+                        method: 'POST',
+                        data: e.detail.value,
+                        dataType: 'json',
+                        success: (res) => {
+                            this.user_success_handle(res);
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_loading: false,
+                            });
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 获取手机号码一键登录
+            confirm_phone_number_event(e) {
+                var encrypted_data = e.detail.encryptedData || null;
+                var iv = e.detail.iv || null;
+                var code = e.detail.code || null;
+                if ((encrypted_data != null && iv != null) || code != null) {
+                    // 解密数据并绑定手机
+                    var client_type = app.globalData.application_client_type();
+                    var user = this.user || this.plugins_thirdpartylogin_user || app.globalData.get_login_cache_info() || {};
+                    var field_openid = client_type + '_openid';
+                    var field_unionid = client_type + '_unionid';
+                    var data = {
+                        encrypted_data: encrypted_data,
+                        iv: iv,
+                        code: code,
+                        openid: user[field_openid] || '',
+                        nickname: user.nickname || '',
+                        avatar: user.avatar || '',
+                        province: user.province || '',
+                        city: user.city || '',
+                        gender: user.gender || 0,
+                    };
+                    data[field_unionid] = user[field_unionid] || '';
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('onekeyusermobilebind', 'user'),
+                        method: 'POST',
+                        data: data,
+                        dataType: 'json',
+                        success: (res) => {
+                            this.user_success_handle(res);
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                } else {
+                    var msg = e.errmsg || e.errMsg || e.detail.errmsg || e.detail.errMsg || null;
+                    if (msg != null) {
+                        app.globalData.showToast(msg);
+                    }
+                }
+            },
+
+            // 登录表单提交
+            form_submit_login(e) {
+                // 是否已同意协议
+                if (!this.agreement_status) {
+                    app.globalData.showToast(this.$t('login.login.btu2c1'));
+                    return false;
+                }
+                // 数据验证
+                var validation = [];
+                if (this.current_opt_type == 'login_sms') {
+                    validation.push({ fields: 'accounts', msg: this.$t('login.login.yvj88j') });
+                }
+                if (this.current_opt_type == 'login_email') {
+                    validation.push({ fields: 'accounts', msg: this.$t('login.login.yo6x3p') });
+                }
+                if (this.current_opt_type == 'login_username') {
+                    validation.push({ fields: 'accounts', msg: this.$t('login.login.n7vh75') });
+                    validation.push({ fields: 'pwd', msg: this.$t('login.login.277w03') });
+                }
+                if (this.current_opt_type == 'login_sms' || this.current_opt_type == 'login_email' || (this.current_opt_type == 'login_username' && this.home_user_login_img_verify_state == 1)) {
+                    validation.push({ fields: 'verify', msg: this.$t('login.login.cesl5d') });
+                }
+                if (app.globalData.fields_check(e.detail.value, validation)) {
+                    // 登录方式
+                    e.detail.value['type'] = this.current_opt_type.replace('login_', '');
+
+                    // 其他数据
+                    var client_type = app.globalData.application_client_type();
+                    var user = this.user || this.plugins_thirdpartylogin_user || app.globalData.get_login_cache_info() || {};
+                    e.detail.value['nickname'] = user.nickname;
+                    e.detail.value['avatar'] = user.avatar;
+                    e.detail.value['province'] = user.province;
+                    e.detail.value['city'] = user.city;
+                    e.detail.value['gender'] = user.gender;
+                    // #ifdef MP
+                    // 小程序数据
+                    var field_openid = client_type + '_openid';
+                    var field_unionid = client_type + '_unionid';
+                    e.detail.value[field_openid] = user[field_openid] || '';
+                    e.detail.value[field_unionid] = user[field_unionid] || '';
+                    // #endif
+
+                    // 网络请求
+                    uni.showLoading({
+                        title: this.$t('login.login.c5wa4u'),
+                    });
+                    this.setData({
+                        form_submit_loading: true,
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('login', 'user'),
+                        method: 'POST',
+                        data: e.detail.value,
+                        dataType: 'json',
+                        success: (res) => {
+                            this.user_success_handle(res);
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_loading: false,
+                            });
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 注册表单提交
+            form_submit_reg(e) {
+                // 是否已同意协议
+                if (!this.agreement_status) {
+                    app.globalData.showToast(this.$t('login.login.btu2c1'));
+                    return false;
+                }
+                // 数据验证
+                var validation = [];
+                if (this.current_opt_type == 'reg_sms') {
+                    validation.push({ fields: 'accounts', msg: this.$t('login.login.yvj88j') });
+                }
+                if (this.current_opt_type == 'reg_email') {
+                    validation.push({ fields: 'accounts', msg: this.$t('login.login.yo6x3p') });
+                }
+                if (this.current_opt_type == 'reg_username') {
+                    validation.push({ fields: 'accounts', msg: this.$t('login.login.n7vh75') });
+                    validation.push({ fields: 'pwd', msg: this.$t('login.login.277w03') });
+                }
+                if (this.current_opt_type == 'reg_sms' || this.current_opt_type == 'reg_email' || (this.current_opt_type == 'reg_username' && this.home_user_register_img_verify_state == 1)) {
+                    validation.push({ fields: 'verify', msg: this.$t('login.login.cesl5d') });
+                }
+                if (app.globalData.fields_check(e.detail.value, validation)) {
+                    // 注册方式
+                    e.detail.value['type'] = this.current_opt_type.replace('reg_', '');
+
+                    // 其他数据
+                    var client_type = app.globalData.application_client_type();
+                    var user = this.user || this.plugins_thirdpartylogin_user || app.globalData.get_login_cache_info() || {};
+                    e.detail.value['nickname'] = user.nickname;
+                    e.detail.value['avatar'] = user.avatar;
+                    e.detail.value['province'] = user.province;
+                    e.detail.value['city'] = user.city;
+                    e.detail.value['gender'] = user.gender;
+
+                    // #ifdef MP
+                    // 小程序数据
+                    var field_openid = client_type + '_openid';
+                    var field_unionid = client_type + '_unionid';
+                    e.detail.value[field_openid] = user[field_openid] || '';
+                    e.detail.value[field_unionid] = user[field_unionid] || '';
+                    // #endif
+
+                    // 网络请求
+                    uni.showLoading({
+                        title: this.$t('login.login.g30ew7'),
+                    });
+                    this.setData({
+                        form_submit_loading: true,
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('reg', 'user'),
+                        method: 'POST',
+                        data: e.detail.value,
+                        dataType: 'json',
+                        success: (res) => {
+                            this.user_success_handle(res);
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_loading: false,
+                            });
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 密码找回表单提交
+            form_submit_forget(e) {
+                // 数据验证
+                var validation = [
+                    { fields: 'accounts', msg: this.$t('login.login.h0515x') },
+                    { fields: 'verify', msg: this.$t('login.login.cesl5d') },
+                    { fields: 'pwd', msg: this.$t('login.login.wysg7k') },
+                ];
+                if (app.globalData.fields_check(e.detail.value, validation)) {
+                    // 网络请求
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    this.setData({
+                        form_submit_loading: true,
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('forgetpwd', 'user'),
+                        method: 'POST',
+                        data: e.detail.value,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                                var self = this;
+                                setTimeout(function () {
+                                    var opt_type = (self.home_user_login_type || null) != null && self.home_user_login_type.length > 0 ? 'login_' + self.home_user_login_type[0] : null;
+                                    self.setData({
+                                        form_submit_loading: false,
+                                        current_opt_form: 'login',
+                                        current_opt_type: opt_type,
+                                    });
+                                    if (opt_type != null) {
+                                        // 是否开启图片验证码
+                                        if (self.home_user_login_img_verify_state == 1 || self.common_img_verify_state == 1) {
+                                            self.image_verify_event('user_login');
+                                        }
+                                    }
+                                }, 3000);
+                            } else {
+                                this.setData({
+                                    form_submit_loading: false,
+                                });
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_loading: false,
+                            });
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 登录和注册成功回调处理
+            user_success_handle(res) {
+                if (res.data.code == 0 && (res.data.data || null) != null) {
+                    // 清除定时任务并存储用户信息
+                    clearInterval(this.temp_clear_time);
+                    uni.setStorageSync(app.globalData.data.cache_user_info_key, res.data.data);
+
+                    // 是否强制绑定账号处理
+                    if ((this.plugins_thirdpartylogin_user || null) != null && (this.plugins_thirdpartylogin_user.is_force_bind_user || 0) == 1) {
+                        uni.request({
+                            url: app.globalData.get_request_url('bind', 'index', 'thirdpartylogin'),
+                            method: 'POST',
+                            data: this.plugins_thirdpartylogin_user,
+                            dataType: 'json',
+                            success: (res) => {
+                                if (res.data.code == 0) {
+                                    uni.hideLoading();
+                                    uni.setStorageSync(app.globalData.data.cache_user_info_key, res.data.data);
+                                    this.success_back_handle(res);
+                                } else {
+                                    uni.hideLoading();
+                                    this.setData({
+                                        form_submit_loading: false,
+                                    });
+                                    app.globalData.showToast(res.data.msg);
+                                }
+                            },
+                            fail: () => {
+                                uni.hideLoading();
+                                this.setData({
+                                    form_submit_loading: false,
+                                });
+                                app.globalData.showToast(this.$t('common.internet_error_tips'));
+                            },
+                        });
+                    } else {
+                        uni.hideLoading();
+                        this.success_back_handle(res);
+                    }
+                } else {
+                    uni.hideLoading();
+                    this.setData({
+                        form_submit_loading: false,
+                    });
+                    app.globalData.showToast(res.data.msg);
+                }
+            },
+
+            // 成功后处理
+            success_back_handle(res) {
+                var self = this;
+                var msg = (this.plugins_thirdpartylogin_is_call_app == 1) ? this.$t('login.login.87yui2') : res.data.msg;
+                app.globalData.showToast(msg, 'success');
+                var event_callback = this.params.event_callback || null;
+                setTimeout(function () {
+                    var pages = getCurrentPages();
+                    if (pages.length > 1) {
+                        // 触发回调函数
+                        if (event_callback != null) {
+                            if ((pages[pages.length - 2][event_callback] || null) != null) {
+                                pages[pages.length - 2][event_callback]();
+                            }
+                        }
+                        // 默认返回上一页
+                        uni.navigateBack();
+                    } else {
+                        // 仅一个页面则执行成功返回
+                        self.success_event();
+                    }
+                }, 1000);
+            },
+
+            // 协议事件
+            agreement_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value == null) {
+                    app.globalData.showToast(this.$t('login.login.4wc3hr'));
+                    return false;
+                }
+
+                // 是否存在协议 url 地址
+                var key = 'agreement_' + value + '_url';
+                var url = app.globalData.get_config('config.' + key) || null;
+                if (url == null) {
+                    app.globalData.showToast(this.$t('login.login.x0nxxf'));
+                    return false;
+                }
+
+                // 打开 webview
+                app.globalData.open_web_view(url);
+            },
+
+            // 协议改变
+            agreement_change(e) {
+                this.setData({
+                    agreement_status: !this.agreement_status,
+                });
+            },
+
+            // 表单类型事件
+            opt_form_event(e) {
+                var value = e.currentTarget.dataset.value;
+                // 手机或邮箱更换绑定来源则直接返回
+                var is_verify = (this.params.opt_form || null) != null && (this.params.opt_form == 'bind_verify' || this.params.opt_form == 'bind_email');
+                var is_no_bind_mobile = this.common_user_onekey_bind_mobile_list.length == 0 || this.common_user_onekey_bind_mobile_list.indexOf(this.client_value) == -1;
+                if (value == 'bind' && (is_verify || is_no_bind_mobile)) {
+                    uni.navigateBack();
+                }
+
+                // 设置数据
+                var data = {
+                    current_opt_form: value,
+                };
+
+                // 小程序使用授权自动登录
+                // 切换手机绑定方式
+                if (value == 'auth' || value == 'bind') {
+                    data['current_opt_type'] = value;
+                }
+
+                // 密码找回同时设置表单类型
+                if (value == 'forget') {
+                    data['current_opt_type'] = 'forget';
+                    if (this.common_img_verify_state == 1) {
+                        this.image_verify_event('user_forget');
+                    }
+                }
+
+                // 开启登录则取第一个
+                if (value == 'login' && this.home_user_login_type.length > 0) {
+                    data['current_opt_type'] = 'login_' + this.home_user_login_type[0];
+                    // 是否开启图片验证码
+                    if (this.home_user_login_img_verify_state == 1 || this.common_img_verify_state == 1) {
+                        this.image_verify_event('user_login');
+                    }
+                }
+
+                // 开启注册则取第一个
+                if (value == 'reg' && this.home_user_reg_type.length > 0) {
+                    data['current_opt_type'] = 'reg_' + this.home_user_reg_type[0];
+                    // 是否开启图片验证码
+                    if (this.home_user_register_img_verify_state == 1 || this.common_img_verify_state == 1) {
+                        this.image_verify_event('user_reg');
+                    }
+                }
+                this.setData(data);
+
+                // 标题
+                if ((data.current_opt_type || null) != null) {
+                    this.setData({
+                        navigation_bar_title_key: data.current_opt_type,
+                    });
+                    this.set_navigation_bar_title();
+                }
+            },
+
+            // 操作类型事件
+            opt_type_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value != null) {
+                    this.setData({
+                        current_opt_type: value,
+                    });
+
+                    // 图片验证码
+                    if (value == 'login_username' && this.home_user_login_img_verify_state == 1) {
+                        this.image_verify_event('user_login');
+                    }
+                    if ((value == 'login_sms' || value == 'login_email') && this.common_img_verify_state == 1) {
+                        this.image_verify_event('user_login');
+                    }
+                    if (value == 'reg_username' && this.home_user_register_img_verify_state == 1) {
+                        this.image_verify_event('user_reg');
+                    }
+                    if ((value == 'reg_sms' || value == 'reg_email') && this.common_img_verify_state == 1) {
+                        this.image_verify_event('user_reg');
+                    }
+
+                    // 标题
+                    this.setData({
+                        navigation_bar_title_key: value,
+                    });
+                    this.set_navigation_bar_title();
+                }
+            },
+
+            // 导航名称设置
+            set_navigation_bar_title() {
+                // 重新设置静态资源
+                this.set_resources_data();
+                // 设置这标题
+                uni.setNavigationBarTitle({
+                    title: this.current_opt_type_title[this.navigation_bar_title_key],
+                });
+            },
+
+            // 图片验证码事件
+            image_verify_event(e) {
+                var type = typeof e == 'string' ? e : e.currentTarget.dataset.type || null;
+                if (type !== null) {
+                    var tv = app.globalData.get_timestamp();
+                    var url = app.globalData.get_request_url('userverifyentry', 'user', '', 'type=' + type + '&t=' + tv);
+                    this.setData({
+                        verify_image_url: url,
+                    });
+                }
+            },
+
+            // 缓存数据刷新
+            cache_refresh_event(e) {
+                app.globalData.init_config();
+                var self = this;
+                uni.showLoading({
+                    title: this.$t('common.loading_in_text'),
+                });
+                setTimeout(function () {
+                    self.init();
+                    uni.hideLoading();
+                }, 3000);
+            },
+
+            // 第三方登录事件
+            plugins_thirdpartylogin_event(e) {
+                // 是否已同意协议
+                if (!this.agreement_status) {
+                    app.globalData.showToast(this.$t('login.login.btu2c1'));
+                    return false;
+                }
+                this.setData({
+                    popup_login_status: false,
+                });
+
+                // 调用登录处理
+                this.plugins_thirdpartylogin_handle(e.currentTarget.dataset.type);
+            },
+            
+            // 第三方登录处理
+            plugins_thirdpartylogin_handle(type) {            
+                // #ifdef H5
+                // 直接跳转到登录地址、这里还可以根据终端类型进行处理业务逻辑
+                for(var i in this.plugins_thirdpartylogin_data) {
+                    if(type == i) {
+                        window.location.href = this.plugins_thirdpartylogin_data[i]['login_url'];
+                    }
+                }
+                // #endif
+
+                // #ifdef APP
+                let self = this;
+                switch (type) {
+                    // 微信、QQ、谷歌
+                    case 'weixin':
+                    case 'qq':
+                    case 'google':
+                        uni.login({
+                            provider: type,
+                            success: function (res) {
+                                let auth_result = res.authResult;
+                                self.app_login_bind_handle(
+                                    {
+                                        ...auth_result,
+                                        ...{
+                                            platform: type,
+                                            openid: auth_result.openid,
+                                            access_token: auth_result.access_token,
+                                        },
+                                    },
+                                    auth_result
+                                );
+                            },
+                            fail: function (error) {
+                                app.globalData.showToast(error.errMsg+'('+error.code+')');
+                            },
+                        });
+                        break;
+            
+                    // 苹果
+                    case 'apple':
+                        uni.login({
+                            provider: type,
+                            success: function (res) {
+                                let auth_result = res.appleInfo || res.userInfo;
+                                self.app_login_bind_handle(
+                                    {
+                                        ...auth_result,
+                                        ...{
+                                            platform: type,
+                                            openid: auth_result.openId || auth_result.user,
+                                            access_token: auth_result.access_token || '',
+                                        },
+                                    },
+                                    auth_result
+                                );
+                            },
+                            fail: function (error) {
+                                app.globalData.showToast(error.errMsg+'('+error.code+')');
+                            },
+                        });
+                        break;
+            
+                    default:
+                        app.globalData.showToast(type + this.$t('login.login.li9573'));
+                }
+                // #endif
+            },
+
+            // 登录回处理
+            app_login_bind_handle(post_data, auth_result) {
+                uni.showLoading({
+                    title: this.$t('common.loading_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('bind', 'index', 'thirdpartylogin'),
+                    method: 'POST',
+                    data: post_data,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            var user = { ...auth_result, ...res.data.data };
+                            // 设置当前第三方登录用户数据
+                            this.setData({
+                                plugins_thirdpartylogin_user: user,
+                            });
+
+                            // 不需要绑定账号、则成功
+                            if ((user.is_force_bind_user || 0) != 1) {
+                                this.setData({
+                                    user: user,
+                                });
+
+                                // 缓存当前用户数据
+                                uni.setStorageSync(app.globalData.data.cache_user_info_key, user);
+
+                                // 成功回调
+                                this.success_back_handle(res);
+                            }
+
+                            // 重新初始化
+                            this.init();
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: (res) => {
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 第三方登录绑定账号取消
+            plugins_thirdpartylogin_cancel_event(e) {
+                app.globalData.url_open('/pages/login/login', true);
+            },
+
+            // 成功返回
+            success_event(e) {
+                var url = this.prev_page == null ? app.globalData.app_tabbar_pages()[0] : this.prev_page;
+                app.globalData.url_open(url, true);
+            },
+
+            // 返回首页
+            back_event() {
+                app.globalData.page_back_prev_event();
+            },
+
+            // 打开语言选择弹窗
+            open_language_event() {
+                this.setData({
+                    popup_language_status: !this.popup_language_status,
+                });
+            },
+
+            // 关闭语言弹窗
+            popup_language_close_event() {
+                this.setData({
+                    popup_language_status: false,
+                });
+            },
+
+            // 选择语言
+            checked_language_event(e) {
+                this.setData({
+                    language_key: e.currentTarget.dataset.key,
+                });
+            },
+
+            // 提交语言选择
+            popup_sub_language_event() {
+                this.language_change(this.language_key);
+                var language_list = this.$t('language');
+                this.setData({
+                    language_list: language_list,
+                    language: language_list[this.language_key],
+                    popup_language_status: false,
+                });
+                // 重新设置当前页面标题
+                this.set_navigation_bar_title();
+                // 重新读取数据配置
+                app.globalData.init_config();
+            },
+
+            // 多语言切换
+            language_change(key) {
+                uni.setLocale(key);
+                this.$i18n.locale = key;
+            },
+
+            // 打开登录方式弹层
+            popup_login_open_event() {
+                // 是否已同意协议
+                if (!this.agreement_status) {
+                    app.globalData.showToast(this.$t('login.login.btu2c1'));
+                    return false;
+                }
+                this.setData({
+                    popup_login_status: true,
+                });
+            },
+
+            // 关闭登录方式弹层
+            popup_login_close_event() {
+                this.setData({
+                    popup_login_status: false,
+                });
+            },
+
+            // 获取app第三方登录通道
+            provider_action() {
+                uni.getProvider({
+                    service: 'oauth',
+                    success: (result) => {
+                        this.setData({
+                            app_login_provider_list: result.provider || [],
+                        });
+                    },
+                    fail: (error) => {},
+                });
+            },
+        },
+    };
+</script>
+<style>
+    @import './login.css';
+</style>
diff --git a/pages/logout/logout.css b/pages/logout/logout.css
new file mode 100644
index 0000000..f8ec71f
--- /dev/null
+++ b/pages/logout/logout.css
@@ -0,0 +1,3 @@
+.bottom-fixed button {
+    width: calc(50% - 10rpx);
+}
\ No newline at end of file
diff --git a/pages/logout/logout.vue b/pages/logout/logout.vue
new file mode 100644
index 0000000..a00dffe
--- /dev/null
+++ b/pages/logout/logout.vue
@@ -0,0 +1,166 @@
+<template>
+    <view :class="theme_view">
+        <scroll-view :scroll-y="true" class="scroll-box bg-white">
+            <view class="page-bottom-fixed">
+                <block v-if="data_list_loding_status == 3">
+                    <view class="padding-main">
+                        <view class="">
+                            <mp-html :content="agreement_data.value" />
+                        </view>
+                        <view class="bottom-fixed" :style="bottom_fixed_style">
+                            <view class="bottom-line-exclude">
+                                <button class="item bg-grey br-grey cr-base round text-size fl" type="default" size="mini" hover-class="none" @tap="logout_submit_event">{{$t('logout.logout.u10002')}}</button>
+                                <button class="item bg-main br-main cr-white round text-size fr" type="default" size="mini" hover-class="none" @tap="logout_cancel_event">{{$t('common.cancel')}}</button>
+                            </view>
+                        </view>
+                    </view>
+                </block>
+
+                <!-- 错误提示 -->
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </view>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                bottom_fixed_style: '',
+                agreement_data: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        methods: {
+            // 获取数据
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_list_loding_msg: this.$t('setup.setup.nwt4o1'),
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'agreement'),
+                    method: 'POST',
+                    data: { document: 'userlogout' },
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            this.setData({
+                                data_list_loding_status: 3,
+                                agreement_data: res.data.data || {},
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                        }
+                    },
+                    fail: () => {
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 注销提交
+            logout_submit_event(e) {
+                // 是否再次确认
+                if (e.alert_status != 0 && e.alert_status != 1) {
+                    app.globalData.alert({
+                        msg: this.$t('logout.logout.9vfzz4'),
+                        is_show_cancel: 1,
+                        object: this,
+                        method: 'logout_submit_event',
+                    });
+                    return false;
+                }
+
+                // 注销提交
+                if (e.alert_status == 1) {
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('logout', 'safety'),
+                        method: 'POST',
+                        data: {},
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.remove_user_cache_event();
+                                app.globalData.showToast(res.data.msg, 'success');
+                                setTimeout(function () {
+                                    app.globalData.url_open(app.globalData.app_tabbar_pages()[0]);
+                                }, 1500);
+                            } else {
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 取消返回
+            logout_cancel_event() {
+                app.globalData.page_back_prev_event();
+            },
+        },
+    };
+</script>
+<style>
+    @import './logout.css';
+</style>
diff --git a/pages/message/message.vue b/pages/message/message.vue
new file mode 100644
index 0000000..1e5afcd
--- /dev/null
+++ b/pages/message/message.vue
@@ -0,0 +1,193 @@
+<template>
+    <view :class="theme_view">
+        <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="padding-main border-radius-main bg-white oh spacing-mb">
+                    <view class="oh">
+                        <text class="fw-b">{{item.title}}</text>
+                        <text class="fr cr-base">{{item.add_time_time}}</text>
+                    </view>
+                    <view class="cr-grey margin-top-lg">{{item.detail}}</view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0
+            };
+        },
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false
+                    });
+                }
+            },
+
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if(this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1
+                });
+                
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+                
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("index", "message"),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page
+                    },
+                    dataType: 'json',
+                    success: res => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0
+                                });
+                                
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total)
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_is_loading: 0
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    }
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            }
+        }
+    };
+</script>
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/password/password.css b/pages/password/password.css
new file mode 100644
index 0000000..92782ee
--- /dev/null
+++ b/pages/password/password.css
@@ -0,0 +1,20 @@
+.password {
+    height: 100vh;
+    background: #fff;
+}
+
+.password .form-item {
+    height: 100rpx;
+    line-height: 100rpx;
+    background: #F9F9F9;
+    border-radius: 50rpx;
+    border: 0;
+    padding: 0 36rpx;
+    font-size: 30rpx;
+}
+
+.eyes {
+    right: 32rpx;
+    top: calc(50% - 12rpx);
+    z-index: 2;
+}
\ No newline at end of file
diff --git a/pages/password/password.vue b/pages/password/password.vue
new file mode 100644
index 0000000..4464cc5
--- /dev/null
+++ b/pages/password/password.vue
@@ -0,0 +1,157 @@
+<template>
+    <view :class="theme_view">
+        <!-- 主体内容 -->
+        <block v-if="data_list_loding_status == 3">
+            <view class="password">
+                <view class="padding-main">
+                    <form @submit="form_bind_pwd">
+                        <view class="margin-top-xxxl">
+                            <view class="pr">
+                                <input type="text" :placeholder="$t('password.password.4e24j1')" minlength="6" maxlength="18" name="my_pwd" :password="!eyes1" class="form-item margin-bottom-main" />
+                                <view class="eyes pa" data-index="1" @tap="eyes_event"><iconfont :name="eyes1 ? 'icon-wodeqianbao-eye' : 'icon-eye-half'" color="#666" size="32rpx"></iconfont></view>
+                            </view>
+                            <view class="pr">
+                                <input type="text" :placeholder="$t('password.password.1lwiaz')" minlength="6" maxlength="18" name="new_pwd" :password="!eyes2" class="form-item margin-bottom-main" />
+                                <view class="eyes pa" data-index="2" @tap="eyes_event"><iconfont :name="eyes2 ? 'icon-wodeqianbao-eye' : 'icon-eye-half'" color="#666" size="32rpx"></iconfont></view>
+                            </view>
+                            <view class="pr">
+                                <input type="text" :placeholder="$t('password.password.338433')" minlength="6" maxlength="18" name="confirm_new_pwd" :password="!eyes3" class="form-item margin-bottom-main" />
+                                <view class="eyes pa" data-index="3" @tap="eyes_event"><iconfont :name="eyes3 ? 'icon-wodeqianbao-eye' : 'icon-eye-half'" color="#666" size="32rpx"></iconfont></view>
+                            </view>
+                        </view>
+                        <view class="margin-top-xxxxl tc">
+                            <button class="bg-main br-main cr-white round text-size" form-type="submit" type="default" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">{{$t('password.password.xyekjf')}}</button>
+                        </view>
+                    </form>
+                </view>
+            </view>
+        </block>
+        <block v-else>
+            <!-- 错误提示 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                form_submit_loading: false,
+                // 是否显示密码
+                eyes1: false,
+                eyes2: false,
+                eyes3: false,
+            };
+        },
+        components: {
+            componentCommon,
+            componentNoData
+        },
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.setData({
+                        data_list_loding_status: 3,
+                        user: user,
+                    });
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_list_loding_msg: this.$t('setup.setup.nwt4o1'),
+                    });
+                }
+            },
+            eyes_event(e) {
+                if (e.currentTarget.dataset.index == '1') {
+                    this.setData({
+                        eyes1: !this.eyes1,
+                    });
+                } else if (e.currentTarget.dataset.index == '2') {
+                    this.setData({
+                        eyes2: !this.eyes2,
+                    });
+                } else {
+                    this.setData({
+                        eyes3: !this.eyes3,
+                    });
+                }
+            },
+
+            // 绑定表单
+            form_bind_pwd(e) {
+                // 数据验证
+                var validation = [
+                    { fields: 'my_pwd', msg: this.$t('login.login.277w03') },
+                    { fields: 'new_pwd', msg: this.$t('password.password.1lwiaz') },
+                    { fields: 'confirm_new_pwd', msg: this.$t('password.password.3pp6t7') },
+                ];
+                if (app.globalData.fields_check(e.detail.value, validation)) {
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    this.setData({
+                        form_submit_loading: true,
+                    });
+
+                    // 网络请求
+                    uni.request({
+                        url: app.globalData.get_request_url('loginpwdupdate', 'safety'),
+                        method: 'POST',
+                        data: e.detail.value,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_loading: false,
+                            });
+                            app.globalData.showToast(res.data.msg, 'success');
+                            if (res.data.code == 0) {
+                                setTimeout(() => {
+                                    // 默认返回上一页
+                                    uni.navigateBack();
+                                }, 1500);
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_loading: false,
+                            });
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+        },
+    };
+</script>
+<style>
+    @import './password.css';
+</style>
diff --git a/pages/paytips/paytips.css b/pages/paytips/paytips.css
new file mode 100644
index 0000000..cfb7837
--- /dev/null
+++ b/pages/paytips/paytips.css
@@ -0,0 +1,21 @@
+page {
+    background: #fff;
+}
+.content {
+    padding-top: 15%;
+}
+.content .pay-icon {
+    width: 200rpx;
+    height: 200rpx !important;
+    margin: 60rpx auto;
+}
+.btn-box {
+    margin-top: 150rpx;
+}
+.btn-box button {
+    height: 80rpx;
+    line-height: 80rpx;
+    padding-top: 0;
+    padding-bottom: 0;
+    width: 300rpx;
+}
\ No newline at end of file
diff --git a/pages/paytips/paytips.vue b/pages/paytips/paytips.vue
new file mode 100644
index 0000000..c47c732
--- /dev/null
+++ b/pages/paytips/paytips.vue
@@ -0,0 +1,120 @@
+<template>
+    <view :class="theme_view">
+        <view class="content tc">
+            <image class="pay-icon dis-block" v-if="params.code == '9000'" mode="widthFix" :src="default_round_success_icon"></image>
+            <image class="pay-icon dis-block" v-else mode="widthFix" :src="default_round_error_icon"></image>
+            <view class="text-size-lg cr-base">{{ params.msg || $t('paytips.paytips.679rxu') }}</view>
+        </view>
+        <view class="btn-box tc">
+            <view>
+                <button class="bg-main br-main cr-white round" type="default" hover-class="none" size="mini" @tap="back_event">{{$t('common.return')}}</button>
+            </view>
+            <view class="margin-top-lg">
+                <button class="bg-main-pair br-main-pair cr-white round" type="default" hover-class="none" size="mini" data-redirect="1" :data-value="default_to_url" @tap="url_event">{{ params.title || $t('paytips.paytips.jifuu8') }}</button>
+            </view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import base64 from '@/common/js/lib/base64.js';
+    import componentCommon from '@/components/common/common';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                params: {},
+                default_round_success_icon: app.globalData.data.default_round_success_icon,
+                default_round_error_icon: app.globalData.data.default_round_error_icon,
+                default_to_url: '',
+            };
+        },
+        components: {
+            componentCommon
+        },
+
+        /**
+         * 页面加载初始化
+         */
+        onLoad(params) {
+            // 参数处理
+            if((params || null) != null) {
+                params = JSON.parse(base64.decode(decodeURIComponent(params.params)));
+            }
+
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 根据状态处理
+            var msg = null;
+            switch (params.code) {
+                // 支付成功
+                case '9000':
+                    msg = this.$t('paytips.paytips.679rxu');
+                    break;
+                // 正在处理中
+                case '8000':
+                    msg = this.$t('paytips.paytips.d8m853');
+                    break;
+                // 支付失败
+                case '4000':
+                    msg = this.$t('paytips.paytips.6y488i');
+                    break;
+                // 用户中途取消
+                case '6001':
+                    msg = this.$t('paytips.paytips.e732we');
+                    break;
+                // 网络连接出错
+                case '6002':
+                    msg = this.$t('paytips.paytips.13v11t');
+                    break;
+                // 支付结果未知（有可能已经支付成功），请查询商户订单列表中订单的支付状态
+                case '6004':
+                    msg = this.$t('paytips.paytips.u1153p');
+                    break;
+                // 用户点击忘记密码导致快捷界面退出(only iOS)
+                case '99':
+                    msg = this.$t('paytips.paytips.6mpsl7');
+                    break;
+                // 默认错误
+                default:
+                    msg = this.$t('paytips.paytips.59u769');
+            }
+            params['msg'] = msg;
+            this.setData({
+                params: params,
+                default_to_url: params.page || app.globalData.app_tabbar_pages()[0],
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        methods: {
+            // 返回
+            back_event(e) {
+                app.globalData.page_back_prev_event();
+            },
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+        },
+    };
+</script>
+<style>
+    @import './paytips.css';
+</style>
diff --git a/pages/personal/personal.css b/pages/personal/personal.css
new file mode 100644
index 0000000..2c8e3fe
--- /dev/null
+++ b/pages/personal/personal.css
@@ -0,0 +1,11 @@
+.user-avatar {
+    width: 80rpx;
+    height: 80rpx !important;
+}
+
+/**
+ * 表单排版
+ */
+.form-container .form-gorup:not(:last-child) {
+    border-bottom: 2rpx solid #F5F5F5;
+}
\ No newline at end of file
diff --git a/pages/personal/personal.vue b/pages/personal/personal.vue
new file mode 100644
index 0000000..55aaf9a
--- /dev/null
+++ b/pages/personal/personal.vue
@@ -0,0 +1,266 @@
+<template>
+    <view :class="theme_view">
+        <view class="page-bottom-fixed">
+            <!-- 主体内容 -->
+            <block v-if="data_list_loding_status == 3">
+                <form @submit="form_submit" class="form-container">
+                    <view class="padding-main page-bottom-fixed">
+                        <view class="bg-white border-radius-main oh">
+                            <view class="form-gorup oh flex-row jc-sb align-c">
+                                <view>{{$t('personal.personal.cw1d8p')}}</view>
+                                <view class="flex-row align-c">
+                                    <button class="bg-white br-0 lh-0 padding-horizontal-sm" hover-class="none" open-type="chooseAvatar" @chooseavatar="choose_avatar_event" @tap="choose_avatar_event">
+                                        <image :src="user_data.avatar || default_avatar" mode="widthFix" class="circle br user-avatar flex-1 flex-width"></image>
+                                    </button>
+                                    <iconfont name="icon-arrow-right" size="34rpx" color="#ccc"></iconfont>
+                                </view>
+                            </view>
+
+                            <view class="form-gorup oh flex-row jc-sb align-c">
+                                <view class="form-gorup-title">{{$t('personal.personal.gw8br3')}}<text class="form-group-tips-must">*</text></view>
+                                <view class="flex-row align-c flex-1 flex-width">
+                                    <input :type="application_client_type == 'weixin' ? 'nickname' : 'text'" name="nickname" :value="user_data.nickname || ''" maxlength="16" placeholder-class="cr-grey-9 tr" class="cr-base tr margin-right-sm" :placeholder="$t('personal.personal.44112i')" />
+                                </view>
+                            </view>
+
+                            <view class="form-gorup oh flex-row jc-sb align-c">
+                                <view class="form-gorup-title">{{$t('personal.personal.jibx42')}}</view>
+                                <view class="flex-1 flex-width flex-row jc-e align-c">
+                                    <picker class="margin-right-sm wh-auto tr" name="birthday" mode="date" :value="user_data.birthday || ''" data-field="birthday" @change="select_change_event">
+                                        <view :class="'picker ' + ((user_data.birthday || null) == null ? 'cr-grey' : '')">{{ user_data.birthday || $t('personal.personal.85404s') }}</view>
+                                    </picker>
+                                    <iconfont name="icon-arrow-right" size="34rpx" color="#ccc"></iconfont>
+                                </view>
+                            </view>
+
+                            <view class="form-gorup oh flex-row jc-sb align-c">
+                                <view class="form-gorup-title">{{$t('personal.personal.6m33c4')}}</view>
+                                <view class="flex-row align-c flex-1 flex-width">
+                                    <input type="text" name="address" :value="user_data.address || ''" maxlength="30" placeholder-class="cr-grey-9 tr" class="cr-base tr margin-right-sm" :placeholder="$t('personal.personal.re674n')" />
+                                </view>
+                            </view>
+
+                            <view class="form-gorup oh flex-row jc-sb align-c">
+                                <view class="form-gorup-title">{{$t('personal.personal.x2fofv')}}</view>
+                                <view class="flex-row jc-e align-c flex-1 flex-width">
+                                    <picker @change="select_change_event" :value="user_data.gender || ''" :range="gender_list" range-key="name" name="gender" data-field="gender" class="margin-right-sm wh-auto tr">
+                                        <view class="uni-input cr-base picker">{{ gender_list[user_data.gender].name || '' }}</view>
+                                    </picker>
+                                    <iconfont name="icon-arrow-right" size="34rpx" color="#ccc"></iconfont>
+                                </view>
+                            </view>
+                        </view>
+
+                        <view class="bottom-fixed" :style="bottom_fixed_style">
+                            <view class="bottom-line-exclude">
+                                <button class="item bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :disabled="form_submit_disabled_status">{{$t('common.save')}}</button>
+                            </view>
+                        </view>
+                    </view>
+                </form>
+            </block>
+
+            <!-- 错误提示 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                application_client_type: app.globalData.application_client_type(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                bottom_fixed_style: '',
+                form_submit_disabled_status: false,
+                default_avatar: app.globalData.data.default_user_head_src,
+                user_data: {},
+                gender_list: [],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        methods: {
+            // 获取数据
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_list_loding_msg: this.$t('setup.setup.nwt4o1'),
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'personal'),
+                    method: 'POST',
+                    data: {lang_can_key: 'gender_list'},
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            this.setData({
+                                data_list_loding_status: 3,
+                                user_data: res.data.data.data || {},
+                                gender_list: res.data.data.gender_list || [],
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                        }
+                    },
+                    fail: () => {
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 生日、性别选择事件
+            select_change_event(e) {
+                var temp = this.user_data;
+                temp[e.currentTarget.dataset.field] = e.detail.value;
+                this.setData({ user_data: temp });
+            },
+
+            // 头像事件
+            choose_avatar_event(e) {
+                var self = this;
+                if (this.application_client_type == 'weixin') {
+                    self.upload_handle(e.detail.avatarUrl);
+                } else {
+                    uni.chooseImage({
+                        count: 1,
+                        success(res) {
+                            if (res.tempFilePaths.length > 0) {
+                                self.upload_handle(res.tempFilePaths[0]);
+                            }
+                        },
+                    });
+                }
+            },
+
+            // 上传处理
+            upload_handle(image) {
+                var self = this;
+                uni.uploadFile({
+                    url: app.globalData.get_request_url('useravatarupload', 'personal'),
+                    filePath: image,
+                    name: 'file',
+                    formData: {},
+                    success: function (res) {
+                        if (res.statusCode == 200) {
+                            var data = typeof res.data == 'object' ? res.data : JSON.parse(res.data);
+                            if (data.code == 0) {
+                                var temp = self.user_data;
+                                temp['avatar'] = data.data;
+                                self.setData({ user_data: temp });
+                            } else {
+                                app.globalData.showToast(data.msg);
+                            }
+                        }
+                    },
+                });
+            },
+
+            // 数据提交
+            form_submit(e) {
+                // 表单数据
+                var form_data = e.detail.value;
+                // 头像
+                form_data['avatar'] = this.user_data.avatar || '';
+                // 生日
+                form_data['birthday'] = this.user_data.birthday || '';
+                // 性别
+                form_data['gender'] = this.user_data.gender || 0;
+
+                // 数据保存
+                this.setData({
+                    form_submit_disabled_status: true,
+                });
+                uni.showLoading({
+                    title: this.$t('common.processing_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('save', 'personal'),
+                    method: 'POST',
+                    data: form_data,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        this.setData({
+                            form_submit_disabled_status: false,
+                        });
+                        if (res.data.code == 0) {
+                            uni.setStorageSync(app.globalData.data.cache_user_info_key, res.data.data);
+                            app.globalData.showToast(res.data.msg, 'success');
+                            setTimeout(function () {
+                                uni.navigateBack();
+                            }, 1000);
+                        } else {
+                            if (app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            } else {
+                                app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        this.setData({
+                            form_submit_disabled_status: false,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+        },
+    };
+</script>
+<style>
+    @import './personal.css';
+</style>
diff --git a/pages/plugins/activity/detail/detail.css b/pages/plugins/activity/detail/detail.css
new file mode 100644
index 0000000..fc34e99
--- /dev/null
+++ b/pages/plugins/activity/detail/detail.css
@@ -0,0 +1,17 @@
+/**
+* 基础
+*/
+.base-container {
+    height: 280rpx;
+    background-size: cover;
+    background-position: center;
+}
+.base-container .text {
+    top: 0;
+    left: 0;
+    background: rgb(0 0 0 / 35%);
+    padding: 100rpx 20rpx 20rpx 20rpx;
+}
+.word-content .word-icon:not(:last-child) {
+    margin-right: 20rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/activity/detail/detail.vue b/pages/plugins/activity/detail/detail.vue
new file mode 100644
index 0000000..bac657f
--- /dev/null
+++ b/pages/plugins/activity/detail/detail.vue
@@ -0,0 +1,193 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data || null) != null">
+            <view class="padding-horizontal-main padding-top-main">
+                <!-- 基础信息 -->
+                <view class="base-container tc pr padding-main border-radius-main bg-main oh spacing-mb" :style="'background-color:' + data.color + ' !important;background-image:url(' + (data.banner || data.cover) + ')'">
+                    <view v-if="(data.describe || null) != null" class="text cr-white pa bs-bb text-size wh-auto ht-auto">{{ data.describe }}</view>
+                </view>
+
+                <!-- 关键字 -->
+                <view v-if="data.keywords_arr.length > 0" class="word-content scroll-view-horizontal margin-bottom-sm">
+                    <scroll-view scroll-x>
+                        <block v-for="(kv, ki) in data.keywords_arr" :key="ki">
+                            <text :data-value="'/pages/goods-search/goods-search?keywords=' + kv" @tap="url_event" class="word-icon dis-inline-block bg-main-light text-size-xs cr-main round padding-top-xs padding-bottom-xs padding-left padding-right cp">{{ kv }}</text>
+                        </block>
+                    </scroll-view>
+                </view>
+
+                <!-- 推荐商品 -->
+                <view v-if="(data.goods_list || null) != null && data.goods_list.length > 0">
+                    <view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                        <view class="title-left">
+                            <text class="text-wrapper title-left-border">{{$t('detail.detail.b4f3nw')}}</text>
+                            <text class="vice-name margin-left-lg cr-grey">{{ data.vice_title }}</text>
+                        </view>
+                        <text data-value="/pages/plugins/activity/index/index" @tap="url_event" class="arrow-right padding-right cr-grey cp">{{$t('detail.detail.ans2p4')}}</text>
+                    </view>
+                    <component-goods-list :propData="{ style_type: 1, goods_list: data.goods_list }" :propCurrencySymbol="currency_symbol"></component-goods-list>
+                </view>
+                <view v-else>
+                    <!-- 提示信息 -->
+                    <component-no-data propStatus="0" :propMsg="$t('detail.detail.5knxg6')"></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>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentGoodsList from '@/components/goods-list/goods-list';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                currency_symbol: app.globalData.currency_symbol(),
+                params: null,
+                user: null,
+                data_base: null,
+                data: null,
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentGoodsList,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 初始化配置
+            this.init_config();
+
+            // 获取数据
+            this.get_data();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        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');
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('detail', 'index', 'activity'),
+                    method: 'POST',
+                    data: {
+                        id: this.params.id || 0,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_base: data.base || null,
+                                data: data.data || null,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: (data.data || null) != null && (data.data.goods_list || null) != null && data.data.goods_list.length > 0,
+                            });
+
+                            if ((this.data || null) != null) {
+                                // 基础自定义分享
+                                this.setData({
+                                    share_info: {
+                                        title: this.data.seo_title || this.data.title,
+                                        desc: this.data.seo_desc || this.data.describe,
+                                        path: '/pages/plugins/activity/detail/detail',
+                                        query: 'id=' + this.data.id,
+                                        img: this.data.share_images || this.data.cover,
+                                    },
+                                });
+
+                                // 标题
+                                if ((this.data.title || null) != null) {
+                                    uni.setNavigationBarTitle({
+                                        title: this.data.title,
+                                    });
+                                }
+                            }
+                        } 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: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import './detail.css';
+</style>
diff --git a/pages/plugins/activity/index/index.css b/pages/plugins/activity/index/index.css
new file mode 100644
index 0000000..0e15393
--- /dev/null
+++ b/pages/plugins/activity/index/index.css
@@ -0,0 +1,12 @@
+/**
+* 数据列表
+*/
+.data-list {
+    display: flex;
+    flex-flow: row wrap;
+    justify-content: space-between;
+}
+
+.data-list .item {
+    width: calc(50% - 10rpx);
+}
\ No newline at end of file
diff --git a/pages/plugins/activity/index/index.vue b/pages/plugins/activity/index/index.vue
new file mode 100644
index 0000000..59fa306
--- /dev/null
+++ b/pages/plugins/activity/index/index.vue
@@ -0,0 +1,287 @@
+<template>
+    <view :class="theme_view">
+        <!-- 轮播 -->
+        <view v-if="slider_list.length > 0" class="padding-horizontal-main padding-top-main">
+            <component-banner :propData="slider_list" propSize="mini"></component-banner>
+        </view>
+
+        <!-- 分类 -->
+        <scroll-view v-if="(activity_category || null) != null && activity_category.length > 0" class="scroll-view-horizontal bg-white oh" scroll-x="true">
+            <view :class="'item cr-grey dis-inline-block padding-horizontal-main padding-top-main padding-bottom-sm ' + (nav_active_value == 0 ? 'cr-main nav-active-line bg-main-befor fw-b' : '')" @tap="nav_event" data-value="0">{{$t('common.all')}}</view>
+            <block v-for="(item, index) in activity_category" :key="index">
+                <view :class="'item cr-grey dis-inline-block padding-horizontal-main padding-top-main padding-bottom-sm ' + (nav_active_value == item.id ? 'cr-main nav-active-line bg-main-befor fw-b' : '')" @tap="nav_event" :data-value="item.id">{{ item.name }}</view>
+            </block>
+        </scroll-view>
+
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="30" :style="slider_list.length > 0 ? 'height:calc(100vh - 320rpx);' : ''">
+            <view v-if="(data_list || null) != null && data_list.length > 0" class="data-list padding-horizontal-main padding-top-main oh">
+                <block v-for="(item, index) in data_list" :key="index">
+                    <view :data-value="'/pages/plugins/activity/detail/detail?id=' + item.id" @tap="url_event" class="item oh cp spacing-mb">
+                        <image :src="item.cover" mode="widthFix" class="wh-auto border-radius-main"></image>
+                    </view>
+                </block>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentBanner from '@/components/slider/slider';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                params: null,
+                data_base: null,
+                slider_list: [],
+                activity_category: [],
+                nav_active_value: 0,
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentBanner,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+
+            // 数据加载
+            this.get_data();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            // 初始化
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'index', 'activity'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_base: data.base || null,
+                                slider_list: data.slider_list || [],
+                                activity_category: data.activity_category || [],
+                            });
+
+                            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/activity/index/index',
+                                    },
+                                });
+
+                                // 标题
+                                if ((this.data_base.application_name || null) != null) {
+                                    uni.setNavigationBarTitle({
+                                        title: this.data_base.application_name,
+                                    });
+                                }
+                            }
+
+                            // 获取列表数据
+                            this.get_data_list(1);
+                        } else {
+                            this.setData({
+                                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_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+
+            // 获取数据列表
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('datalist', 'index', 'activity'),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page,
+                        category_id: this.nav_active_value || 0,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            if (data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = data.data || [];
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: data.total,
+                                    data_page_total: data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_is_loading: 0,
+                                });
+                                if (this.data_page <= 1) {
+                                    this.setData({
+                                        data_list: [],
+                                        data_bottom_line_status: false,
+                                    });
+                                }
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                                data_is_loading: 0,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_active_value: e.currentTarget.dataset.value || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import './index.css';
+</style>
\ No newline at end of file
diff --git a/pages/plugins/allocation/cashier/cashier.css b/pages/plugins/allocation/cashier/cashier.css
new file mode 100644
index 0000000..72469d8
--- /dev/null
+++ b/pages/plugins/allocation/cashier/cashier.css
@@ -0,0 +1,6 @@
+.page {
+    height: 100vh;
+}
+.page > .content {
+    padding-top: 20%;
+}
\ No newline at end of file
diff --git a/pages/plugins/allocation/cashier/cashier.vue b/pages/plugins/allocation/cashier/cashier.vue
new file mode 100644
index 0000000..9581b9c
--- /dev/null
+++ b/pages/plugins/allocation/cashier/cashier.vue
@@ -0,0 +1,177 @@
+<template>
+    <view :class="theme_view">
+        <view class="page bg-white">
+            <view class="content padding-horizontal-main tc">
+                <block v-if="data_list_loding_status == 3">
+                    <view class="padding-vertical-xxxxl">
+                        <text class="cr-price fw-b text-size-lg">{{payment_currency_symbol}}</text>
+                        <text class="cr-price fw-b text-size-xxl">{{data.pay_price}}</text>
+                    </view>
+                    <view class="margin-top-sm padding-bottom-xxxxl">
+                        <view :class="'cr-'+(pay_status == 1 ? 'green' : (pay_status == 2 ? 'red' : 'grey'))">{{pay_msg}}</view>
+                    </view>
+                    <view v-if="pay_status == 2" class="margin-top-xxxxl padding-vertical-xxxxl">
+                        <button class="bg-green br-green cr-white round text-size-sm padding-horizontal-xxxxl" size="mini" hover-class="none" @tap="pay_handle">重新发起支付</button>
+                    </view>
+                </block>
+                <block v-else>
+                    <!-- 提示信息 -->
+                    <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+                </block>
+                
+                <view v-if="is_back_btn && pay_status != 0" class="margin-top-xxxxl padding-top-xxxxl tc">
+                    <button class="bg-white br-main cr-main round text-size-sm padding-horizontal-xxxxl" size="mini" hover-class="none" open-type="launchApp" app-parameter="wechat">返回APP</button>
+                </view>
+            </view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common" :propIsAppAdmin="false"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                payment_currency_symbol: app.globalData.currency_symbol(),
+                params: {},
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                scene: 0,
+                scene_back_arr: [1069, 1038, 1089, 1090, 1001, 1131, 1187],
+                is_back_btn: false,
+                data: {},
+                pay_status: 0,
+                pay_msg: '',
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData
+        },
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            params = app.globalData.launch_params_handle(params);
+            var scene = app.globalData.get_scene_data();
+            this.setData({
+                params: params,
+                scene: scene,
+                is_back_btn: this.scene_back_arr.indexOf(scene) != -1,
+            });
+
+            // 数据加载
+            this.get_data();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        methods: {
+            // // 初始化
+            get_data() {
+                var self = this;
+                var action = 'login';
+                // #ifdef MP-BAIDU
+                action = 'getLoginCode';
+                // #endif
+                uni[action]({
+                    success: (res) => {
+                        if (res.code) {
+                            uni.request({
+                                url: app.globalData.get_request_url("paydata", "cashier", "allocation"),
+                                method: 'POST',
+                                data: {...self.params, ...{authcode: res.code}},
+                                dataType: 'json',
+                                success: (res) => {
+                                    uni.stopPullDownRefresh();
+                                    if (res.data.code == 0 && (res.data.data || null) != null) {
+                                        this.setData({
+                                            data_list_loding_status: 3,
+                                            data_list_loding_msg: '',
+                                            data: res.data.data,
+                                        });
+                                    
+                                        // 直接调起支付
+                                        this.pay_handle();
+                                    } else {
+                                        this.setData({
+                                            data_list_loding_status: 0,
+                                            data_list_loding_msg: res.data.msg,
+                                        });
+                                    }
+                                },
+                                fail: () => {
+                                    uni.stopPullDownRefresh();
+                                    this.setData({
+                                        data_list_loding_status: 0,
+                                        data_list_loding_msg: self.$t('common.internet_error_tips'),
+                                    });
+                                },
+                            });
+                        }
+                    },
+                    fail: (e) => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 0,
+                            data_list_loding_msg: self.$t('login.login.3nmrg2'),
+                        });
+                    },
+                });
+            },
+
+            // 支付处理
+            pay_handle(e) {
+                if(this.pay_status != 1)
+                {
+                    this.setData({
+                        pay_status: 0,
+                        pay_msg: this.$t('common.payment_in_text'),
+                    });
+                    uni.requestPayment({
+                        timeStamp: this.data.pay_data.timeStamp,
+                        nonceStr: this.data.pay_data.nonceStr,
+                        package: this.data.pay_data.package,
+                        signType: this.data.pay_data.signType,
+                        paySign: this.data.pay_data.paySign,
+                        success: (res) => {
+                            this.setData({
+                                pay_status: 1,
+                                pay_msg: this.$t('paytips.paytips.679rxu'),
+                            });
+                        },
+                        fail: (res) => {
+                            this.setData({
+                                pay_status: 2,
+                                pay_msg: this.$t('paytips.paytips.6y488i'),
+                            });
+                        },
+                    });
+                }
+            }
+        }
+    };
+</script>
+<style>
+    @import './cashier.css';
+</style>
\ No newline at end of file
diff --git a/pages/plugins/antifakecode/index/index.css b/pages/plugins/antifakecode/index/index.css
new file mode 100644
index 0000000..7d7a51f
--- /dev/null
+++ b/pages/plugins/antifakecode/index/index.css
@@ -0,0 +1,19 @@
+/**
+ * 基础
+ */
+.page-content {
+    background: #fff;
+}
+.scan-button {
+    background: linear-gradient( 270deg, #F1E6C1 0%, #DBC583 100%);
+    max-width: 300rpx;
+}
+.scan-button text {
+    color: #CC2121;
+}
+/**
+ * 扫码按钮增加页面底部间距
+ */
+.page-bottom-fixed {
+    padding-bottom: 100rpx !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/antifakecode/index/index.vue b/pages/plugins/antifakecode/index/index.vue
new file mode 100644
index 0000000..1101471
--- /dev/null
+++ b/pages/plugins/antifakecode/index/index.vue
@@ -0,0 +1,151 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data || null) != null" :class="'page-content min-ht '+((user == null || data.status == -10000) ? 'page-bottom-fixed' : '')">
+            <block v-if="data.status == -10000">
+                <!-- 顶部banner -->
+                <image v-if="(data.data.scan_top_banner || null) != null" :src="data.data.scan_top_banner" mode="widthFix" class="dis-block wh-auto auto"></image>
+                <!-- 底部图片 -->
+                <image v-if="(data.data.scan_bottom_images || null) != null" :src="data.data.scan_bottom_images" mode="widthFix" class="dis-block wh-auto auto"></image>
+                <!-- 扫码 -->
+                <view class="pf left-0 bottom-xxxxl wh-auto tc padding-horizontal-main bs-bb">
+                    <view class="bottom-line-exclude">
+                        <button type="default" class="scan-button text-size-sm round" @tap="scan_event">
+                            <!-- #ifndef H5 -->
+                            <view class="va-m dis-inline-block margin-right-xs">
+                                <iconfont name="icon-scan" size="28rpx" propClass="lh-il va-m" color="#CC2121"></iconfont>
+                            </view>
+                            <!-- #endif -->
+                            <text class="va-m">{{$t('common.scan_name')}}</text>
+                        </button>
+                    </view>
+                </view>
+                <!-- 结尾 -->
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            </block>
+            <block v-else>
+                <!-- 领取成功 -->
+                <block v-if="data.status == 0">
+                    <image v-if="(data.data.scan_first_images || null) != null" :src="data.data.scan_first_images" mode="widthFix" class="dis-block wh-auto auto"></image>
+                    <view class="margin-vertical-xxxl tc">{{data.data.scan_first_tips}}</view>
+                </block>
+                <!-- 领取失败 -->
+                <block v-else-if="data.status == -100">
+                    <image v-if="(data.data.scan_last_images || null) != null" :src="data.data.scan_last_images" mode="widthFix" class="dis-block wh-auto auto"></image>
+                    <view class="margin-vertical-xxxl tc">{{data.data.scan_last_tips}}</view>
+                </block>
+                <!-- 其他错误 -->
+                <block v-else>
+                    <component-no-data propStatus="0" :propMsg="data.msg"></component-no-data>
+                </block>
+            </block>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                params: null,
+                data: null,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 获取数据
+            this.get_data();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        methods: {
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'index', 'antifakecode'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        var data = res.data.data || null;
+                        this.setData({
+                            data: data,
+                            data_list_loding_msg: '',
+                            data_list_loding_status: 0,
+                            data_bottom_line_status: true
+                        });
+                    },
+                    fail: () => {
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 扫码事件
+            scan_event() {
+                var self = this;
+                uni.scanCode({
+                    success: function (res) {
+                        if (res.result !== '') {
+                            var arr = ['/antifakecode-index-index-id-', 'plugins/index/pluginsname/antifakecode/pluginscontrol/index/pluginsaction/index/id/'];
+                            var ret = app.globalData.web_url_value_mate(res.result, arr);
+                            if (ret.status == 1 && ret.value != null) {
+                                var temp = self.params;
+                                temp['id'] = ret.value;
+                                self.setData({
+                                    params: temp
+                                });
+                                self.get_data();
+                            }
+                        }
+                    }
+                });
+            }
+        }
+    };
+</script>
+<style>
+    @import './index.css';
+</style>
\ No newline at end of file
diff --git a/pages/plugins/ask/comments/comments.vue b/pages/plugins/ask/comments/comments.vue
new file mode 100644
index 0000000..78d4c04
--- /dev/null
+++ b/pages/plugins/ask/comments/comments.vue
@@ -0,0 +1,129 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data || null) != null" class="padding-main bg-white">
+            <!-- 评论内容 -->
+            <component-ask-comments :propData="data" :propDataBase="data_base" :propEmojiList="emoji_list" propType="comments"></component-ask-comments>
+            <!-- 结尾 -->
+            <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>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentAskComments from '../components/ask-comments/ask-comments';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                params: null,
+                data_base: null,
+                data: null,
+                emoji_list: [],
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentAskComments,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+
+            // 数据加载
+            this.get_data();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        methods: {
+            // 初始化
+            get_data() {
+                uni.showLoading({
+                    title: this.$t('common.loading_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('commentsinfo', 'index', 'ask'),
+                    method: 'POST',
+                    data: {
+                        id: this.params.id || 0,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        var data = res.data.data;
+                        if (res.data.code == 0 && (data.data || null) != null) {
+                            var ask = data.data;
+                            this.setData({
+                                data_bottom_line_status: true,
+                                data_list_loding_status: 3,
+                                data_base: data.base || null,
+                                data: ask,
+                                emoji_list: data.emoji_list || [],
+                            });
+
+                            // 基础自定义分享
+                            this.setData({
+                                share_info: {
+                                    title: this.data.seo_title || this.data.title,
+                                    desc: this.data.seo_desc || this.data.describe,
+                                    path: '/pages/plugins/ask/detail/detail',
+                                    query: 'id=' + this.data.id,
+                                    img: this.data.cover,
+                                },
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+
+                        // 分享菜单处理
+                        app.globalData.page_share_handle(this.share_info);
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        this.setData({
+                            data_list_loding_status: 2,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+        },
+    };
+</script>
+<style></style>
diff --git a/pages/plugins/ask/components/ask-comments/ask-comments.vue b/pages/plugins/ask/components/ask-comments/ask-comments.vue
new file mode 100644
index 0000000..3bc8d00
--- /dev/null
+++ b/pages/plugins/ask/components/ask-comments/ask-comments.vue
@@ -0,0 +1,579 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data || null) != null && (data_base || null) != null">
+            <view class="flex-row jc-sb align-c">
+                <view v-if="(data_base.is_ask_comments_show || 0) == 1" class="fw-b">{{$t('user-order-detail.user-order-detail.423rmr')}}{{ data.comments_count || 0 }}{{$t('goods-list.goods-list.8y3cc7')}}</view>
+                <!-- 点赞、评论、分享 -->
+                <view v-if="propType == 'detail'" class="tr ask-comments-bottom-container cr-base">
+                    <view v-if="(data_base.is_ask_comments_show || 0) == 1" class="item dis-inline-block cr-base" :data-value="'/pages/plugins/ask/comments/comments?id=' + data.id" @tap="url_event">
+                        <iconfont name="icon-message-square" size="28rpx" propClass="pr top-sm margin-right-xs"></iconfont>
+                        <text class="text-size-xs">{{$t('ask-comments.ask-comments.2zlnb5')}}{{ data.comments_count }})</text>
+                    </view>
+                    <view v-if="(data_base.is_ask_give_thumbs || 0) == 1" :class="'item dis-inline-block cr-' + ((data.is_give_thumbs || 0) == 1 ? 'main' : 'base')" :data-askid="data.id" @tap="give_thumbs_event">
+                        <iconfont :name="(data.is_give_thumbs || 0) == 1 ? 'icon-givealike' : 'icon-givealike-o'" size="28rpx" propClass="pr top-sm margin-right-xs"></iconfont>
+                        <text class="va-m text-size-xs">{{$t('ask-comments.ask-comments.du7rcv')}}{{ data.give_thumbs_count }})</text>
+                    </view>
+                    <view class="item dis-inline-block cr-base" @tap="popup_share_event">
+                        <iconfont name="icon-share" size="28rpx" propClass="pr top-sm margin-right-xs"></iconfont>
+                        <text class="text-size-xs">{{$t('common.share')}}</text>
+                    </view>
+                </view>
+            </view>
+            <!-- 评论回复表单 -->
+            <view v-if="(data_base.is_ask_comments_add || 0) == 1 && !input_comments_modal_status" class="padding-top-xxxl padding-bottom-xxl ask-comments-reply-container flex-row jc-sb spacing-mb">
+                <image :src="avatar" mode="aspectFill" class="user-avatar fl circle"></image>
+                <view class="right-base flex-1 flex-width">
+                    <view class="comments border-radius-main padding-main">
+                        <textarea :placeholder="$t('ask-comments.ask-comments.m67961')" placeholder-class="cr-base" class="textarea wh-auto bg-grey-f8" :value="input_comments_value" :maxlength="input_comments_length_max" @input="comments_input_event" @blur="comments_input_event"></textarea>
+                        <view class="oh flex-row jc-sb align-e">
+                            <image :src="common_static_url + 'emoji-icon.png'" mode="aspectFill" class="emoji-icon va-m" @tap="emoji_event"></image>
+                            <view class="flex-row align-e">
+                                <!-- #ifndef MP-ALIPAY -->
+                                <text class="text-size-xs cr-grey-d margin-right-sm">{{$t('login.login.n24i5u')}}{{ input_comments_length_value }}{{$t('ask-comments.ask-comments.6l6vz7')}}</text>
+                                <!-- #endif  -->
+                                <button type="default" size="mini" class="comment-btn cr-white border-radius-sm text-size-md va-m" :class="input_comments_value.length > 0 ? 'bg-main br-main ' : 'comment-btn-default'" @tap="comments_event">{{$t('user-order.user-order.twc3r7')}}</button>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <!-- 评论回复内容 -->
+            <view v-if="(data_base.is_ask_comments_show || 0) == 1 && (data.comments_list || null) != null && data.comments_list.length > 0" class="ask-comments-list">
+                <block v-for="(item, index) in data.comments_list" :key="index">
+                    <view class="item oh flex-row jc-sb">
+                        <image :src="item.user.avatar" mode="aspectFill" class="user-avatar circle fl"></image>
+                        <view class="right-content flex-1 flex-width" :class="data.comments_list.length > index + 1 ? 'br-b-e padding-bottom-main margin-bottom-main' : ''">
+                            <view class="comments-base oh">
+                                <text class="username fw-b">{{ item.user.user_name_view }}</text>
+                                <text class="cr-grey-9 margin-left-main">{{ item.add_time }}</text>
+                            </view>
+                            <view class="margin-top-sm comments-content">
+                                <mp-html :content="item.content" />
+                            </view>
+                            <view class="ask-comments-right-content-operate margin-top-main flex-row jc-e align-c text-size-xs cr-grey-9">
+                                <view v-if="(data_base.is_ask_comments_show || 0) == 1" class="item dis-inline-block" :data-index="index" :data-username="item.user.user_name_view" :data-askcommentsid="item.id" @tap="modal_open_event">
+                                    <iconfont name="icon-message-square" size="28rpx" propClass="pr top-md margin-right-xs"></iconfont>
+                                    <text class="va-m">{{$t('ask-comments.ask-comments.3fcnme')}}{{ item.comments_count }})</text>
+                                </view>
+                                <view v-if="(data_base.is_ask_give_thumbs || 0) == 1" :class="'item dis-inline-block margin-left-xxxl padding-left-sm cr-' + ((item.is_give_thumbs || 0) == 1 ? 'main' : '')" data-type="1" :data-index="index" :data-askid="item.ask_id" :data-askcommentsid="item.id" @tap="give_thumbs_event">
+                                    <iconfont :name="(item.is_give_thumbs || 0) == 1 ? 'icon-givealike' : 'icon-givealike-o'" size="28rpx" propClass="pr top-md margin-right-xs"></iconfont>
+                                    <text class="va-m">{{$t('ask-comments.ask-comments.du7rcv')}}{{ item.give_thumbs_count }})</text>
+                                </view>
+                            </view>
+                            <view v-if="(item.reply_comments_list || null) != null && item.reply_comments_list.length > 0" class="reply-ask-comments-list">
+                                <block v-for="(comments, index2) in item.reply_comments_list" :key="index2">
+                                    <view class="bg-grey-e">
+                                        <view class="item padding-main oh flex-row jc-sb">
+                                            <image :src="comments.user.avatar" mode="aspectFill" class="user-avatar circle fl"></image>
+                                            <view class="right-content flex-1 flex-width">
+                                                <view class="comments-reply-base oh">
+                                                    <text class="username fw-b">{{ comments.user.user_name_view }}</text>
+                                                    <text class="cr-grey-9 margin-left-main">{{ comments.add_time }}</text>
+                                                </view>
+                                                <view v-if="(comments.reply_comments_text || null) != null" class="margin-top-sm reply-content">{{ comments.reply_comments_text }}</view>
+                                                <view class="margin-top-sm">{{ comments.content }}</view>
+                                                <view class="ask-comments-right-content-operate flex-row jc-e align-c text-size-xs cr-grey-9 padding-0">
+                                                    <view v-if="(data_base.is_ask_comments_show || 0) == 1" class="item dis-inline-block" :data-index="index" :data-username="comments.user.user_name_view" :data-askcommentsid="comments.ask_comments_id" :data-replycommentsid="comments.id" @tap="modal_open_event">
+                                                        <iconfont name="icon-message-square" size="28rpx" propClass="pr top-md margin-right-xs"></iconfont>
+                                                        <text class="va-m">{{$t('ask-comments.ask-comments.3fcnme')}}{{ comments.comments_count }})</text>
+                                                    </view>
+                                                    <view v-if="(data_base.is_ask_give_thumbs || 0) == 1" :class="'item dis-inline-block margin-left-xxxl padding-left-sm cr-' + ((comments.is_give_thumbs || 0) == 1 ? 'main' : '')" data-type="2" :data-index="index" :data-indexs="index2" :data-askid="comments.ask_id" :data-askcommentsid="comments.id" :data-replycommentsid="comments.ask_comments_id" @tap="give_thumbs_event">
+                                                        <iconfont :name="(comments.is_give_thumbs || 0) == 1 ? 'icon-givealike' : 'icon-givealike-o'" size="28rpx" propClass="pr top-md margin-right-xs"></iconfont>
+                                                        <text class="va-m">{{$t('ask-comments.ask-comments.du7rcv')}}{{ comments.give_thumbs_count }})</text>
+                                                    </view>
+                                                </view>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </block>
+                            </view>
+                            <view v-if="(item.comments_count || 0) > 0 && (item.is_comments_list_submit == undefined || item.is_comments_list_submit == 1)" class="margin-top-lg text-size-xs">
+                                <text :data-index="index" :data-askid="item.ask_id" :data-askcommentsid="item.id" @tap="comments_list_reply_event">
+                                    <text v-if="item.is_comments_list_submit == undefined" class="cr-base">{{$t('goods-list.goods-list.278qr1')}}{{ item.comments_count }}{{$t('ask-comments.ask-comments.ymmd24')}}</text>
+                                    <text v-else class="cr-base">{{$t('ask-comments.ask-comments.dfhg54')}}</text>
+                                    <iconfont name="icon-arrow-bottom" size="24rpx" propClass="margin-left-xs pr top-xs"></iconfont>
+                                </text>
+                            </view>
+                        </view>
+                    </view>
+                </block>
+                <block v-if="((data_base.ask_detail_comments_more_page_number || 0) == 0 && (data.comments_count || 0) > 20) || ((data_base.ask_detail_comments_more_page_number || 0) > 0 && data.comments_count > data_base.ask_detail_comments_more_page_number)">
+                    <view v-if="propType == 'detail'" class="margin-top-xxxl tc padding-vertical-main bg-grey-f8 border-radius-sm">
+                        <text :data-value="'/pages/plugins/ask/comments/comments?id=' + data.id" @tap="url_event">
+                            <text class="cr-base">{{$t('goods-list.goods-list.278qr1')}}{{ data.comments_count }}{{$t('ask-comments.ask-comments.5401r1')}}</text>
+                            <iconfont name="icon-arrow-right" size="24rpx" propClass="margin-left-xs pr top-xs"></iconfont>
+                        </text>
+                    </view>
+                    <view v-if="propType == 'comments' && (data.is_comments_list_submit == undefined || data.is_comments_list_submit == 1)" class="margin-top-xxxl tc padding-vertical-main bg-grey-f8 border-radius-sm">
+                        <text :data-askid="data.id" @tap="comments_list_reply_event">
+                            <text class="cr-base">{{$t('ask-comments.ask-comments.4l77wt')}}</text>
+                            <iconfont name="icon-arrow-bottom" size="24rpx" propClass="margin-left-xs pr top-xs"></iconfont>
+                        </text>
+                    </view>
+                </block>
+            </view>
+            <!-- 回复弹窗 -->
+            <view v-if="input_comments_modal_status" class="ask-comments-modal pf">
+                <view class="ask-comments-modal-content bg-white border-radius-main pr">
+                    <view class="tc margin-bottom-lg">
+                        <text>{{$t('ask-comments.ask-comments.8sjar6')}}{{ input_comments_modal_username }}</text>
+                        <view class="close pa">
+                            <view @tap.stop="modal_close_event">
+                                <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                            </view>
+                        </view>
+                    </view>
+                    <textarea :placeholder="$t('ask-comments.ask-comments.m67961')" placeholder-class="cr-base" class="textarea wh-auto br padding-main" :value="input_comments_value" :maxlength="input_comments_length_max" @input="comments_input_event" @blur="comments_input_event"></textarea>
+                    <view class="margin-top-lg oh">
+                        <image :src="common_static_url + 'emoji-icon.png'" mode="aspectFill" class="emoji-icon va-m" @tap="emoji_event"></image>
+                        <view class="fr">
+                            <text class="va-m text-size-xs cr-base margin-right-lg">{{$t('login.login.n24i5u')}}{{ input_comments_length_value }}{{$t('ask-comments.ask-comments.6l6vz7')}}</text>
+                            <button type="default" size="mini" class="comment-btn cr-white border-radius-sm text-size-xs va-m" :class="input_comments_value.length > 0 ? 'bg-main br-main ' : 'comment-btn-default'" @tap="comments_event">{{$t('user-order.user-order.twc3r7')}}</button>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 表情弹窗 -->
+            <component-emoji-popup ref="emoji" v-on:choiceConfirmEvent="emoji_choice_confirm_event"></component-emoji-popup>
+
+            <!-- 分享弹窗 -->
+            <component-share-popup ref="share"></component-share-popup>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    var common_static_url = app.globalData.get_static_url('common');
+    import componentPopup from '@/components/popup/popup';
+    import componentSharePopup from '@/components/share-popup/share-popup';
+    import componentEmojiPopup from '@/components/emoji-popup/emoji-popup';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                avatar: app.globalData.data.default_user_head_src,
+                user: null,
+                data_base: null,
+                data: null,
+                emoji_list: [],
+                input_comments_value: '',
+                input_comments_cursor: 0,
+                input_comments_length_value: 500,
+                input_comments_length_max: 500,
+                input_comments_modal_status: false,
+                input_comments_modal_index: 0,
+                input_comments_modal_username: '',
+                input_comments_modal_ask_comments_id: 0,
+                input_comments_modal_reply_comments_id: 0,
+            };
+        },
+        props: {
+            propType: {
+                type: String,
+                default: 'detail',
+            },
+            propData: {
+                type: [Object, null],
+                default: null,
+            },
+            propDataBase: {
+                type: [Object, null],
+                default: null,
+            },
+            propEmojiList: {
+                type: [Array, null],
+                default: [],
+            },
+            propShareInfo: {
+                type: [Object, null],
+                default: {},
+            }
+        },
+        components: {
+            componentPopup,
+            componentSharePopup,
+            componentEmojiPopup,
+        },
+
+        // 页面被展示
+        created: function (e) {
+            var avatar = app.globalData.data.default_user_head_src;
+            var user = app.globalData.get_user_cache_info() || null;
+            this.setData({
+                user: user,
+                avatar: user == null ? avatar : user.avatar || avatar,
+                data: this.propData,
+                data_base: this.propDataBase,
+                emoji_list: this.propEmojiList,
+            });
+        },
+
+        methods: {
+            // 分享开启弹层
+            popup_share_event(e) {
+                if ((this.$refs.share || null) != null) {
+                    this.$refs.share.init({
+                        share_info: this.propShareInfo
+                    });
+                }
+            },
+
+            // 评论弹窗关闭
+            modal_close_event(e) {
+                this.setData({
+                    input_comments_modal_status: false,
+                    input_comments_modal_index: 0,
+                    input_comments_modal_username: '',
+                    input_comments_modal_ask_comments_id: 0,
+                    input_comments_modal_reply_comments_id: 0,
+                    input_comments_value: '',
+                });
+            },
+
+            // 评论弹窗开启
+            modal_open_event(e) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                var user = app.globalData.get_user_info(this, 'modal_open_event', e);
+                if (user != false) {
+                    var index = parseInt(e.currentTarget.dataset.index || 0);
+                    var username = e.currentTarget.dataset.username;
+                    var ask_comments_id = e.currentTarget.dataset.askcommentsid || 0;
+                    var reply_comments_id = e.currentTarget.dataset.replycommentsid || 0;
+                    this.setData({
+                        input_comments_modal_status: true,
+                        input_comments_value: '',
+                        input_comments_modal_index: index,
+                        input_comments_modal_username: username,
+                        input_comments_modal_ask_comments_id: ask_comments_id,
+                        input_comments_modal_reply_comments_id: reply_comments_id,
+                    });
+                }
+            },
+
+            // 表情选择事件
+            emoji_event() {
+                if (this.input_comments_length_value == 0) {
+                    app.globalData.showToast(this.$t('ask-comments.ask-comments.3o1rq6'));
+                    return false;
+                }
+                if ((this.$refs.emoji || null) != null) {
+                    this.$refs.emoji.init({ emoji_list: this.emoji_list });
+                }
+            },
+
+            // 评论输入和失去焦点事件
+            comments_input_event(e) {
+                var value = e.detail.value.trim();
+                var length = this.input_comments_length_max - value.length;
+                this.setData({
+                    input_comments_cursor: e.detail.cursor || 0,
+                    input_comments_value: value,
+                    input_comments_length_value: length <= 0 ? 0 : length,
+                });
+            },
+
+            // 表情选择确认事件
+            emoji_choice_confirm_event(emoji) {
+                var value = this.input_comments_value;
+                var cursor = parseInt(this.input_comments_cursor || 0);
+                if (value != '') {
+                    if (cursor == 0) {
+                        value = emoji + value;
+                    } else {
+                        var first = value.substr(0, cursor);
+                        var last = value.substr(cursor, value.length);
+                        value = first + emoji + last;
+                    }
+                } else {
+                    value = emoji;
+                }
+                var length = this.input_comments_length_max - value.length;
+                this.setData({
+                    input_comments_value: value,
+                    input_comments_length_value: length <= 0 ? 0 : length,
+                });
+            },
+
+            // 获取评论列表
+            comments_list_reply_event(e) {
+                var temp_data = this.data;
+                var page = 1;
+                var index = parseInt(e.currentTarget.dataset.index || 0);
+                var ask_id = e.currentTarget.dataset.askid;
+                var ask_comments_id = e.currentTarget.dataset.askcommentsid || 0;
+                if (ask_comments_id == 0) {
+                    if ((temp_data['page'] || null) == null) {
+                        temp_data['page'] = 1;
+                    } else {
+                        temp_data['page'] += 1;
+                    }
+                    page = temp_data['page'];
+                } else {
+                    if ((temp_data['comments_list'][index]['page'] || null) == null) {
+                        temp_data['comments_list'][index]['page'] = 1;
+                    } else {
+                        temp_data['comments_list'][index]['page'] += 1;
+                    }
+                    page = temp_data['comments_list'][index]['page'];
+                }
+                uni.showLoading({
+                    title: this.$t('common.loading_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('commentsreplylist', 'index', 'ask'),
+                    method: 'POST',
+                    data: {
+                        ask_id: ask_id,
+                        ask_comments_id: ask_comments_id,
+                        page: page,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            if (ask_comments_id == 0) {
+                                var temp_list = temp_data['comments_list'] || [];
+                            } else {
+                                var temp_list = temp_data['comments_list'][index]['reply_comments_list'] || [];
+                            }
+                            var data = res.data.data.data;
+                            for (var i in data) {
+                                temp_list.push(data[i]);
+                            }
+                            if (ask_comments_id == 0) {
+                                temp_data['comments_list'] = temp_list;
+                                temp_data['is_comments_list_submit'] = res.data.data.page >= res.data.data.page_total ? 0 : 1;
+                            } else {
+                                temp_data['comments_list'][index]['reply_comments_list'] = temp_list;
+                                temp_data['comments_list'][index]['is_comments_list_submit'] = res.data.data.page >= res.data.data.page_total ? 0 : 1;
+                            }
+                            this.setData({ data: temp_data });
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 评论
+            comments_event(e) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                var user = app.globalData.get_user_info(this, 'comments_event', e);
+                if (user != false) {
+                    if (this.input_comments_value == '') {
+                        app.globalData.showToast(this.$t('user-order-comments.user-order-comments.8f303u'));
+                        return false;
+                    }
+                    uni.showLoading({
+                        title: this.$t('buy.buy.r79t77'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('comments', 'index', 'ask'),
+                        method: 'POST',
+                        data: {
+                            ask_id: this.data.id,
+                            content: this.input_comments_value,
+                            ask_comments_id: this.input_comments_modal_ask_comments_id,
+                            reply_comments_id: this.input_comments_modal_reply_comments_id,
+                        },
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                var temp_data = this.data;
+                                if ((this.input_comments_modal_ask_comments_id || 0) == 0) {
+                                    var temp_list = temp_data.comments_list || [];
+                                    temp_list.splice(0, 0, res.data.data);
+                                    temp_data['comments_list'] = temp_list;
+                                    temp_data['comments_count'] = parseInt(temp_data['comments_count']) + 1;
+                                } else {
+                                    var index = this.input_comments_modal_index;
+                                    var temp_list = temp_data.comments_list[index]['reply_comments_list'] || [];
+                                    temp_list.splice(0, 0, res.data.data);
+                                    if ((this.input_comments_modal_reply_comments_id || 0) != 0) {
+                                        for (var i in temp_list) {
+                                            if (temp_list[i]['id'] == this.input_comments_modal_reply_comments_id) {
+                                                temp_list[i]['comments_count'] = parseInt(temp_list[i]['comments_count']) + 1;
+                                                break;
+                                            }
+                                        }
+                                    }
+                                    temp_data.comments_list[index]['reply_comments_list'] = temp_list;
+                                    temp_data.comments_list[index]['comments_count'] = parseInt(temp_data.comments_list[index]['comments_count']) + 1;
+                                }
+                                this.setData({
+                                    data: temp_data,
+                                    input_comments_value: '',
+                                    input_comments_length_value: this.input_comments_length_max,
+                                    input_comments_modal_status: false,
+                                    input_comments_modal_index: 0,
+                                    input_comments_modal_username: '',
+                                    input_comments_modal_ask_comments_id: 0,
+                                    input_comments_modal_reply_comments_id: 0,
+                                });
+                            } else {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 点赞
+            give_thumbs_event(e) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                var user = app.globalData.get_user_info(this, 'give_thumbs_event', e);
+                if (user != false) {
+                    var type = parseInt(e.currentTarget.dataset.type || 0);
+                    var ask_id = e.currentTarget.dataset.askid;
+                    var ask_comments_id = e.currentTarget.dataset.askcommentsid || 0;
+                    var reply_comments_id = e.currentTarget.dataset.replycommentsid || 0;
+                    uni.request({
+                        url: app.globalData.get_request_url('givethumbs', 'index', 'ask'),
+                        method: 'POST',
+                        data: {
+                            ask_id: ask_id,
+                            ask_comments_id: ask_comments_id,
+                            reply_comments_id: reply_comments_id,
+                        },
+                        dataType: 'json',
+                        success: (res) => {
+                            if (res.data.code == 0) {
+                                var data = res.data.data;
+                                var temp_data = this.data;
+                                switch (type) {
+                                    // 博客
+                                    case 0:
+                                        temp_data.is_give_thumbs = data.is_active;
+                                        temp_data.give_thumbs_count = data.count;
+                                        break;
+                                    // 博客评论
+                                    case 1:
+                                        var index = parseInt(e.currentTarget.dataset.index || 0);
+                                        temp_data['comments_list'][index]['is_give_thumbs'] = data.is_active;
+                                        temp_data['comments_list'][index]['give_thumbs_count'] = data.count;
+                                        break;
+                                    // 博客评论回复
+                                    case 2:
+                                        var index = parseInt(e.currentTarget.dataset.index || 0);
+                                        var indexs = parseInt(e.currentTarget.dataset.indexs || 0);
+                                        temp_data['comments_list'][index]['reply_comments_list'][indexs]['is_give_thumbs'] = data.is_active;
+                                        temp_data['comments_list'][index]['reply_comments_list'][indexs]['give_thumbs_count'] = data.count;
+                                        break;
+                                }
+                                this.setData({ data: temp_data });
+                            } else {
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                }
+                            }
+                        },
+                        fail: () => {
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        }
+    };
+</script>
+<style scoped>
+    /**
+     * 聚合点赞、评论、分享
+     */
+    .ask-comments-bottom-container .item:not(:last-child) {
+        margin-right: 64rpx;
+    }
+    .ask-comments-reply-container .emoji-icon,
+    .ask-comments-modal .emoji-icon {
+        width: 40rpx;
+        height: 40rpx !important;
+    }
+    .ask-comments-reply-container .user-avatar {
+        width: 72rpx;
+        height: 72rpx !important;
+        border: 1px solid #eee;
+    }
+    .ask-comments-reply-container .right-base {
+        padding-left: 16rpx;
+    }
+    .ask-comments-reply-container .right-base .comments {
+        background-color: #f8f8f8;
+    }
+    .ask-comments-reply-container .right-base .textarea {
+        height: 120rpx;
+    }
+    .ask-comments-modal {
+        top: 0;
+        left: 0;
+        width: calc(100% - 80rpx);
+        height: 100%;
+        background: rgba(0, 0, 0, 0.6);
+        padding: 40rpx;
+        z-index: 10;
+    }
+    .ask-comments-modal-content {
+        padding: 10px;
+        border-radius: 10px;
+        margin: 0 auto;
+        margin-top: 30%;
+        max-width: calc(800px - 180rpx);
+    }
+    .ask-comments-modal-content .textarea {
+        height: 200rpx;
+    }
+    .ask-comments-modal-content .close {
+        top: 20rpx;
+        right: 20rpx;
+    }
+    .comment-btn {
+        height: 56rpx;
+        line-height: 56rpx;
+        padding: 0 24rpx;
+    }
+    .comment-btn-default {
+        border: 2rpx solid #d8dadc;
+        background-color: #d8dadc;
+    }
+
+    /**
+     * 评论列表
+     */
+    .ask-comments-list > .item .user-avatar {
+        width: 72rpx;
+        height: 72rpx;
+        border: 1px solid #eee;
+    }
+    .ask-comments-list .comments-base,
+    .ask-comments-list .comments-content {
+        padding-left: 16rpx;
+        padding-right: 20rpx;
+    }
+    .reply-ask-comments-list {
+        margin-top: 28rpx;
+    }
+    .reply-ask-comments-list .right-content {
+        padding-left: 16rpx;
+    }
+</style>
diff --git a/pages/plugins/ask/detail/detail.css b/pages/plugins/ask/detail/detail.css
new file mode 100644
index 0000000..59266f4
--- /dev/null
+++ b/pages/plugins/ask/detail/detail.css
@@ -0,0 +1,46 @@
+.admin-img {
+    width: 68rpx;
+    height: 68rpx !important;
+}
+
+/**
+ * 商品链接
+ */
+.goods-link .img {
+    width: 80rpx;
+    height: 80rpx;
+}
+
+.goods-link .title {
+    min-height: 40rpx;
+    line-height: 40rpx;
+}
+
+
+/**
+ * 猜你喜欢
+ */
+.guess-like {
+    position: relative;
+    text-align: center;
+    display: inline-block;
+}
+
+.guess-like::before,
+.guess-like::after {
+    content: "";
+    width: 76px;
+    height: 1px;
+    background: #dddddd;
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+}
+
+.guess-like::before {
+    left: calc(100% + 20rpx);
+}
+
+.guess-like::after {
+    right: calc(100% + 20rpx);
+}
\ No newline at end of file
diff --git a/pages/plugins/ask/detail/detail.vue b/pages/plugins/ask/detail/detail.vue
new file mode 100644
index 0000000..5a9085a
--- /dev/null
+++ b/pages/plugins/ask/detail/detail.vue
@@ -0,0 +1,244 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(info || null) !== null" :class="(data_base.is_user_add_ask || 0) == 1 ? 'page-bottom-fixed' : ''">
+            <!-- true为空对象 false为非空对象 Object.keys(info).length == 0 -->
+            <view class="ask-container bg-white spacing-mb">
+                <view class="padding-main">
+                    <view v-if="(info.title || null) != null" class="fw-b text-size-xl spacing-mb">{{ info.title }}</view>
+                    <view class="cr-grey-9 text-size-xs margin-bottom-sm flex-row">
+                        {{ $t('detail.detail.kt41ki') }}{{ info.add_time_date }}
+                        <view class="fw-b padding-horizontal-xs">·</view>
+                        {{ info.access_count || '0' }}{{ $t('detail.detail.e6ga1y') }}
+                    </view>
+                    <view v-if="info.title != info.content">
+                        <mp-html :content="info.content" />
+                    </view>
+                    <block v-if="(info.goods || null) !== null">
+                        <view :data-value="info.goods.goods_url" @tap="url_event" class="cp">
+                            <view class="goods-link spacing-mt bg-grey-f9 padding-main border-radius-sm">
+                                <view class="flex-row jc-sb">
+                                    <view class="img border-radius-sm oh margin-right-main">
+                                        <image :src="info.goods.images" mode="widthFix" class="wh-auto"></image>
+                                    </view>
+                                    <view class="flex-1 flex-width flex-row jc-sb align-c">
+                                        <view class="flex-1 flex-width padding-right-sm">
+                                            <view class="title multi-text">{{ info.goods.title }}</view>
+                                            <view class="flex-row align-c margin-top-xs">
+                                                <text class="cr-red fw-b margin-right-main">{{ currency_symbol }}{{ info.goods.price }}</text>
+                                                <text class="text-size-xs cr-grey-9 original-price">{{ currency_symbol }}{{ info.goods.original_price }}</text>
+                                            </view>
+                                        </view>
+                                        <iconfont name="icon-arrow-right" color="#999"></iconfont>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                    </block>
+                </view>
+                <view v-if="info.is_reply && info.is_reply === '1'" class="padding-main br-t-dashed">
+                    <view class="flex-row jc-sb align-c">
+                        <view class="flex-row align-c">
+                            <image v-if="(logo_square || null) != null" :src="logo_square" mode="widthFix" class="admin-img circle br-f5 margin-right-sm"></image>
+                            <text>{{ $t('detail.detail.ng628i') }}</text>
+                        </view>
+                        <view v-if="(info.reply_time_date || null) != null" class="cr-grey-9 text-size-xs">{{ $t('detail.detail.7rg4bb') }}{{ info.reply_time_date }}</view>
+                    </view>
+                    <view class="padding-top-main">
+                        <mp-html :content="info.reply" />
+                    </view>
+                </view>
+                <view class="padding-main br-t-dashed">
+                    <!-- 评论内容 -->
+                    <component-ask-comments :propData="info" :propDataBase="data_base" :propEmojiList="emoji_list" :propShareInfo="share_info"></component-ask-comments>
+                </view>
+            </view>
+            <!-- 猜你喜欢 -->
+            <view v-if="goods_list.length > 0" class="padding-horizontal-main padding-top-sm">
+                <view class="tc spacing-mb">
+                    <view class="guess-like fw-b text-size-md">{{ $t('goods-detail.goods-detail.v2974w') }}</view>
+                </view>
+                <component-goods-list :propData="{ style_type: 1, goods_list: goods_list, random: random_value }" :propLabel="plugins_label_data" :propCurrencySymbol="currency_symbol" propSource="detail" @CartSuccessEvent="cart_success_event"></component-goods-list>
+                <!-- 结尾 -->
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            </view>
+            <view v-if="(data_base.is_user_add_ask || 0) == 1" class="bottom-fixed" :style="bottom_fixed_style">
+                <view class="bottom-line-exclude">
+                    <view class="item flex-row jc-sa align-c text-size fw-b br bg-white round padding-vertical">
+                        <view data-value="/pages/plugins/ask/form/form" @tap="url_event" class="flex-1 tc flex-col jc-c align-c cp">
+                            <view class="divider-r-d wh-auto"> <iconfont name="icon-edit-below-line" size="30rpx" color="#333" propClass="margin-right-sm"></iconfont>{{ $t('goods-detail.goods-detail.7ulh8b') }}</view>
+                        </view>
+                        <view data-value="/pages/plugins/ask/user-list/user-list" @tap="url_event" class="flex-1 tc flex-col jc-c align-c cp">
+                            <view class="wh-auto"> <iconfont name="icon-list-dot" size="32rpx" color="#333" propClass="margin-right-sm pr top-xs"></iconfont>{{ $t('detail.detail.p7o522') }}</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <view v-else>
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentGoodsList from '@/components/goods-list/goods-list';
+    import componentAskComments from '../components/ask-comments/ask-comments';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                logo_square: app.globalData.get_application_logo_square(),
+                data_list_loding_msg: '',
+                data_list_loding_status: 1,
+                data_bottom_line_status: true,
+                bottom_fixed_style: '',
+                info: null,
+                data_base: null,
+                emoji_list: [],
+                // 基础配置
+                currency_symbol: app.globalData.currency_symbol(),
+                // 猜你喜欢 参数
+                goods_list: [],
+                goods_is_loading: 0,
+                goods_total: 0,
+                goods_page_total: 0,
+                goods_page: 1,
+                // 标签插件
+                plugins_label_data: null,
+                // 增加随机数，避免无法监听数据列表内部数据更新
+                random_value: 0,
+                params: '',
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentGoodsList,
+            componentAskComments,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+
+            // 获取数据
+            this.get_data();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        methods: {
+            get_data(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.goods_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+                // 是否加载中
+                if (this.goods_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    goods_is_loading: 1,
+                });
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('detail', 'index', 'ask'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            let data = res.data.data;
+                            var info = data.data || null;
+                            this.setData({
+                                info: info,
+                                data_base: data.base || null,
+                                emoji_list: data.emoji_list || [],
+                                goods_list: data.goods,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                goods_is_loading: 0,
+                            });
+
+                            if (info != null) {
+                                // 基础自定义分享
+                                this.setData({
+                                    share_info: {
+                                        title: info.title,
+                                        desc: info.content,
+                                        path: '/pages/plugins/ask/detail/detail',
+                                        query: 'id=' + info.id,
+                                    },
+                                });
+
+                                // 标题
+                                uni.setNavigationBarTitle({ title: info.title || info.content });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_msg: res.data.msg,
+                                data_list_loding_status: 0,
+                                goods_is_loading: 0,
+                            });
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                            data_list_loding_status: 2,
+                            goods_is_loading: 0,
+                        });
+                    },
+                });
+            },
+
+            // 猜你喜欢加入购物车回调
+            cart_success_event() {
+                // 传1表示为购物车回调方法调用的此方法
+                this.get_data(1);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style scoped>
+    @import './detail.css';
+</style>
diff --git a/pages/plugins/ask/form/form.css b/pages/plugins/ask/form/form.css
new file mode 100644
index 0000000..0b43036
--- /dev/null
+++ b/pages/plugins/ask/form/form.css
@@ -0,0 +1,3 @@
+.form-container .form-gorup .textarea-height {
+    min-height: 200rpx !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/ask/form/form.vue b/pages/plugins/ask/form/form.vue
new file mode 100644
index 0000000..dd3f4c0
--- /dev/null
+++ b/pages/plugins/ask/form/form.vue
@@ -0,0 +1,318 @@
+<template>
+    <view :class="theme_view">
+        <form v-if="data_list_loding_status == 3" @submit="formSubmit" class="form-container">
+            <view class="padding-main oh page-bottom-fixed">
+                <view class="form-gorup border-radius-main oh flex-row jc-sb align-c margin-bottom-main">
+                    <view class=""> 标题 <text class="form-group-tips-must">*</text></view>
+                    <view class="flex-row align-c flex-1 flex-width">
+                        <input type="text" name="title" :value="data.title" maxlength="16" placeholder-class="cr-grey-9 tr" class="cr-base tr" placeholder="请输入标题" />
+                    </view>
+                </view>
+                <view class="form-gorup border-radius-main margin-bottom-main">
+                    <view class="margin-bottom-sm">提问内容 <text class="form-group-tips-must">*</text></view>
+                    <sp-editor @init="initEditor" @input="rich_text_event" @upinImage="up_in_image_event"></sp-editor>
+                </view>
+                <view class="form-gorup border-radius-main oh flex-row jc-sb align-c margin-bottom-main">
+                    <view class=""> 提问分类 </view>
+                    <view class="flex-row jc-e align-c flex-1 flex-width">
+                        <picker @change="select_change_event" :value="category_id_index" :range="ask_category_list" range-key="name" name="category_id" data-field="category_id" class="margin-right-sm wh-auto tr">
+                            <view class="uni-input cr-base picker">
+                                <template v-if="category_id_index !== -1">
+                                    {{ ask_category_list[category_id_index].name || '' }}
+                                </template>
+                            </view>
+                        </picker>
+                        <iconfont name="icon-arrow-right" size="34rpx" color="#ccc"></iconfont>
+                    </view>
+                </view>
+                <view v-if="is_show_email_notice == 1" class="form-gorup border-radius-main oh flex-row jc-sb align-c margin-bottom-main">
+                    <view class=""> 回复邮件通知 </view>
+                    <view class="flex-row align-c flex-1 flex-width">
+                        <input type="text" name="email_notice" :value="data.email_notice" placeholder-class="cr-grey-9 tr" class="cr-base tr" placeholder="请输入邮件" />
+                    </view>
+                </view>
+                <view v-if="is_show_mobile_notice == 1" class="form-gorup border-radius-main oh flex-row jc-sb align-c margin-bottom-main">
+                    <view class="form-gorup-title"> 回复手机通知 </view>
+                    <view class="flex-row align-c flex-1 flex-width">
+                        <input type="text" name="mobile_notice" :value="data.mobile_notice" maxlength="16" placeholder-class="cr-grey-9 tr" class="cr-base tr" placeholder="请输入手机号" />
+                    </view>
+                </view>
+                <!-- 匿名发布 -->
+                <!-- <view class="form-gorup border-radius-main oh flex-row jc-e align-c">
+                    <checkbox-group @change="is_anonymous_change_event">
+                        <label class="cr-grey-9">
+                            <checkbox value="1" :checked="false" :color="theme_color" style="transform: scale(0.7)" />
+                            <text class="pr top-xs">{{ $t('form.form.2f52v3') }}</text>
+                        </label>
+                    </checkbox-group>
+                </view> -->
+                <view class="bottom-fixed">
+                    <view class="bottom-line-exclude">
+                        <button class="bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">{{ $t('form.form.4yd066') }}</button>
+                    </view>
+                </view>
+            </view>
+        </form>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentUpload from '@/components/upload/upload';
+    const theme_color = app.globalData.get_theme_color();
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: theme_color,
+                data_list_loding_status: 1,
+                data_list_loding_msg: this.$t('form.form.bniyyt'),
+                params: {},
+                form_submit_loading: false,
+                is_anonymous: '0',
+                editor_path_type: '',
+
+                data: {},
+                ask_category_list: [],
+                is_show_email_notice: 0,
+                is_show_mobile_notice: 0,
+                category_id_index: -1,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentUpload,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        methods: {
+            // 初始化
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    // 提示错误
+                    this.setData({
+                        data_list_loding_status: 2,
+                        data_list_loding_msg: this.$t('form.form.8l3ul5'),
+                    });
+                }
+            },
+
+            // 获取初始化信息
+            get_data_list() {
+                uni.showLoading({
+                    title: this.$t('common.loading_in_text'),
+                });
+                // 网络请求
+                uni.request({
+                    url: app.globalData.get_request_url('saveinfo', 'ask', 'ask'),
+                    method: 'POST',
+                    data: { id: this.params.id || null },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        var data = res.data.data;
+                        if (res.data.code == 0) {
+                            this.setData({
+                                data_bottom_line_status: true,
+                                data_list_loding_status: 3,
+                                data: data.data || {},
+                                ask_category_list: data.ask_category_list || [],
+                                editor_path_type: data.editor_path_type,
+                                is_show_email_notice: data.is_show_email_notice,
+                                is_show_mobile_notice: data.is_show_mobile_notice,
+                                category_id_index: (data.ask_category_list || []).length > 0 && data.data != null ? data.ask_category_list.findIndex((item) => item.id === data.data.category_id) : -1,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        this.setData({
+                            data_list_loding_status: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 表单提交
+            formSubmit(e) {
+                // 数据验证
+                var validation = [
+                    { fields: 'content', msg: this.$t('form.form.5v5bjs') },
+                    { fields: 'title', msg: this.$t('form.form.5v5bjs') },
+                ];
+                const new_data = {
+                    goods_id: this.params.goods_id || 0,
+                    id: this.params.id || null,
+                    ...e.detail.value,
+                    content: this.data.content,
+                    category_id: this.data.category_id,
+                };
+                if (app.globalData.fields_check(new_data, validation)) {
+                    uni.showLoading({
+                        title: this.$t('buy.buy.r79t77'),
+                    });
+                    this.setData({
+                        form_submit_loading: true,
+                    });
+                    // 网络请求
+                    uni.request({
+                        url: app.globalData.get_request_url('save', 'ask', 'ask'),
+                        method: 'POST',
+                        data: new_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                                setTimeout(function () {
+                                    app.globalData.url_open('/pages/plugins/ask/user-list/user-list', true);
+                                }, 2000);
+                            } else {
+                                this.setData({
+                                    form_submit_loading: false,
+                                });
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_loading: false,
+                            });
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // // 匿名发布
+            // is_anonymous_change_event(e) {
+            //     this.setData({
+            //         is_anonymous: e.detail.value.length > 0 ? e.detail.value[0] : 0,
+            //     });
+            // },
+
+            initEditor(editor) {
+                // 初始化编辑器内容
+                editor.setContents({
+                    html: (this.data || null) !== null ? this.data.content : '',
+                });
+            },
+
+            // 回调富文本内容
+            rich_text_event(e) {
+                var new_data = this.data;
+                new_data.content = e.html;
+                this.setData({
+                    data: new_data,
+                });
+            },
+
+            // 上传图片
+            up_in_image_event(tempFiles, editorCtx) {
+                var self = this;
+                // 使用 uniCloud.uploadFile 上传图片的示例方法（可适用多选上传）
+                tempFiles.forEach(async (item) => {
+                    uni.showLoading({
+                        title: self.$t('form.form.2e5rv3'),
+                        mask: true,
+                    });
+                    await uni.uploadFile({
+                        url: app.globalData.get_request_url('index', 'ueditor'),
+                        // #ifdef APP-PLUS || H5
+                        filePath: item.path,
+                        // #endif
+                        // #ifdef MP-WEIXIN
+                        filePath: item.tempFilePath,
+                        // #endif
+                        name: 'upfile',
+                        formData: {
+                            action: 'uploadimage',
+                            path_type: this.editor_path_type, // 路径类型，默认common
+                        },
+                        success: function (res) {
+                            let data = JSON.parse(res.data);
+                            if (res.statusCode == 200) {
+                                // 上传完成后处理
+                                editorCtx.insertImage({
+                                    src: data.data.url, // 此处需要将图片地址切换成服务器返回的真实图片地址
+                                    // width: '50%',
+                                    alt: self.$t('common.video'),
+                                    success: function (e) {},
+                                });
+                                uni.hideLoading();
+                            }
+                        },
+                        fail: function (e) {
+                            app.globalData.showToast(e.errMsg);
+                            uni.hideLoading();
+                        },
+                    });
+                });
+            },
+
+            // 分类选择事件
+            select_change_event(e) {
+                var temp = this.data;
+                const category_id = this.ask_category_list[e.detail.value].id;
+                temp[e.currentTarget.dataset.field] = category_id;
+                this.setData({
+                    data: temp,
+                    category_id_index: e.detail.value,
+                });
+            },
+        },
+    };
+</script>
+<style scoped>
+    @import './form.css';
+</style>
diff --git a/pages/plugins/ask/goods-list/goods-list.css b/pages/plugins/ask/goods-list/goods-list.css
new file mode 100644
index 0000000..4044385
--- /dev/null
+++ b/pages/plugins/ask/goods-list/goods-list.css
@@ -0,0 +1,23 @@
+
+
+.question .title{
+    width: 40rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+    background: #fd9525;
+    border-radius: 4rpx;
+}
+.question .avatar,
+.ask .avatar {
+    width: 80rpx;
+    height: 80rpx;
+    border-radius: 4rpx;
+    background: #F5F5F5;
+}
+.ask .title{
+    width: 40rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+    background: #99BB12;
+    border-radius: 4rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/ask/goods-list/goods-list.vue b/pages/plugins/ask/goods-list/goods-list.vue
new file mode 100644
index 0000000..7a107df
--- /dev/null
+++ b/pages/plugins/ask/goods-list/goods-list.vue
@@ -0,0 +1,332 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="data_list.length > 0">
+            <scroll-view :scroll-y="true" class="scroll-box padding-main bs-bb" @scrolltolower="scroll_lower" lower-threshold="60">
+                <view v-for="(item, index) in data_list" :key="index" class="bg-white border-radius-main padding-main oh" :class="data_list.length > index + 1 ? 'spacing-mb' : ''">
+                    <view class="title flex-row jc-sb align-c wh-auto">
+                        <view class="name flex-1 flex-width cr-base">{{ item.name }}{{$t('goods-list.goods-list.27nkjm')}}</view>
+                        <view class="date cr-grey-9">{{ item.add_time_date }}</view>
+                    </view>
+                    <view class="question spacing-mt">
+                        <view :data-value="item.url" @tap="url_event" class="flex-row cp">
+                            <view class="title cr-white tc margin-right-sm">{{$t('goods-list.goods-list.00n7i3')}}</view>
+                            <view class="flex-1 flex-width">
+                                <mp-html :content="item.content" />
+                                <view v-if="(item.images || null) != null && item.images.length > 0" class="avatar spacing-mt-10 radius margin-right-sm oh">
+                                    <image v-for="(img, i) in item.images" class="wh-auto" @tap="comment_images_show_event" :data-index="i" :data-ix="i + 1" :src="img" mode="aspectFit"></image>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                    <block v-if="item.is_reply == 1 || (item.reply || null) != null">
+                        <view class="ask flex-row spacing-mt">
+                            <view class="title cr-white tc margin-right-sm">{{$t('goods-list.goods-list.rw12i7')}}</view>
+                            <view class="flex-1 flex-width">
+                                <view class="padding-bottom-main">
+                                    <mp-html :content="item.reply" />
+                                </view>
+                            </view>
+                        </view>
+                    </block>
+                    <block v-if="item.bool_more && (item.comments_list || null) != null && item.comments_list.length > 0">
+                        <block v-for="(it, ix) in item.comments_list" :key="ix">
+                            <view class="cr-base br-t-f9 padding-vertical-main">{{ it.content }}</view>
+                            <view v-if="(it.images || null) != null && it.images.length > 0" class="avatar spacing-mt-10 radius margin-right-sm oh">
+                                <block v-for="(img, i) in it.images">
+                                    <image class="wh-auto" @tap="comment_images_show_event" :data-index="i" :data-ix="i + 1" :src="img" mode="aspectFit"></image>
+                                </block>
+                            </view>
+                        </block>
+                    </block>
+                    <view v-if="item.comments_count > 0" class="more flex-row jc-e align-c br-t-f9 padding-top-main">
+                        <view v-if="(item.hide_more || false) === false && ((item.hide_comments_list_num === 0 && !item.bool_more) || (item.hide_comments_list_num == undefined || item.hide_comments_list_num > 0))" class="cr-red text-size-xs" @tap="open_more(item.id, index)">
+                            <text v-if="item.hide_comments_list_num === 0 && !item.bool_more">{{$t('common.view_more')}}</text>
+                            <text v-if="item.hide_comments_list_num == undefined || item.hide_comments_list_num > 0">{{$t('goods-list.goods-list.278qr1')}}{{ item.hide_comments_list_num || item.comments_count }}{{$t('goods-list.goods-list.8y3cc7')}}</text>
+                            <iconfont :name="item.bool_more ? 'icon-arrow-bottom' : 'icon-arrow-top'" size="24rpx" propClass="pr top-xs"></iconfont>
+                        </view>
+                        <view v-if="item.bool_more" class="cr-red text-size-xs margin-left-main" @tap="close_more(index)">
+                            <text>{{$t('goods-list.goods-list.aem3e6')}}</text>
+                            <iconfont name="icon-arrow-top" size="24rpx" propClass="pr top-xs"></iconfont>
+                        </view>
+                    </view>
+                </view>
+                <!-- 结尾 -->
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            </scroll-view>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('datalist', 'index', 'ask'),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page,
+                        goods_id: this.params.goods_id || 0,
+                        is_comments: 1,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 评价图片预览
+            comment_images_show_event(e) {
+                var index = e.currentTarget.dataset.index;
+                var ix = e.currentTarget.dataset.ix;
+                uni.previewImage({
+                    current: this.data_list[index]['images'][ix],
+                    urls: this.data_list[index]['images'],
+                });
+            },
+
+            // 查看更多
+            open_more(id, i) {
+                var new_data_list = this.data_list;
+                new_data_list[i].bool_more = true;
+                if (new_data_list[i].bool_api === undefined || new_data_list[i].bool_api === true) {
+                    // 加载loding
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                    // 获取数据
+                    uni.request({
+                        url: app.globalData.get_request_url('commentsreplylist', 'index', 'ask'),
+                        method: 'POST',
+                        data: {
+                            ask_id: id,
+                            ask_comments_id: 0,
+                            page: new_data_list[i].page || 1,
+                            is_comments: 1,
+                        },
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            uni.stopPullDownRefresh();
+                            if (res.data.code == 0) {
+                                if (res.data.data.data.length > 0) {
+                                    if ((new_data_list[i].page || 1) <= 1) {
+                                        new_data_list[i].comments_list = res.data.data.data;
+                                    } else {
+                                        new_data_list[i].comments_list = new_data_list[i].comments_list.concat(res.data.data.data);
+                                    }
+                                    new_data_list[i].hide_comments_list_num = res.data.data.total-new_data_list[i].comments_list.length;
+                                    // 判断当前页数是否小于总页数，如果是则继续显示更多按钮，且当前页+1，如果不是则隐藏更多按钮
+                                    if (res.data.data.page < res.data.data.page_total) {
+                                        new_data_list[i].hide_more = false;
+                                        new_data_list[i].page = (new_data_list[i].page || 1) + 1;
+                                    } else {
+                                        new_data_list[i].hide_more = true;
+                                    }
+                                    new_data_list[i].page_total = res.data.data.page_total;
+                                    new_data_list[i].bool_api = true;
+                                    this.setData({
+                                        data_list: new_data_list,
+                                    });
+                                }
+                            } else {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                } else {
+                    // 查看更多是否调用接口
+                    new_data_list[i].bool_api = true;
+                    // 是否隐藏更多查看按钮
+                    new_data_list[i].hide_more = !((new_data_list[i].hide_comments_list_num == undefined && new_data_list[i].comments_count > 0) || new_data_list[i].hide_comments_list_num < new_data_list[i].comments_count);
+                    this.setData({
+                        data_list: new_data_list,
+                    });
+                }
+            },
+
+            // 收起更多
+            close_more(i) {
+                var new_data_list = this.data_list;
+                // 查看更多是否调用接口
+                new_data_list[i].bool_api = false;
+                // 是否隐藏更多查看按钮
+                new_data_list[i].hide_more = false;
+                // 是否展示更多内容
+                new_data_list[i].bool_more = false;
+                this.setData({
+                    data_list: new_data_list,
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style scoped>
+    @import './goods-list.css';
+</style>
diff --git a/pages/plugins/ask/index/index.css b/pages/plugins/ask/index/index.css
new file mode 100644
index 0000000..eb9cdf0
--- /dev/null
+++ b/pages/plugins/ask/index/index.css
@@ -0,0 +1,38 @@
+.scroll-box {
+    height: calc(100vh - 40px);
+}
+
+.status .ask-status {
+    padding: 4rpx 10rpx;
+}
+
+.ask-bg-green {
+    background-color: #5FB95E;
+}
+
+.ask-bg-yellow {
+    background-color: #FAAD14;
+}
+
+.status .num {
+    margin-left: 16rpx;
+}
+
+.ask-hot {
+    width: 32rpx;
+    height: 32rpx;
+    line-height: 32rpx;
+    color: #FFB868;
+}
+
+.hot-bg-0 {
+    background: linear-gradient(150deg, #FC6761 0%, #ED4540 100%);
+}
+
+.hot-bg-1 {
+    background: linear-gradient(150deg, #FFA12A 0%, #FF8605 100%);
+}
+
+.hot-bg-2 {
+    background: linear-gradient(150deg, #FFCE90 0%, #FFAA4E 100%);
+}
\ No newline at end of file
diff --git a/pages/plugins/ask/index/index.vue b/pages/plugins/ask/index/index.vue
new file mode 100644
index 0000000..8496314
--- /dev/null
+++ b/pages/plugins/ask/index/index.vue
@@ -0,0 +1,324 @@
+<template>
+    <view :class="theme_view">
+        <component-nav-back :propFixed="false" propClass="bg-white cr-black" propColor="#333" :style="'padding-top:' + (status_bar_height + 5) + 'px;'">
+            <template slot="right" :class="is_mp_env ? 'top-search-width' : ''">
+                <view class="margin-left-main" :class="is_mp_env ? '' : 'flex-1 flex-width'">
+                    <component-search @onsearch="search_button_event" propIsOnEvent :propIsRequired="false" propIconColor="#ccc" propPlaceholderClass="cr-grey-c" propBgColor="#f6f6f6"></component-search>
+                </view>
+            </template>
+        </component-nav-back>
+        <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60" :style="'height: calc(100vh - '+(40+status_bar_height)+'px)'">
+            <view class="wh-auto">
+                <!-- 轮播 -->
+                <view v-if="slider_list.length > 0" class="padding-horizontal-main spacing-mb padding-top-main">
+                    <component-banner :propData="slider_list"></component-banner>
+                </view>
+                <!-- tab -->
+                <view v-if="nav_list.length > 0" class="ask-tab flex-row jc-sa align-c bg-white wh-auto left-0 top-0 ps z-i padding-bottom-sm">
+                    <view v-for="(item, index) in nav_list" :key="index" class="flex-1 padding-vertical-sm tc" :class="nav_index === index ? 'cr-main fw-b nav-active-line' : 'cr-base'" :data-index="index" :data-type="item.type" @tap="nav_change_event">{{ item.name }}</view>
+                </view>
+                <!-- 内容列表 -->
+                <view :class="(data_base.is_user_add_ask || 0) == 1 ? 'page-bottom-fixed' : ''">
+                    <view v-if="data_list.length > 0" class="padding-horizontal-main padding-top-main">
+                        <block v-for="(item, index) in data_list" :key="index">
+                            <view :data-value="'/pages/plugins/ask/detail/detail?id=' + item.id" @tap="url_event" class="padding-main border-radius-main bg-white oh cp spacing-mb flex-row">
+                                <view v-if="nav_index === 1">
+                                    <view class="ask-hot border-radius-sm tc margin-right-sm va-m pr top-md" :class="index < 3 ? 'cr-white text-size-xs hot-bg-' + index : 'text-size-md'">{{ index + 1 }}</view>
+                                </view>
+                                <view class="flex-1 flex-width">
+                                    <view class="title text-size fw-b">{{ item.title }}</view>
+                                    <view v-if="item.title != item.content" class="content cr-base margin-top-sm padding-top-xs multi-text">
+                                        <mp-html :content="item.content" />
+                                    </view>
+                                    <view class="status flex-row align-c spacing-mt text-size-xs">
+                                        <view v-if="nav_index !== 1" class="ask-status cr-white border-radius-sm text-size-xss" :class="item.is_reply === '1' ? 'ask-bg-green' : 'ask-bg-yellow'">{{ item.is_reply === '1' ? $t('index.index.1c17n3') : $t('index.index.75l3l2') }}</view>
+                                        <view class="num cr-grey-9 flex-row self-c">
+                                            {{ item.add_time_date }}
+                                            <view class="fw-b padding-horizontal-xs">·</view>
+                                            {{ item.access_count || '0' }}{{ $t('detail.detail.e6ga1y') }}</view>
+                                    </view>
+                                </view>
+                            </view>
+                        </block>
+                        <!-- 结尾 -->
+                        <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" :propLoadingLogoTop="slider_list.length > 0 ? '80%' : '50%'"></component-no-data>
+                    </view>
+                </view>
+            </view>
+        </scroll-view>
+        <view v-if="(data_base.is_user_add_ask || 0) == 1" class="bottom-fixed" :style="bottom_fixed_style">
+            <view class="bottom-line-exclude">
+                <view class="item flex-row jc-sa align-c text-size fw-b br bg-white round padding-vertical">
+                    <view data-value="/pages/plugins/ask/form/form" @tap="url_event" class="flex-1 tc flex-col jc-c align-c cp">
+                        <view class="divider-r-d wh-auto"> <iconfont name="icon-edit-below-line" size="30rpx" color="#333" propClass="margin-right-sm"></iconfont>{{ $t('goods-detail.goods-detail.7ulh8b') }}</view>
+                    </view>
+                    <view data-value="/pages/plugins/ask/user-list/user-list" @tap="url_event" class="flex-1 tc flex-col jc-c align-c cp">
+                        <view class="wh-auto"> <iconfont name="icon-list-dot" size="32rpx" color="#333" propClass="margin-right-sm pr top-xs"></iconfont>{{ $t('detail.detail.p7o522') }}</view>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNavBack from '@/components/nav-back/nav-back';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentSearch from '@/components/search/search';
+    import componentBanner from '@/components/slider/slider';
+
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                status_bar_height: bar_height,
+                is_mp_env: false,
+                // #ifdef MP-WEIXIN || MP-BAIDU || MP-ALIPAY || MP-QQ || MP-KUAISHOU
+                is_mp_env: true,
+                // #endif
+                bottom_fixed_style: '',
+                data_base: {},
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                // 轮播
+                slider_list: [],
+                // 导航分类
+                nav_list: [],
+                nav_index: 0,
+                nav_type: '',
+                // 搜索框关键字
+                search_bwg: '',
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNavBack,
+            componentNoData,
+            componentBottomLine,
+            componentSearch,
+            componentBanner
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.get_data();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            get_data() {
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'index', 'ask'),
+                    method: 'POST',
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.search_tab_list.length > 0) {
+                                var data_base = res.data.data.base || {};
+                                this.setData({
+                                    data_base: data_base,
+                                    slider_list: res.data.data.slider_list || [],
+                                    nav_list: res.data.data.search_tab_list || [],
+                                    // 基础自定义分享
+                                    share_info: {
+                                        title: data_base.seo_title || data_base.application_name || this.$t('goods-detail.goods-detail.k5u755'),
+                                        desc: data_base.seo_desc || '',
+                                        path: '/pages/plugins/ask/index/index',
+                                    },
+                                });
+
+                                // 拉取列表数据
+                                this.get_data_list();
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 2,
+                                    data_list_loding_msg: this.$t('index.index.17vy72'),
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                        }
+                    },
+                    fail: () => {
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('datalist', 'index', 'ask'),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page,
+                        type: this.nav_type,
+                        bwd: this.search_bwg,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (this.data_page <= 1) {
+                                var temp_data_list = res.data.data.data;
+                            } else {
+                                var temp_data_list = this.data_list || [];
+                                var temp_data = res.data.data.data;
+                                for (var i in temp_data) {
+                                    temp_data_list.push(temp_data[i]);
+                                }
+                            }
+
+                            this.setData({
+                                data_list: temp_data_list,
+                                data_total: res.data.data.total,
+                                data_page_total: res.data.data.page_total,
+                                data_list_loding_status: temp_data_list.length > 0 ? 3 : 0,
+                                data_page: this.data_page + 1,
+                                data_is_loading: 0,
+                            });
+                            // 是否还有数据
+                            this.setData({
+                                data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                                data_is_loading: 0,
+                            });
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                            data_is_loading: 0,
+                        });
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 查询
+            search_button_event(e) {
+                this.setData({
+                    search_bwg: e || '',
+                    data_page: 1,
+                    data_list: []
+                });
+                this.reset_scroll();
+                this.get_data_list(1);
+            },
+
+            // 重置滑动位置
+            reset_scroll() {
+                this.setData({
+                    scroll_top: this.scroll_top_old,
+                });
+                this.$nextTick(() => {
+                    this.setData({
+                        scroll_top: 0,
+                    });
+                });
+            },
+
+            nav_change_event(e) {
+                // 索引值
+                var index = e.currentTarget.dataset.index || 0;
+                var type = e.currentTarget.dataset.type || 0;
+                this.setData({
+                    data_list: [],
+                    nav_index: index,
+                    nav_type: type,
+                    data_page: 1,
+                });
+                this.reset_scroll();
+                this.get_data_list(1);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style scoped>
+    @import './index.css';
+</style>
diff --git a/pages/plugins/ask/user-detail/user-detail.vue b/pages/plugins/ask/user-detail/user-detail.vue
new file mode 100644
index 0000000..6080459
--- /dev/null
+++ b/pages/plugins/ask/user-detail/user-detail.vue
@@ -0,0 +1,146 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="data_list_loding_status != 1 && data.length != 0">
+            <component-panel-content :propData="data" :propDataField="field_list" propExcludeField="content" propTitle="详情"></component-panel-content>
+
+            <component-panel-content propTitle="提问内容">
+                <view class="item br-b-f5 oh padding-vertical-main">
+                    <mp-html :content="data.content"></mp-html>
+                </view>
+            </component-panel-content>
+
+            <component-panel-content propTitle="回复内容">
+                <view class="item br-b-f5 oh padding-vertical-main">
+                    <mp-html :content="data.reply"></mp-html>
+                </view>
+            </component-panel-content>
+        </block>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNavBack from '@/components/nav-back/nav-back';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentPanelContent from '@/components/panel-content/panel-content';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                ask_static_url: app.globalData.get_static_url('ask', true),
+                data: {},
+                field_list: [],
+                data_list_loding_status: 1,
+                params: '',
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNavBack,
+            componentNoData,
+            componentPanelContent,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            if (params) {
+                this.setData({
+                    params: params,
+                });
+            }
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            get_data() {
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('detail', 'ask', 'ask'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            this.setData({
+                                data: res.data.data.data || [],
+                                field_list: res.data.data.field_list || [],
+                                data_list_loding_status: 3,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 顶部返回操作
+            top_nav_left_back_event(e) {
+                app.globalData.page_back_prev_event();
+            },
+
+            // 页面滚动监听
+            onPageScroll(res) {
+                uni.$emit('onPageScroll', res);
+            },
+        },
+    };
+</script>
+<style>
+</style>
diff --git a/pages/plugins/ask/user-list/user-list.css b/pages/plugins/ask/user-list/user-list.css
new file mode 100644
index 0000000..99985ae
--- /dev/null
+++ b/pages/plugins/ask/user-list/user-list.css
@@ -0,0 +1,3 @@
+.ask-status {
+    padding: 4rpx 10rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/ask/user-list/user-list.vue b/pages/plugins/ask/user-list/user-list.vue
new file mode 100644
index 0000000..ef574dd
--- /dev/null
+++ b/pages/plugins/ask/user-list/user-list.vue
@@ -0,0 +1,237 @@
+<template>
+    <view :class="theme_view">
+        <view class="page-bottom-fixed">
+            <view v-if="data_list.length > 0" class="padding-main">
+                <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                    <view class="base oh br-b-dashed padding-bottom-main flex-row jc-sb align-c">
+                        <text class="cr-grey-9">{{ item.add_time_time }}</text>
+                        <text class="ask-status margin-left-xs" :class="item.is_reply == 1 ? 'cr-green' : 'cr-grey-c'">{{ item.is_reply_name }}</text>
+                    </view>
+                    <view :data-value="'/pages/plugins/ask/user-detail/user-detail?id=' + item.id" @tap="url_event" class="content margin-top-main cp">
+                        <component-panel-content :propData="item" :propDataField="field_list" :propIsItemShowMax="4" propExcludeField="add_time_time,is_reply" :propIsTerse="true"></component-panel-content>
+                    </view>
+                    <view class="item-operation tr margin-top-main">
+                        <button class="btn round br-grey-9 bg-white text-size-md" type="default" size="mini" @tap="delete_event" :data-value="item.id" hover-class="none">{{ $t('common.del') }}</button>
+                        <button v-if="item.is_reply == 0" class="btn round cr-main br-main bg-white text-size-md" type="default" size="mini" :data-value="'/pages/plugins/ask/form/form?id=' + item.id" @tap="url_event" hover-class="none">{{ $t('common.edit') }}</button>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+
+            <view class="bottom-fixed" :style="bottom_fixed_style">
+                <view class="bottom-line-exclude">
+                    <button class="item bg-white br-main cr-main round text-size" type="default" data-value="/pages/plugins/ask/form/form" @tap="url_event" hover-class="none">{{ $t('goods-detail.goods-detail.7ulh8b') }}</button>
+                </view>
+            </view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentPanelContent from '@/components/panel-content/panel-content';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                bottom_fixed_style: '',
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentPanelContent,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if (this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'ask', 'ask'),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if (this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (this.data_page <= 1) {
+                                var temp_data_list = res.data.data.data_list;
+                            } else {
+                                var temp_data_list = this.data_list || [];
+                                var temp_data = res.data.data.data;
+                                for (var i in temp_data) {
+                                    temp_data_list.push(temp_data[i]);
+                                }
+                            }
+                            this.setData({
+                                data_list: temp_data_list,
+                                field_list: res.data.data.field_list || [],
+                                data_total: res.data.data.total,
+                                data_page_total: res.data.data.page_total,
+                                data_list_loding_status: 3,
+                                data_page: this.data_page + 1,
+                                data_is_loading: 0,
+                            });
+
+                            // 是否还有数据
+                            this.setData({
+                                data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if (this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 删除留言
+            delete_event(e) {
+                const value = e.currentTarget.dataset.value;
+                uni.request({
+                    url: app.globalData.get_request_url('delete', 'ask', 'ask'),
+                    method: 'POST',
+                    data: {
+                        ids: value,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            this.setData({
+                                data_page: 1,
+                            });
+                            this.get_data_list(1);
+                        } else {
+                            if (app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            } else {
+                                app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                            }
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+        },
+    };
+</script>
+<style scoped>
+    @import './user-list.css';
+</style>
diff --git a/pages/plugins/binding/detail/detail.css b/pages/plugins/binding/detail/detail.css
new file mode 100644
index 0000000..f3224f0
--- /dev/null
+++ b/pages/plugins/binding/detail/detail.css
@@ -0,0 +1,87 @@
+/**
+* 商品列表
+*/
+.data-list .item .goods-img {
+    width: 160rpx;
+    height: 160rpx !important;
+}
+
+.data-list .item .binding-check {
+    width: 40rpx;
+}
+
+.data-list .item .spec-choice {
+    height: 40rpx;
+    line-height: 40rpx;
+    padding: 0 34rpx 0 20rpx;
+}
+
+.data-list .item .cart-badge-icon {
+    top: -16rpx;
+    right: 0;
+}
+
+.lose-efficacy {
+    z-index: 1;
+    background: rgba(255, 255, 255, 0.6);
+}
+
+.lose-efficacy .rotate {
+    width: 130rpx;
+    transform: rotate(-30deg);
+}
+
+.lose-efficacy .rotate-img {
+    width: 100%;
+    transform: rotate(30deg);
+}
+
+.lose-efficacy .rotate-text {
+    margin-left: 18rpx;
+    top: 50%;
+    transform: translateY(-50%);
+    opacity: 0.7;
+}
+
+/**
+ * 导航
+ */
+.bottom-fixed .left-price {
+    width: calc(100% - 270rpx);
+}
+
+.bottom-fixed .right-button {
+    width: 240rpx;
+}
+
+.bottom-fixed .right-button .btn {
+    height: 80rpx;
+    line-height: 78rpx;
+}
+
+.bottom-fixed .left-price .discount-icon {
+    border-top-right-radius: 30rpx;
+    border-bottom-left-radius: 30rpx;
+    background-image: linear-gradient(45deg, #a3f9a3, #248828, #8bc34a, #d2374c, #9c27b0);
+    background-size: 400%;
+    animation: gradient 5s ease infinite;
+    padding: 0 16rpx;
+}
+
+.sales-price .price {
+    font-size: 40rpx;
+}
+
+@keyframes gradient {
+    0% {
+        background-position: 0% 50%;
+    }
+
+    50% {
+        background-position: 100% 50%;
+    }
+
+    100% {
+        background-position: 0% 50%;
+    }
+}
\ No newline at end of file
diff --git a/pages/plugins/binding/detail/detail.vue b/pages/plugins/binding/detail/detail.vue
new file mode 100644
index 0000000..7f991c8
--- /dev/null
+++ b/pages/plugins/binding/detail/detail.vue
@@ -0,0 +1,415 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data || null) != null" class="page-bottom-fixed">
+            <view class="padding-horizontal-main padding-top-main">
+                <!-- 基础信息 -->
+                <view class="base-container oh spacing-mb">
+                    <view class="title-left-border text-size fw-b">{{ data.title }}</view>
+                </view>
+                <view v-if="(data.goods || null) != null && data.goods.length > 0">
+                    <!-- 商品 -->
+                    <view class="data-list oh">
+                        <view v-for="(item, index) in data.goods" :key="index" class="item padding-main border-radius-main bg-white oh spacing-mb flex-row pr">
+                            <image class="goods-img dis-block border-radius-main" :src="item.images" mode="aspectFit" :data-value="item.goods_url" @tap="url_event"></image>
+                            <view class="right-base flex-1 flex-width padding-left-main">
+                                <view class="flex-row jc-c">
+                                    <view :class="'multi-text flex-1 flex-width ' + (data.type == 1 ? 'padding-right' : '')">{{ item.title }}</view>
+                                    <label v-if="data.type == 1 && item.is_error == 0" class="tr binding-check pr bottom-sm" :data-index="index" @tap="goods_choice_event">
+                                        <radio :checked="item.checked == undefined || item.checked == true" :color="theme_color" style="transform: scale(0.7)" />
+                                    </label>
+                                </view>
+                                <view class="single-text margin-top-sm flex-row align-c">
+                                    <view v-if="(item.show_field_price_status || 0) == 1" class="margin-right-lg">
+                                        <text class="sales-price va-m">
+                                            <text class="text-size-xs">{{ item.show_price_symbol }}</text>
+                                            <text class="text-size-lg fw-b">{{ item.price }}</text>
+                                        </text>
+                                        <text class="cr-grey text-size-xs va-m">{{ item.show_price_unit }}</text>
+                                    </view>
+                                    <view v-if="(item.discount_price || 0) != 0" class="cr-green text-size-xs">{{$t('detail.detail.6026t4')}}<text class="text-size-xs">{{ currency_symbol }}</text>
+                                        {{ item.discount_price }}
+                                    </view>
+                                </view>
+                                <view class="margin-top-xs">
+                                    <view v-if="item.is_error == 0" class="flex-row jc-sb align-c">
+                                        <view class="flex-row align-c">
+                                            <view class="margin-right-sm pr" :data-index="index" @tap="goods_cart_event">
+                                                <iconfont name="icon-cart-add" size="42rpx" color="#E22C08"></iconfont>
+                                                <view class="cart-badge-icon pa">
+                                                    <component-badge :propNumber="item.user_cart_count || 0"></component-badge>
+                                                </view>
+                                            </view>
+                                            <text class="cr-grey-9 text-size-xs">{{ item.inventory }}{{ item.inventory_unit }}</text>
+                                        </view>
+                                        <view v-if="(item.is_exist_many_spec || 0) == 1" class="bg-grey-e cr-grey round single-text text-size-xss spec-choice" :data-index="index" @tap="spec_choice_event">
+                                            {{ item.spec_choice_text || $t('detail.detail.9624hp') }}
+                                            <iconfont name="icon-arrow-bottom" size="14rpx" color="#666" class="pa"></iconfont>
+                                        </view>
+                                    </view>
+                                    <view v-else class="cr-grey-9 text-size-xs">{{ item.error_msg }}</view>
+                                </view>
+                            </view>
+                            <view v-if="item.is_error !== 0" class="pa left-0 right-0 top-0 bottom-0 lose-efficacy flex-row jc-c align-c">
+                                <view class="rotate pr">
+                                    <image :src="binding_static_url + 'lapse-icon.png'" mode="widthFix" class="dis-block rotate-img"></image>
+                                    <text class="rotate-text pa cr-red text-size">{{$t('detail.detail.32171c')}}</text>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+
+                    <!-- 导航 -->
+                    <view class="bottom-fixed br-top-shadow pr bg-white bt">
+                        <view class="bottom-line-exclude oh flex-row jc-sb align-c">
+                            <view class="left-price">
+                                <view class="sales-price single-text">
+                                    <text class="text-size-xs">
+                                        {{ currency_symbol }}
+                                    </text>
+                                    <text class="price">
+                                        {{ data.estimate_price }}
+                                    </text>
+                                </view>
+                                <view v-if="data.estimate_discount_price != 0" class="single-text estimate-discount-price margin-top-sm">
+                                    <text class="discount-icon cr-white text-size-xs">{{$t('detail.detail.6026t4')}}</text>
+                                    <text class="cr-green text-size-md">
+                                        <text class="text-size-xss">
+                                            {{ currency_symbol }}
+                                        </text>
+                                        {{ data.estimate_discount_price }}
+                                    </text>
+                                </view>
+                            </view>
+                            <view class="right-button">
+                                <button type="default" size="mini" class="btn bg-main br-main cr-white round text-size fw-b wh-auto" @tap="buy_event">{{$t('detail.detail.27pmj3')}}</button>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <view v-else>
+                    <!-- 提示信息 -->
+                    <component-no-data propStatus="0" :propMsg="$t('detail.detail.5knxg6')"></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>
+
+        <!-- 规格选择 -->
+        <component-goods-spec-choice ref="goods_spec_choice" v-on:specConfirmEvent="spec_confirm_event"></component-goods-spec-choice>
+
+        <!-- 商品购买 -->
+        <component-goods-buy ref="goods_buy" :propCurrencySymbol="currency_symbol" v-on:CartSuccessEvent="goods_cart_back_event"></component-goods-buy>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import base64 from '@/common/js/lib/base64.js';
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentGoodsSpecChoice from '@/components/goods-spec-choice/goods-spec-choice';
+    import componentGoodsBuy from '@/components/goods-buy/goods-buy';
+    import componentBadge from '@/components/badge/badge';
+    let binding_static_url = app.globalData.get_static_url('binding', true);
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                binding_static_url: binding_static_url,
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                currency_symbol: app.globalData.currency_symbol(),
+                params: null,
+                user: null,
+                data_base: null,
+                data: null,
+                // 自定义分享信息
+                share_info: {},
+                theme_color: app.globalData.get_theme_color(),
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentGoodsSpecChoice,
+            componentGoodsBuy,
+            componentBadge
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 初始化配置
+            this.init_config();
+
+            // 获取数据
+            this.get_data();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        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');
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('detail', 'index', 'binding'),
+                    method: 'POST',
+                    data: {
+                        id: this.params.id || 0,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_base: data.base || null,
+                                data: data.data || null,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: (data.data || null) != null && (data.data.goods || null) != null && data.data.goods.length > 0,
+                            });
+
+                            if ((this.data || null) != null) {
+                                // 基础自定义分享
+                                this.setData({
+                                    share_info: {
+                                        title: this.data.seo_title || this.data.title,
+                                        desc: this.data.seo_desc || this.data.describe,
+                                        path: '/pages/plugins/binding/detail/detail',
+                                        query: 'id=' + this.data.id,
+                                        img: this.data.share_images || this.data.images,
+                                    },
+                                });
+
+                                // 标题
+                                if ((this.data.title || null) != null) {
+                                    uni.setNavigationBarTitle({
+                                        title: this.data.title,
+                                    });
+                                }
+                            }
+                        } 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: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 商品选择事件
+            goods_choice_event(e) {
+                // 选择处理
+                var index = e.currentTarget.dataset.index || 0;
+                var temp_data = this.data;
+                var goods = temp_data.goods;
+                goods[index]['checked'] = goods[index]['checked'] == undefined || goods[index]['checked'] == true ? false : true;
+                temp_data['goods'] = goods;
+
+                // 已选商品
+                var min_price = 0;
+                var max_price = 0;
+                var min_discount_price = 0;
+                var max_discount_price = 0;
+                for (var i in goods) {
+                    if ((goods[i]['checked'] == undefined || goods[i]['checked'] == true) && goods[i]['is_error'] == 0) {
+                        min_price += parseFloat(goods[i]['min_price'] || 0);
+                        max_price += parseFloat(goods[i]['max_price'] || 0);
+                        var discount_price = goods[i]['discount_price'] || null;
+                        if (discount_price != null) {
+                            if (discount_price.indexOf('-') == -1) {
+                                min_discount_price += parseFloat(discount_price);
+                                max_discount_price += parseFloat(discount_price);
+                            } else {
+                                var temp = discount_price.split('-');
+                                min_discount_price += parseFloat(temp[0]);
+                                max_discount_price += parseFloat(temp[1]);
+                            }
+                        }
+                    }
+                }
+
+                // 价格
+                if (min_price == max_price) {
+                    var price = app.globalData.price_two_decimal(min_price);
+                } else {
+                    var price = app.globalData.price_two_decimal(min_price) + '-' + app.globalData.price_two_decimal(max_price);
+                }
+
+                // 节省
+                if (min_discount_price == max_discount_price) {
+                    var discount_price = app.globalData.price_two_decimal(min_discount_price);
+                } else {
+                    var discount_price = app.globalData.price_two_decimal(min_discount_price) + '-' + app.globalData.price_two_decimal(max_discount_price);
+                }
+
+                // 购买价格
+                temp_data['estimate_price'] = price;
+                // 节省价格
+                temp_data['estimate_discount_price'] = discount_price;
+                this.setData({ data: temp_data });
+            },
+
+            // 规格选择
+            spec_choice_event(e) {
+                if ((this.$refs.goods_spec_choice || null) != null) {
+                    var index = e.currentTarget.dataset.index || 0;
+                    var goods = this.data['goods'][index];
+                    this.$refs.goods_spec_choice.init(goods.id, goods['specifications']['choose'], goods.buy_min_number, index);
+                }
+            },
+
+            // 规格确认回调事件
+            spec_confirm_event(value) {
+                var temp_data = this.data;
+                temp_data['goods'][value.out_value]['spec_choice_data'] = value.spec;
+                temp_data['goods'][value.out_value]['spec_choice_text'] = value.spec
+                    .map(function (v) {
+                        return v.value;
+                    })
+                    .join(' / ');
+                this.setData({ data: temp_data });
+            },
+
+            // 立即购买
+            buy_event(e) {
+                // 是否需要选择商品
+                var type = parseInt(this.data.type || 0);
+                var goods_data = [];
+                var temp_goods = this.data.goods;
+                for (var i in temp_goods) {
+                    if (temp_goods[i]['is_error'] == 0) {
+                        var goods_id = null;
+                        if (type == 1) {
+                            if (temp_goods[i]['checked'] == undefined || temp_goods[i]['checked'] == true) {
+                                goods_id = temp_goods[i]['id'];
+                            }
+                        } else {
+                            goods_id = temp_goods[i]['id'];
+                        }
+                        if (goods_id !== null) {
+                            // 是否存在多规格
+                            if ((temp_goods[i]['is_exist_many_spec'] || 0) == 1 && (temp_goods[i]['spec_choice_data'] || null) == null) {
+                                app.globalData.showToast(this.$t('detail.detail.8618mj') + (parseInt(i) + 1) + this.$t('detail.detail.09e3bx'));
+                                return false;
+                            }
+                            goods_data.push({
+                                goods_id: goods_id,
+                                stock: temp_goods[i]['buy_min_number'] || 1,
+                                spec: temp_goods[i]['spec_choice_data'] || '',
+                            });
+                        }
+                    } else {
+                        // 组合搭配则每一个商品都需要正确状态
+                        if (type == 0) {
+                            app.globalData.showToast(this.$t('detail.detail.40298g') + (parseInt(i) + 1) + this.$t('detail.detail.5kbjoy'));
+                            return false;
+                        }
+                    }
+                }
+                var buy_min_number = parseInt(this.data.buy_min_number || 1);
+                if (goods_data.length < buy_min_number) {
+                    app.globalData.showToast(this.$t('detail.detail.jsj3u8') + buy_min_number + this.$t('detail.detail.jksm81'));
+                    return false;
+                }
+
+                // 进入订单确认页面
+                var data = {
+                    binding_id: this.data.id,
+                    buy_type: 'goods',
+                    goods_data: encodeURIComponent(base64.encode(JSON.stringify(goods_data))),
+                };
+                app.globalData.url_open('/pages/buy/buy?data=' + encodeURIComponent(base64.encode(JSON.stringify(data))));
+            },
+
+            // 加入购物车
+            goods_cart_event(e) {
+                if ((this.$refs.goods_buy || null) != null) {
+                    var index = e.currentTarget.dataset.index || 0;
+                    var goods = this.data['goods'][index];
+                    this.$refs.goods_buy.init(goods, { buy_event_type: 'cart', is_direct_cart: 1 }, { index: index });
+                }
+            },
+
+            // 加入购物车成功回调
+            goods_cart_back_event(e) {
+                // 增加数量
+                var back = e.back_data;
+                var temp = this.data;
+                var goods = temp['goods'][back.index];
+                goods['user_cart_count'] = parseInt(goods['user_cart_count'] || 0) + parseInt(e.stock);
+                if (goods['user_cart_count'] > 99) {
+                    goods['user_cart_count'] = '99+';
+                }
+                temp['goods'][back.index] = goods;
+                this.setData({ data: temp });
+            },
+        },
+    };
+</script>
+<style scoped>
+    @import './detail.css';
+</style>
diff --git a/pages/plugins/binding/index/index.css b/pages/plugins/binding/index/index.css
new file mode 100644
index 0000000..ca98e45
--- /dev/null
+++ b/pages/plugins/binding/index/index.css
@@ -0,0 +1,7 @@
+.page {
+    padding-bottom: 100rpx;
+}
+
+.back-icon {
+    top: -6rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/binding/index/index.vue b/pages/plugins/binding/index/index.vue
new file mode 100644
index 0000000..3d182b9
--- /dev/null
+++ b/pages/plugins/binding/index/index.vue
@@ -0,0 +1,284 @@
+<template>
+    <view :class="theme_view">
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view :class="'padding-main ' + ((shop || null) != null ? 'page-bottom-fixed' : '')">
+                <block v-if="(data_list || null) != null && data_list.length > 0">
+                    <!-- 组合搭配组件 -->
+                    <component-binding-list :propConfig="data_base" :propData="{data: data_list}" :propCurrencySymbol="currency_symbol"></component-binding-list>
+                </block>
+                <block v-else>
+                    <!-- 提示信息 -->
+                    <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+                </block>
+
+                <!-- 结尾 -->
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            </view>
+
+            <!-- 回到店铺 -->
+            <view v-if="(shop || null) != null" class="bottom-fixed" :style="bottom_fixed_style">
+                <view class="bottom-line-exclude">
+                    <button class="item bg-white cr-main br-main round dis-block text-size" type="default" hover-class="none" @tap="shop_event" :data-value="shop.url">{{$t('index.index.i78v36')}}</button>
+                </view>
+            </view>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentBindingList from '@/components/binding-list/binding-list';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                currency_symbol: app.globalData.currency_symbol(),
+                bottom_fixed_style: '',
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                params: null,
+                data_base: null,
+                shop: null,
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentBindingList,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+
+            // 初始化配置
+            this.init_config();
+
+            // 获取数据
+            this.get_data();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        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', 'binding'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_base: data.base || null,
+                                shop: data.shop || null,
+                            });
+
+                            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/binding/index/index',
+                                    },
+                                });
+
+                                // 导航名称
+                                if ((this.data_base.application_name || null) != null) {
+                                    uni.setNavigationBarTitle({
+                                        title: this.data_base.application_name,
+                                    });
+                                }
+                            }
+
+                            // 获取列表数据
+                            this.get_data_list(1);
+                        } else {
+                            this.setData({
+                                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_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+
+            // 获取数据列表
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({ data_is_loading: 1 });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('datalist', 'index', 'binding'),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page,
+                        shop_id: this.params.shop_id || 0,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            if (data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: data.total,
+                                    data_page_total: data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_is_loading: 0,
+                                });
+                                if (this.data_page <= 1) {
+                                    this.setData({
+                                        data_list: [],
+                                        data_bottom_line_status: false,
+                                    });
+                                }
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                                data_is_loading: 0,
+                            });
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                            data_is_loading: 0,
+                        });
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 店铺事件
+            shop_event(e) {
+                var prev_url = app.globalData.prev_page();
+                if (prev_url != null && prev_url.indexOf('pages/plugins/shop/detail/detail') != -1) {
+                    uni.navigateBack();
+                } else {
+                    app.globalData.url_event(e);
+                }
+            },
+        },
+    };
+</script>
+<style>
+    @import './index.css';
+</style>
diff --git a/pages/plugins/blog/comments/comments.vue b/pages/plugins/blog/comments/comments.vue
new file mode 100644
index 0000000..ef93964
--- /dev/null
+++ b/pages/plugins/blog/comments/comments.vue
@@ -0,0 +1,129 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data || null) != null" class="padding-main bg-white">
+            <!-- 评论内容 -->
+            <component-blog-comments :propData="data" :propDataBase="data_base" :propEmojiList="emoji_list" propType="comments"></component-blog-comments>
+            <!-- 结尾 -->
+            <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>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentBlogComments from '../components/blog-comments/blog-comments';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                params: null,
+                data_base: null,
+                data: null,
+                emoji_list: [],
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentBlogComments,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+
+            // 数据加载
+            this.get_data();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        methods: {
+            // 初始化
+            get_data() {
+                uni.showLoading({
+                    title: this.$t('common.loading_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('commentsinfo', 'index', 'blog'),
+                    method: 'POST',
+                    data: {
+                        id: this.params.id || 0,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        var data = res.data.data;
+                        if (res.data.code == 0 && (data.data || null) != null) {
+                            var blog = data.data;
+                            this.setData({
+                                data_bottom_line_status: true,
+                                data_list_loding_status: 3,
+                                data_base: data.base || null,
+                                data: blog,
+                                emoji_list: data.emoji_list || [],
+                            });
+
+                            // 基础自定义分享
+                            this.setData({
+                                share_info: {
+                                    title: this.data.seo_title || this.data.title,
+                                    desc: this.data.seo_desc || this.data.describe,
+                                    path: '/pages/plugins/blog/detail/detail',
+                                    query: 'id=' + this.data.id,
+                                    img: this.data.cover,
+                                },
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+
+                        // 分享菜单处理
+                        app.globalData.page_share_handle(this.share_info);
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        this.setData({
+                            data_list_loding_status: 2,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+        },
+    };
+</script>
+<style></style>
diff --git a/pages/plugins/blog/components/blog-comments/blog-comments.vue b/pages/plugins/blog/components/blog-comments/blog-comments.vue
new file mode 100644
index 0000000..ee97b08
--- /dev/null
+++ b/pages/plugins/blog/components/blog-comments/blog-comments.vue
@@ -0,0 +1,587 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data || null) != null && (data_base || null) != null">
+            <view class="flex-row jc-sb align-c">
+                <view v-if="(data_base.is_blog_comments_show || 0) == 1" class="fw-b">{{$t('user-order.user-order.twc3r7')}}{{ data.comments_count || '' }}</view>
+                <!-- 点赞、评论、分享 -->
+                <view v-if="propType == 'detail'" class="tr blog-comments-bottom-container cr-grey">
+                    <view v-if="(data_base.is_blog_comments_show || 0) == 1" class="item dis-inline-block cr-base" :data-value="'/pages/plugins/blog/comments/comments?id=' + data.id" @tap="url_event">
+                        <iconfont name="icon-message-square" size="28rpx" propClass="pr top-sm margin-right-xs"></iconfont>
+                        <text class="text-size-xs">{{$t('ask-comments.ask-comments.2zlnb5')}}{{ data.comments_count }})</text>
+                    </view>
+                    <view v-if="(data_base.is_blog_give_thumbs || 0) == 1" :class="'item dis-inline-block cr-' + ((data.is_give_thumbs || 0) == 1 ? 'main' : 'base')" :data-blogid="data.id" @tap="give_thumbs_event">
+                        <iconfont :name="(data.is_give_thumbs || 0) == 1 ? 'icon-givealike' : 'icon-givealike-o'" size="28rpx" propClass="pr top-sm margin-right-xs"></iconfont>
+                        <text class="va-m text-size-xs">{{$t('ask-comments.ask-comments.du7rcv')}}{{ data.give_thumbs_count }})</text>
+                    </view>
+                    <view class="item dis-inline-block cr-base" @tap="popup_share_event">
+                        <iconfont name="icon-share" size="28rpx" propClass="pr top-sm margin-right-xs"></iconfont>
+                        <text class="text-size-xs">{{$t('common.share')}}</text>
+                    </view>
+                </view>
+            </view>
+            <!-- 评论回复表单 -->
+            <view v-if="(data_base.is_blog_comments_add || 0) == 1 && !input_comments_modal_status" class="padding-top-xxxl padding-bottom-xxl blog-comments-reply-container flex-row jc-sb spacing-mb">
+                <image :src="avatar" mode="aspectFill" class="user-avatar fl circle"></image>
+                <view class="right-base flex-1 flex-width">
+                    <view class="comments border-radius-main padding-main">
+                        <textarea :placeholder="$t('ask-comments.ask-comments.m67961')" placeholder-class="cr-grey" class="wh-auto bg-grey-f8" :value="input_comments_value" :maxlength="input_comments_length_max" @input="comments_input_event" @blur="comments_input_event"></textarea>
+                        <view class="oh flex-row jc-sb align-e">
+                            <image :src="common_static_url + 'emoji-icon.png'" mode="aspectFill" class="emoji-icon va-m" @tap="emoji_event"></image>
+                            <view class="flex-row align-e">
+                                <!-- #ifndef MP-ALIPAY -->
+                                <text class="text-size-xs cr-grey-d margin-right-sm">{{$t('login.login.n24i5u')}}{{ input_comments_length_value }}{{$t('ask-comments.ask-comments.6l6vz7')}}</text>
+                                <!-- #endif  -->
+                                <button type="default" size="mini" class="comment-btn cr-white border-radius-sm text-size-md va-m" :class="input_comments_value.length > 0 ? 'bg-main br-main ' : 'comment-btn-default'" @tap="comments_event">{{$t('user-order.user-order.twc3r7')}}</button>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <!-- 评论回复内容 -->
+            <view v-if="(data_base.is_blog_comments_show || 0) == 1 && (data.comments_list || null) != null && data.comments_list.length > 0" class="blog-comments-list">
+                <block v-for="(item, index) in data.comments_list" :key="index">
+                    <view class="item oh flex-row jc-sb">
+                        <image :src="item.user.avatar" mode="aspectFill" class="user-avatar circle fl"></image>
+                        <view class="right-content flex-1 flex-width" :class="data.comments_list.length > index + 1 ? 'br-b-e padding-bottom-main margin-bottom-main' : ''">
+                            <view class="comments-base oh">
+                                <text class="username fw-b">{{ item.user.user_name_view }}</text>
+                                <text class="cr-grey-9 margin-left-main">{{ item.add_time }}</text>
+                            </view>
+                            <view class="margin-top-sm comments-content">{{ item.content }}</view>
+                            <view class="blog-comments-right-content-operate margin-top-main flex-row jc-e align-c text-size-xs cr-grey-9">
+                                <view v-if="(data_base.is_blog_comments_show || 0) == 1" class="item dis-inline-block" :data-index="index" :data-username="item.user.user_name_view" :data-blogcommentsid="item.id" @tap="modal_open_event">
+                                    <iconfont name="icon-message-square" size="28rpx" propClass="pr top-md margin-right-xs"></iconfont>
+                                    <text class="va-m">{{$t('ask-comments.ask-comments.3fcnme')}}{{ item.comments_count }})</text>
+                                </view>
+                                <view v-if="(data_base.is_blog_give_thumbs || 0) == 1" :class="'item dis-inline-block margin-left-xxxl padding-left-sm cr-' + ((item.is_give_thumbs || 0) == 1 ? 'main' : '')" data-type="1" :data-index="index" :data-blogid="item.blog_id" :data-blogcommentsid="item.id" @tap="give_thumbs_event">
+                                    <iconfont :name="(item.is_give_thumbs || 0) == 1 ? 'icon-givealike' : 'icon-givealike-o'" size="28rpx" propClass="pr top-md margin-right-xs"></iconfont>
+                                    <text class="va-m">{{$t('ask-comments.ask-comments.du7rcv')}}{{ item.give_thumbs_count }})</text>
+                                </view>
+                            </view>
+                            <view v-if="(item.reply_comments_list || null) != null && item.reply_comments_list.length > 0" class="reply-blog-comments-list">
+                                <block v-for="(comments, index2) in item.reply_comments_list" :key="index2">
+                                    <view class="bg-grey-e">
+                                        <view class="item padding-main oh flex-row jc-sb">
+                                            <image :src="comments.user.avatar" mode="aspectFill" class="user-avatar circle fl"></image>
+                                            <view class="right-content flex-1 flex-width">
+                                                <view class="comments-reply-base oh">
+                                                    <text class="username fw-b">{{ comments.user.user_name_view }}</text>
+                                                    <text class="cr-grey-9 margin-left-main">{{ comments.add_time }}</text>
+                                                </view>
+                                                <view v-if="(comments.reply_comments_text || null) != null" class="margin-top-sm reply-content">{{ comments.reply_comments_text }}</view>
+                                                <view class="margin-top-sm">{{ comments.content }}</view>
+                                                <view class="blog-comments-right-content-operate flex-row jc-e align-c text-size-xs cr-grey-9 padding-0">
+                                                    <view v-if="(data_base.is_blog_comments_show || 0) == 1" class="item dis-inline-block" :data-index="index" :data-username="comments.user.user_name_view" :data-blogcommentsid="comments.blog_comments_id" :data-replycommentsid="comments.id" @tap="modal_open_event">
+                                                        <iconfont name="icon-message-square" size="28rpx" propClass="pr top-md margin-right-xs"></iconfont>
+                                                        <text class="va-m">{{$t('ask-comments.ask-comments.3fcnme')}}{{ comments.comments_count }})</text>
+                                                    </view>
+                                                    <view
+                                                        v-if="(data_base.is_blog_give_thumbs || 0) == 1"
+                                                        :class="'item dis-inline-block margin-left-xxxl padding-left-sm cr-' + ((comments.is_give_thumbs || 0) == 1 ? 'main' : '')"
+                                                        data-type="2"
+                                                        :data-index="index"
+                                                        :data-indexs="index2"
+                                                        :data-blogid="comments.blog_id"
+                                                        :data-blogcommentsid="comments.id"
+                                                        :data-replycommentsid="comments.blog_comments_id"
+                                                        @tap="give_thumbs_event"
+                                                    >
+                                                        <iconfont :name="(comments.is_give_thumbs || 0) == 1 ? 'icon-givealike' : 'icon-givealike-o'" size="28rpx" propClass="pr top-md margin-right-xs"></iconfont>
+                                                        <text class="va-m">{{$t('ask-comments.ask-comments.du7rcv')}}{{ comments.give_thumbs_count }})</text>
+                                                    </view>
+                                                </view>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </block>
+                            </view>
+                            <view v-if="(item.comments_count || 0) > 0 && (item.is_comments_list_submit == undefined || item.is_comments_list_submit == 1)" class="margin-top-lg text-size-xs">
+                                <text :data-index="index" :data-blogid="item.blog_id" :data-blogcommentsid="item.id" @tap="comments_list_reply_event">
+                                    <text v-if="item.is_comments_list_submit == undefined" class="cr-grey">{{$t('goods-list.goods-list.278qr1')}}{{ item.comments_count }}{{$t('ask-comments.ask-comments.ymmd24')}}</text>
+                                    <text v-else class="cr-grey">{{$t('ask-comments.ask-comments.dfhg54')}}</text>
+                                    <iconfont name="icon-arrow-bottom" size="24rpx" propClass="margin-left-xs pr top-xs"></iconfont>
+                                </text>
+                            </view>
+                        </view>
+                    </view>
+                </block>
+                <block v-if="((data_base.blog_detail_comments_more_page_number || 0) == 0 && (data.comments_count || 0) > 20) || ((data_base.blog_detail_comments_more_page_number || 0) > 0 && data.comments_count > data_base.blog_detail_comments_more_page_number)">
+                    <view v-if="propType == 'detail'" class="margin-top-xxxl tc padding-vertical-main bg-grey-f8 border-radius-sm">
+                        <text :data-value="'/pages/plugins/blog/comments/comments?id=' + data.id" @tap="url_event">
+                            <text class="cr-grey">{{$t('goods-list.goods-list.278qr1')}}{{ data.comments_count }}{{$t('ask-comments.ask-comments.5401r1')}}</text>
+                            <iconfont name="icon-arrow-right" size="24rpx" propClass="margin-left-xs pr top-xs"></iconfont>
+                        </text>
+                    </view>
+                    <view v-if="propType == 'comments' && (data.is_comments_list_submit == undefined || data.is_comments_list_submit == 1)" class="margin-top-xxxl tc padding-vertical-main bg-grey-f8 border-radius-sm">
+                        <text :data-blogid="data.id" @tap="comments_list_reply_event">
+                            <text class="cr-grey">{{$t('ask-comments.ask-comments.4l77wt')}}</text>
+                            <iconfont name="icon-arrow-bottom" size="24rpx" propClass="margin-left-xs pr top-xs"></iconfont>
+                        </text>
+                    </view>
+                </block>
+            </view>
+            <!-- 回复弹窗 -->
+            <view v-if="input_comments_modal_status" class="blog-comments-modal pf">
+                <view class="blog-comments-modal-content bg-white border-radius-main pr">
+                    <view class="tc margin-bottom-lg">
+                        <text>{{$t('ask-comments.ask-comments.8sjar6')}}{{ input_comments_modal_username }}</text>
+                        <view class="close pa">
+                            <view @tap.stop="modal_close_event">
+                                <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                            </view>
+                        </view>
+                    </view>
+                    <textarea :placeholder="$t('ask-comments.ask-comments.m67961')" placeholder-class="cr-grey" class="wh-auto br padding-main" :value="input_comments_value" :maxlength="input_comments_length_max" @input="comments_input_event" @blur="comments_input_event"></textarea>
+                    <view class="margin-top-lg oh">
+                        <image :src="common_static_url + 'emoji-icon.png'" mode="aspectFill" class="emoji-icon va-m" @tap="emoji_event"></image>
+                        <view class="fr">
+                            <text class="va-m text-size-xs cr-grey margin-right-lg">{{$t('login.login.n24i5u')}}{{ input_comments_length_value }}{{$t('ask-comments.ask-comments.6l6vz7')}}</text>
+                            <button type="default" size="mini" class="comment-btn cr-white border-radius-sm text-size-xs va-m" :class="input_comments_value.length > 0 ? 'bg-main br-main ' : 'comment-btn-default'" @tap="comments_event">{{$t('user-order.user-order.twc3r7')}}</button>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 表情弹窗 -->
+            <component-emoji-popup ref="emoji" v-on:choiceConfirmEvent="emoji_choice_confirm_event"></component-emoji-popup>
+
+            <!-- 分享弹窗 -->
+            <component-share-popup ref="share"></component-share-popup>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    var common_static_url = app.globalData.get_static_url('common');
+    import componentPopup from '@/components/popup/popup';
+    import componentSharePopup from '@/components/share-popup/share-popup';
+    import componentEmojiPopup from '@/components/emoji-popup/emoji-popup';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                avatar: app.globalData.data.default_user_head_src,
+                user: null,
+                data_base: null,
+                data: null,
+                emoji_list: [],
+                input_comments_value: '',
+                input_comments_cursor: 0,
+                input_comments_length_value: 500,
+                input_comments_length_max: 500,
+                input_comments_modal_status: false,
+                input_comments_modal_index: 0,
+                input_comments_modal_username: '',
+                input_comments_modal_blog_comments_id: 0,
+                input_comments_modal_reply_comments_id: 0,
+            };
+        },
+        props: {
+            propType: {
+                type: String,
+                default: 'detail',
+            },
+            propData: {
+                type: [Object, null],
+                default: null,
+            },
+            propDataBase: {
+                type: [Object, null],
+                default: null,
+            },
+            propEmojiList: {
+                type: [Array, null],
+                default: [],
+            },
+            propShareInfo: {
+                type: [Object, null],
+                default: {},
+            }
+        },
+        components: {
+            componentPopup,
+            componentSharePopup,
+            componentEmojiPopup,
+        },
+
+        // 页面被展示
+        created: function (e) {
+            var avatar = app.globalData.data.default_user_head_src;
+            var user = app.globalData.get_user_cache_info() || null;
+            this.setData({
+                user: user,
+                avatar: user == null ? avatar : user.avatar || avatar,
+                data: this.propData,
+                data_base: this.propDataBase,
+                emoji_list: this.propEmojiList,
+            });
+        },
+
+        methods: {
+            // 分享开启弹层
+            popup_share_event(e) {
+                if ((this.$refs.share || null) != null) {
+                    this.$refs.share.init({
+                        share_info: this.propShareInfo
+                    });
+                }
+            },
+
+            // 评论弹窗关闭
+            modal_close_event(e) {
+                this.setData({
+                    input_comments_modal_status: false,
+                    input_comments_modal_index: 0,
+                    input_comments_modal_username: '',
+                    input_comments_modal_blog_comments_id: 0,
+                    input_comments_modal_reply_comments_id: 0,
+                    input_comments_value: '',
+                });
+            },
+
+            // 评论弹窗开启
+            modal_open_event(e) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                var user = app.globalData.get_user_info(this, 'modal_open_event', e);
+                if (user != false) {
+                    var index = parseInt(e.currentTarget.dataset.index || 0);
+                    var username = e.currentTarget.dataset.username;
+                    var blog_comments_id = e.currentTarget.dataset.blogcommentsid || 0;
+                    var reply_comments_id = e.currentTarget.dataset.replycommentsid || 0;
+                    this.setData({
+                        input_comments_modal_status: true,
+                        input_comments_value: '',
+                        input_comments_modal_index: index,
+                        input_comments_modal_username: username,
+                        input_comments_modal_blog_comments_id: blog_comments_id,
+                        input_comments_modal_reply_comments_id: reply_comments_id,
+                    });
+                }
+            },
+
+            // 表情选择事件
+            emoji_event() {
+                if (this.input_comments_length_value == 0) {
+                    app.globalData.showToast(this.$t('ask-comments.ask-comments.3o1rq6'));
+                    return false;
+                }
+                if ((this.$refs.emoji || null) != null) {
+                    this.$refs.emoji.init({ emoji_list: this.emoji_list });
+                }
+            },
+
+            // 评论输入和失去焦点事件
+            comments_input_event(e) {
+                var value = e.detail.value.trim();
+                var length = this.input_comments_length_max - value.length;
+                this.setData({
+                    input_comments_cursor: e.detail.cursor || 0,
+                    input_comments_value: value,
+                    input_comments_length_value: length <= 0 ? 0 : length,
+                });
+            },
+
+            // 表情选择确认事件
+            emoji_choice_confirm_event(emoji) {
+                var value = this.input_comments_value;
+                var cursor = parseInt(this.input_comments_cursor || 0);
+                if (value != '') {
+                    if (cursor == 0) {
+                        value = emoji + value;
+                    } else {
+                        var first = value.substr(0, cursor);
+                        var last = value.substr(cursor, value.length);
+                        value = first + emoji + last;
+                    }
+                } else {
+                    value = emoji;
+                }
+                var length = this.input_comments_length_max - value.length;
+                this.setData({
+                    input_comments_value: value,
+                    input_comments_length_value: length <= 0 ? 0 : length,
+                });
+            },
+
+            // 获取评论列表
+            comments_list_reply_event(e) {
+                var temp_data = this.data;
+                var page = 1;
+                var index = parseInt(e.currentTarget.dataset.index || 0);
+                var blog_id = e.currentTarget.dataset.blogid;
+                var blog_comments_id = e.currentTarget.dataset.blogcommentsid || 0;
+                if (blog_comments_id == 0) {
+                    if ((temp_data['page'] || null) == null) {
+                        temp_data['page'] = 1;
+                    } else {
+                        temp_data['page'] += 1;
+                    }
+                    page = temp_data['page'];
+                } else {
+                    if ((temp_data['comments_list'][index]['page'] || null) == null) {
+                        temp_data['comments_list'][index]['page'] = 1;
+                    } else {
+                        temp_data['comments_list'][index]['page'] += 1;
+                    }
+                    page = temp_data['comments_list'][index]['page'];
+                }
+                uni.showLoading({
+                    title: this.$t('common.loading_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('commentsreplylist', 'index', 'blog'),
+                    method: 'POST',
+                    data: {
+                        blog_id: blog_id,
+                        blog_comments_id: blog_comments_id,
+                        page: page,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            if (blog_comments_id == 0) {
+                                var temp_list = temp_data['comments_list'] || [];
+                            } else {
+                                var temp_list = temp_data['comments_list'][index]['reply_comments_list'] || [];
+                            }
+                            var data = res.data.data.data;
+                            for (var i in data) {
+                                temp_list.push(data[i]);
+                            }
+                            if (blog_comments_id == 0) {
+                                temp_data['comments_list'] = temp_list;
+                                temp_data['is_comments_list_submit'] = res.data.data.page >= res.data.data.page_total ? 0 : 1;
+                            } else {
+                                temp_data['comments_list'][index]['reply_comments_list'] = temp_list;
+                                temp_data['comments_list'][index]['is_comments_list_submit'] = res.data.data.page >= res.data.data.page_total ? 0 : 1;
+                            }
+                            this.setData({ data: temp_data });
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 评论
+            comments_event(e) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                var user = app.globalData.get_user_info(this, 'comments_event', e);
+                if (user != false) {
+                    if (this.input_comments_value == '') {
+                        app.globalData.showToast(this.$t('user-order-comments.user-order-comments.8f303u'));
+                        return false;
+                    }
+                    uni.showLoading({
+                        title: this.$t('buy.buy.r79t77'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('comments', 'index', 'blog'),
+                        method: 'POST',
+                        data: {
+                            blog_id: this.data.id,
+                            content: this.input_comments_value,
+                            blog_comments_id: this.input_comments_modal_blog_comments_id,
+                            reply_comments_id: this.input_comments_modal_reply_comments_id,
+                        },
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                var temp_data = this.data;
+                                if ((this.input_comments_modal_blog_comments_id || 0) == 0) {
+                                    var temp_list = temp_data.comments_list || [];
+                                    temp_list.splice(0, 0, res.data.data);
+                                    temp_data['comments_list'] = temp_list;
+                                    temp_data['comments_count'] = parseInt(temp_data['comments_count']) + 1;
+                                } else {
+                                    var index = this.input_comments_modal_index;
+                                    var temp_list = temp_data.comments_list[index]['reply_comments_list'] || [];
+                                    temp_list.splice(0, 0, res.data.data);
+                                    if ((this.input_comments_modal_reply_comments_id || 0) != 0) {
+                                        for (var i in temp_list) {
+                                            if (temp_list[i]['id'] == this.input_comments_modal_reply_comments_id) {
+                                                temp_list[i]['comments_count'] = parseInt(temp_list[i]['comments_count']) + 1;
+                                                break;
+                                            }
+                                        }
+                                    }
+                                    temp_data.comments_list[index]['reply_comments_list'] = temp_list;
+                                    temp_data.comments_list[index]['comments_count'] = parseInt(temp_data.comments_list[index]['comments_count']) + 1;
+                                }
+                                this.setData({
+                                    data: temp_data,
+                                    input_comments_value: '',
+                                    input_comments_length_value: this.input_comments_length_max,
+                                    input_comments_modal_status: false,
+                                    input_comments_modal_index: 0,
+                                    input_comments_modal_username: '',
+                                    input_comments_modal_blog_comments_id: 0,
+                                    input_comments_modal_reply_comments_id: 0,
+                                });
+                            } else {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 点赞
+            give_thumbs_event(e) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                var user = app.globalData.get_user_info(this, 'give_thumbs_event', e);
+                if (user != false) {
+                    var type = parseInt(e.currentTarget.dataset.type || 0);
+                    var blog_id = e.currentTarget.dataset.blogid;
+                    var blog_comments_id = e.currentTarget.dataset.blogcommentsid || 0;
+                    var reply_comments_id = e.currentTarget.dataset.replycommentsid || 0;
+                    uni.request({
+                        url: app.globalData.get_request_url('givethumbs', 'index', 'blog'),
+                        method: 'POST',
+                        data: {
+                            blog_id: blog_id,
+                            blog_comments_id: blog_comments_id,
+                            reply_comments_id: reply_comments_id,
+                        },
+                        dataType: 'json',
+                        success: (res) => {
+                            if (res.data.code == 0) {
+                                var data = res.data.data;
+                                var temp_data = this.data;
+                                switch (type) {
+                                    // 博客
+                                    case 0:
+                                        temp_data.is_give_thumbs = data.is_active;
+                                        temp_data.give_thumbs_count = data.count;
+                                        break;
+                                    // 博客评论
+                                    case 1:
+                                        var index = parseInt(e.currentTarget.dataset.index || 0);
+                                        temp_data['comments_list'][index]['is_give_thumbs'] = data.is_active;
+                                        temp_data['comments_list'][index]['give_thumbs_count'] = data.count;
+                                        break;
+                                    // 博客评论回复
+                                    case 2:
+                                        var index = parseInt(e.currentTarget.dataset.index || 0);
+                                        var indexs = parseInt(e.currentTarget.dataset.indexs || 0);
+                                        temp_data['comments_list'][index]['reply_comments_list'][indexs]['is_give_thumbs'] = data.is_active;
+                                        temp_data['comments_list'][index]['reply_comments_list'][indexs]['give_thumbs_count'] = data.count;
+                                        break;
+                                }
+                                this.setData({ data: temp_data });
+                            } else {
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                }
+                            }
+                        },
+                        fail: () => {
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+        },
+    };
+</script>
+<style scoped>
+    /**
+     * 聚合点赞、评论、分享
+     */
+    .blog-comments-bottom-container .item:not(:last-child) {
+        margin-right: 64rpx;
+    }
+    .blog-comments-reply-container .emoji-icon,
+    .blog-comments-modal .emoji-icon {
+        width: 40rpx;
+        height: 40rpx !important;
+    }
+    .blog-comments-reply-container .user-avatar {
+        width: 72rpx;
+        height: 72rpx !important;
+        border: 1px solid #eee;
+    }
+    .blog-comments-reply-container .right-base {
+        padding-left: 16rpx;
+    }
+    .blog-comments-reply-container .right-base .comments {
+        background-color: #f8f8f8;
+    }
+    .blog-comments-reply-container .right-base textarea {
+        height: 120rpx;
+    }
+    .blog-comments-modal {
+        top: 0;
+        left: 0;
+        width: calc(100% - 80rpx);
+        height: 100%;
+        background: rgba(0, 0, 0, 0.6);
+        padding: 40rpx;
+        z-index: 10;
+    }
+    .blog-comments-modal-content {
+        padding: 10px;
+        border-radius: 10px;
+        margin: 0 auto;
+        margin-top: 30%;
+        max-width: calc(800px - 180rpx);
+    }
+    .blog-comments-modal-content textarea {
+        height: 200rpx;
+    }
+    .blog-comments-modal-content .close {
+        top: 20rpx;
+        right: 20rpx;
+    }
+    .comment-btn {
+        height: 56rpx;
+        line-height: 56rpx;
+        padding: 0 24rpx;
+    }
+    .comment-btn-default {
+        border: 2rpx solid #d8dadc;
+        background-color: #d8dadc;
+    }
+
+    /**
+     * 评论列表
+     */
+    .blog-comments-list > .item .user-avatar {
+        width: 72rpx;
+        height: 72rpx;
+        border: 1px solid #eee;
+    }
+    .blog-comments-list .comments-base,
+    .blog-comments-list .comments-content {
+        padding-left: 16rpx;
+        padding-right: 20rpx;
+    }
+    .reply-blog-comments-list {
+        margin-top: 28rpx;
+    }
+    .reply-blog-comments-list .right-content {
+        padding-left: 16rpx;
+    }
+</style>
diff --git a/pages/plugins/blog/detail/detail.vue b/pages/plugins/blog/detail/detail.vue
new file mode 100644
index 0000000..4545a0e
--- /dev/null
+++ b/pages/plugins/blog/detail/detail.vue
@@ -0,0 +1,245 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(info || null) != null" :class="(data_base || null) != null && (data_base.is_user_add_blog || 0) == 1 ? 'page-bottom-fixed' : ''">
+            <view class="padding-main bg-white spacing-mb">
+                <view class="spacing-mb">
+                    <view class="fw-b text-size-xl">{{ info.title }}</view>
+                    <view class="cr-grey-9 margin-top-lg oh br-t padding-top-main text-size-xs">
+                        <view class="fl">
+                            <text>{{ $t('article-detail.article-detail.728374') }}</text>
+                            <text>{{ info.add_time }}</text>
+                        </view>
+                        <view class="fr">
+                            <text class="margin-left-xxxl">{{ $t('article-detail.article-detail.j92ru0') }}</text>
+                            <text>{{ info.access_count }}</text>
+                        </view>
+                    </view>
+                </view>
+                <view class="oh web-html-content spacing-mb">
+                    <view v-if="(info.video_url || null) != null && ((info.is_live_play || 0) == 0 || client_type == 'weixin')">
+                        <video :src="info.video_url" class="wh-auto" :autoplay="false" :controls="true"></video>
+                    </view>
+                    <mp-html :content="info.content" />
+                </view>
+                <!-- 评论内容 -->
+                <component-blog-comments :propData="info" :propDataBase="data_base" :propEmojiList="emoji_list" :propShareInfo="share_info"></component-blog-comments>
+            </view>
+
+            <view class="padding-horizontal-main">
+                <!-- 上一篇、下一篇 -->
+                <view v-if="(last_next || null) != null" class="last-next-data spacing-mt margin-bottom-xxxl cr-grey-9">
+                    <view v-if="(last_next.last || null) != null" class="flex-row">
+                        <text>{{ $t('article-detail.article-detail.281s4a') }}</text>
+                        <text :data-value="last_next.last.url" @tap="url_event" class="dis-inline-block flex-row flex-width single-text cp item">{{ last_next.last.title }}</text>
+                    </view>
+                    <view v-if="(last_next.next || null) != null" class="margin-top flex-row cr-main">
+                        <text>{{ $t('article-detail.article-detail.uq5814') }}</text>
+                        <text :data-value="last_next.next.url" @tap="url_event" class="dis-inline-block flex-row flex-width single-text cp item">{{ last_next.next.title }}</text>
+                    </view>
+                </view>
+                <!-- 推荐博文 -->
+                <view v-if="right_list.length > 0" class="plugins-blog-list">
+                    <view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                        <text class="text-wrapper title-left-border single-text flex-1 flex-width padding-right-main">{{ $t('detail.detail.455787') }}{{ blog_main_name }}</text>
+                        <text data-value="/pages/plugins/blog/search/search" @tap="url_event" class="arrow-right padding-right cr-grey cp">{{ $t('common.more') }}</text>
+                    </view>
+                    <view v-for="(item, index) in right_list" :key="index">
+                        <view :data-value="item.url" @tap="url_event" class="item oh padding-main border-radius-main bg-white spacing-mb cp">
+                            <image class="blog-img fl radius" :src="item.cover" mode="aspectFill"></image>
+                            <view class="base fr">
+                                <view class="single-text">{{ item.title }}</view>
+                                <view class="cr-grey margin-top-sm">{{ item.add_time_date_cn }}</view>
+                                <view class="cr-grey multi-text margin-top-sm">{{ item.describe }}</view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 相关商品 -->
+                <view v-if="(info.goods_list || null) != null && info.goods_list.length > 0">
+                    <view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                        <text class="text-wrapper title-left-border single-text flex-1 flex-width padding-right-main">{{ $t('detail.detail.1j6yxy') }}</text>
+                        <text data-value="/pages/goods-search/goods-search" @tap="url_event" class="arrow-right padding-right cr-grey cp">{{ $t('common.more') }}</text>
+                    </view>
+                    <component-goods-list :propData="{ style_type: 1, goods_list: info.goods_list }" :propCurrencySymbol="currency_symbol"></component-goods-list>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </view>
+
+        <!-- 提示信息 -->
+        <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+
+        <!-- 发布博文、我的博文入口 -->
+        <view v-if="(data_base || null) != null && (data_base.is_user_add_blog || 0) == 1" class="bottom-fixed" :style="bottom_fixed_style">
+            <view class="bottom-line-exclude">
+                <view class="item flex-row jc-sa align-c text-size fw-b br bg-white round padding-vertical">
+                    <view data-value="/pages/plugins/blog/form/form" @tap="url_event" class="flex-1 tc flex-col jc-c align-c cp">
+                        <view class="divider-r-d wh-auto"> <iconfont name="icon-edit-below-line" size="30rpx" color="#333" propClass="margin-right-sm"></iconfont>{{$t('detail.detail.fn3w01')}}{{ blog_main_name }}</view>
+                    </view>
+                    <view data-value="/pages/plugins/blog/user-list/user-list" @tap="url_event" class="flex-1 tc flex-col jc-c align-c cp">
+                        <view class="wh-auto"> <iconfont name="icon-list-dot" size="32rpx" color="#333" propClass="margin-right-sm pr top-xs"></iconfont>{{$t('common.my')}}{{ blog_main_name }}</view>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentBlogComments from '../components/blog-comments/blog-comments';
+    import componentGoodsList from '@/components/goods-list/goods-list';
+
+    var common_static_url = app.globalData.get_static_url('common');
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                currency_symbol: app.globalData.currency_symbol(),
+                client_type: app.globalData.application_client_type(),
+                bottom_fixed_style: '',
+                params: null,
+                data_base: null,
+                info: null,
+                right_list: [],
+                last_next: null,
+                emoji_list: [],
+                blog_main_name: this.$t('detail.detail.e439j9'),
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentBlogComments,
+            componentGoodsList,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+
+            // 初始化配置
+            this.init_config();
+
+            // 数据加载
+            this.get_data();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        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');
+                }
+            },
+
+            // 初始化
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('detail', 'index', 'blog'),
+                    method: 'POST',
+                    data: {
+                        id: this.params.id || 0,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        var data = res.data.data;
+                        if (res.data.code == 0 && (data.data || null) != null) {
+                            var info = data.data || null;
+                            var base = data.base || null;
+                            this.setData({
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 3,
+                                data_base: base,
+                                info: info,
+                                right_list: data.right_list || [],
+                                last_next: data.last_next || null,
+                                emoji_list: data.emoji_list || [],
+                                blog_main_name: base == null ? this.$t('detail.detail.e439j9') : (base.blog_main_name || this.$t('detail.detail.e439j9')),
+                            });
+
+                            if (info != null) {
+                                // 基础自定义分享
+                                this.setData({
+                                    share_info: {
+                                        title: info.seo_title || info.title,
+                                        desc: info.seo_desc || info.describe,
+                                        path: '/pages/plugins/blog/detail/detail',
+                                        query: 'id=' + info.id,
+                                        img: info.share_images || info.cover,
+                                    },
+                                });
+
+                                // 标题
+                                uni.setNavigationBarTitle({ title: info.title });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                        }
+
+                        // 分享菜单处理
+                        app.globalData.page_share_handle(this.share_info);
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                            data_list_loding_status: 2,
+                        });
+                    },
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style></style>
diff --git a/pages/plugins/blog/form/form.css b/pages/plugins/blog/form/form.css
new file mode 100644
index 0000000..3ed6c16
--- /dev/null
+++ b/pages/plugins/blog/form/form.css
@@ -0,0 +1,11 @@
+.sp-editor {
+    height: 500rpx;
+}
+
+.more {
+    transition: all 0.3s ease-in-out;
+}
+.p-content {
+    max-height: 50vh;
+    overflow-y: auto;
+}
\ No newline at end of file
diff --git a/pages/plugins/blog/form/form.vue b/pages/plugins/blog/form/form.vue
new file mode 100644
index 0000000..8a9b766
--- /dev/null
+++ b/pages/plugins/blog/form/form.vue
@@ -0,0 +1,450 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="data_list_loding_status !== 1">
+            <form @submit="form_submit" class="form-container">
+                <view class="page-bottom-fixed padding-main">
+                    <view class="bg-white border-radius-main pr oh spacing-mb">
+                        <view class="form-gorup">
+                            <view class="flex-row jc-sb align-c">
+                                <view class="form-gorup-title padding-right-main">{{$t('user-detail.user-detail.uy6lrz')}}<text class="form-group-tips-must">*</text></view>
+                                <input type="text" name="title" :value="data.title || ''" maxlength="16" placeholder-class="cr-grey-9" class="cr-base flex-1 flex-width tr" :placeholder="$t('common.please_input')" />
+                            </view>
+                        </view>
+                    </view>
+                    <view class="bg-white border-radius-main pr oh spacing-mb">
+                        <view class="form-gorup">
+                            <view class="flex-row jc-sb align-c">
+                                <view class="form-gorup-title padding-right-main">{{$t('common.category')}}<text class="form-group-tips-must">*</text></view>
+                                <view class="flex-1 flex-width tr" @tap="popupOpen">
+                                    <text :class="data.blog_category_name ? 'cr-black' : 'cr-grey-9'">{{ data.blog_category_name || $t('form.form.4cbom4') }}</text>
+                                    <view class="pr top-sm margin-left-sm dis-inline-block">
+                                        <iconfont name="icon-arrow-right" color="#999" size="28rpx"></iconfont>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="bg-white border-radius-main pr oh spacing-mb">
+                        <view class="form-gorup">
+                            <view class="flex-row jc-sb align-c">
+                                <view class="form-gorup-title padding-right-main">{{$t('form.form.043a10')}}</view>
+                                <view class="flex-1 flex-width tr">
+                                    <switch :color="theme_color" :checked="(data.is_enable || 0) == 1 ? true : false" @change="is_enable_event" />
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="bg-white border-radius-main pr oh spacing-mb">
+                        <view class="form-gorup">
+                            <view class="form-gorup-title padding-right-main">{{$t('form.form.5hn8k3')}}</view>
+                            <view class="margin-top-main">
+                                <component-upload :propData="image_list" :propMaxNum="1" :propPathType="editor_path_type" @call-back="retrun_image_event"></component-upload>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="bg-white border-radius-main pr oh">
+                        <view class="form-gorup">
+                            <view class="form-gorup-title padding-right-main">{{$t('user-detail.user-detail.7cufw6')}}<text class="form-group-tips-must">*</text></view>
+                            <view class="margin-top-main sp-editor">
+                                <!-- <sp-editor :templates="(data || null) !== null ? data.content : ''" @input="rich_text_event" @upinImage="up_in_image_event"></sp-editor> -->
+                                <sp-editor @init="initEditor" @input="rich_text_event" @upinImage="up_in_image_event"></sp-editor>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="more oh" :style="'height:' + more_height">
+                        <view class="bg-white border-radius-main pr oh spacing-mb spacing-mt">
+                            <view class="form-gorup">
+                                <view class="form-gorup-title padding-right-main">{{$t('form.form.xy87t8')}}</view>
+                                <textarea name="describe" placeholder-class="cr-grey-9" class="cr-base" :placeholder="$t('common.please_input')" maxlength="200" :value="data.describe"></textarea>
+                            </view>
+                        </view>
+                        <view class="bg-white border-radius-main pr oh spacing-mb">
+                            <view class="form-gorup">
+                                <view class="flex-row jc-sb align-c">
+                                    <view class="form-gorup-title padding-right-main">{{$t('form.form.kvr2i3')}}</view>
+                                    <input type="text" name="seo_title" :value="data.seo_title || ''" maxlength="16" placeholder-class="cr-grey-9" class="cr-base flex-1 flex-width tr" :placeholder="$t('common.please_input')" />
+                                </view>
+                            </view>
+                        </view>
+                        <view class="bg-white border-radius-main pr oh spacing-mb">
+                            <view class="form-gorup">
+                                <view class="flex-row jc-sb align-c">
+                                    <view class="form-gorup-title padding-right-main">{{$t('form.form.l87ju1')}}</view>
+                                    <input type="text" name="seo_keywords" :value="data.seo_keywords || ''" maxlength="16" placeholder-class="cr-grey-9" class="cr-base flex-1 flex-width tr" :placeholder="$t('common.please_input')" />
+                                </view>
+                            </view>
+                        </view>
+                        <view class="bg-white border-radius-main pr oh">
+                            <view class="form-gorup">
+                                <view class="flex-row jc-sb align-c">
+                                    <view class="form-gorup-title padding-right-main">{{$t('form.form.5487bt')}}</view>
+                                    <input type="text" name="seo_desc" :value="data.seo_desc || ''" maxlength="16" placeholder-class="cr-grey-9" class="cr-base flex-1 flex-width tr" :placeholder="$t('common.please_input')" />
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="bg-white border-radius-main pr oh spacing-mb spacing-mt">
+                        <view class="padding-main flex-row jc-c align-c cr-grey-9" @tap="more_event">
+                            <text>{{ is_more ? $t('form.form.4h814w') : $t('form.form.lfwj0g') }}</text>
+                            <view class="margin-left-sm dis-inline-block">
+                                <iconfont :name="is_more ? 'icon-arrow-top' : 'icon-arrow-bottom'" color="#999" size="24rpx"></iconfont>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <!-- 底部操作 -->
+                <view class="bottom-fixed" :style="bottom_fixed_style">
+                    <view class="bottom-line-exclude">
+                        <button class="item cr-white bg-main round text-size wh-auto" type="default" form-type="submit" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">{{$t('form.form.4yd066')}}</button>
+                    </view>
+                </view>
+                <!-- 分类选择 -->
+                <component-popup :propShow="popup_status" propPosition="bottom" @onclose="popup_close_event">
+                    <view class="p-title flex-row jc-sb align-c padding-main br-b-e">
+                        <view class="text-size-lg fw-b">{{$t('form.form.4vku7u')}}</view>
+                        <view class="popup-colse" @tap="popup_close_event">
+                            <iconfont name="icon-close-o" color="#333" size="28rpx"></iconfont>
+                        </view>
+                    </view>
+                    <view class="p-content padding-main">
+                        <view v-for="(item, index) in blog_category_list" :key="index">
+                            <view class="padding-vertical-main flex-row jc-sb align-c" :class="data.blog_category_id == item.id ? 'cr-main' : ''" :data-value="item.name" :data-id="item.id" @tap="get_type_event">
+                                {{ item.name }}
+                                <iconfont v-if="data.blog_category_id === item.id" name="icon-checked" color="#333" size="28rpx"></iconfont>
+                            </view>
+                        </view>
+                    </view>
+                </component-popup>
+            </form>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentPopup from '@/components/popup/popup';
+    import componentUpload from '@/components/upload/upload';
+    import componentNoData from '@/components/no-data/no-data';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: app.globalData.get_theme_color(),
+                data_list_loding_status: 1,
+                bottom_fixed_style: '',
+                params: {},
+                data: {},
+                index: 0,
+                // 分类选择弹窗
+                popup_status: false,
+                blog_category_list: [],
+
+                // 封面图片
+                image_list: [],
+                // 路径类型
+                editor_path_type: 'common',
+
+                // 内容
+                input_length_max: 500,
+                input_value: '',
+                // 查看更多
+                more_height: '0',
+                is_more: false,
+
+                // 提交按钮
+                form_submit_loading: false,
+            };
+        },
+        components: {
+            componentCommon,
+            componentPopup,
+            componentUpload,
+            componentNoData,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params || {},
+            });
+
+            // 数据加载
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            // 数据加载
+            this.init();
+        },
+
+        // 页面销毁时执行
+        onUnload: function () {},
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    // 提示错误
+                    this.setData({
+                        data_list_loding_status: 2,
+                        data_list_loding_msg: this.$t('form.form.8l3ul5'),
+                    });
+                }
+            },
+            get_data_list() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('saveinfo', 'blog', 'blog'),
+                    method: 'POST',
+                    data: {...this.params, ...{lang_can_key: 'blog_category_list'}},
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var blog_category_list = res.data.data.blog_category_list || [];
+                            if (res.data.data.data) {
+                                var data = res.data.data.data || {};
+                                // 封面列表
+                                var img_list = [];
+                                if ((data.cover || null) != null && data.cover.length > 0) {
+                                    img_list.push(data.cover);
+                                }
+                                // 分类名称匹配重新匹配赋值
+                                var blog_category_name = '';
+                                for(var i in blog_category_list) {
+                                    if(blog_category_list[i]['id'] == data.blog_category_id) {
+                                        blog_category_name = blog_category_list[i]['name'];
+                                        break;
+                                    }
+                                }
+                                data['blog_category_name'] = blog_category_name;
+                                // 设置数据
+                                this.setData({
+                                    data: data,
+                                    blog_category_list: blog_category_list,
+                                    image_list: img_list,
+                                    more_height: data.describe || data.seo_title || data.seo_keywords || data.seo_desc ? '708rpx' : '0',
+                                    is_more: data.describe || data.seo_title || data.seo_keywords || data.seo_desc ? 'true' : 'false',
+                                    data_list_loding_status: 3,
+                                });
+                            } else {
+                                this.setData({
+                                    blog_category_list: blog_category_list,
+                                    data_list_loding_status: 3,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+            // 弹层打开
+            popupOpen() {
+                this.setData({
+                    popup_status: true,
+                });
+            },
+
+            // 弹层关闭
+            popup_close_event(e) {
+                this.setData({
+                    popup_status: false,
+                });
+            },
+
+            // 是否启用
+            is_enable_event(e) {
+                var new_data = this.data;
+                new_data.is_enable = e.detail.value ? 1 : 0;
+                this.setData({
+                    data: new_data,
+                });
+            },
+
+            // 获取选中的分类
+            get_type_event(e) {
+                var new_data = this.data;
+                new_data.blog_category_id = e.currentTarget.dataset.id;
+                new_data.blog_category_name = e.currentTarget.dataset.value;
+                this.setData({
+                    data: new_data,
+                    popup_status: false,
+                });
+            },
+
+            // 上传回调
+            retrun_image_event(data) {
+                var new_data = this.data;
+                new_data.cover = data[0];
+                this.setData({
+                    data: new_data,
+                });
+            },
+
+            // 回调富文本内容
+            rich_text_event(e) {
+                var new_data = this.data;
+                new_data.content = e.html;
+                this.setData({
+                    data: new_data,
+                });
+            },
+            initEditor(editor) {
+                // 初始化编辑器内容
+                editor.setContents({
+                    html: (this.data || null) !== null ? this.data.content : '',
+                });
+            },
+
+            // 上传图片
+            up_in_image_event(tempFiles, editorCtx) {
+                var self = this;
+                // 使用 uniCloud.uploadFile 上传图片的示例方法（可适用多选上传）
+                tempFiles.forEach(async (item) => {
+                    uni.showLoading({
+                        title: self.$t('form.form.2e5rv3'),
+                        mask: true,
+                    });
+                    await uni.uploadFile({
+                        url: app.globalData.get_request_url('index', 'ueditor'),
+                        // #ifdef APP-PLUS || H5
+                        filePath: item.path,
+                        // #endif
+                        // #ifdef MP-WEIXIN
+                        filePath: item.tempFilePath,
+                        // #endif
+                        name: 'upfile',
+                        formData: {
+                            action: 'uploadimage',
+                            path_type: 'common', // 路径类型，默认common
+                        },
+                        success: function (res) {
+                            let data = JSON.parse(res.data);
+                            if (res.statusCode == 200) {
+                                // 上传完成后处理
+                                editorCtx.insertImage({
+                                    src: data.data.url, // 此处需要将图片地址切换成服务器返回的真实图片地址
+                                    // width: '50%',
+                                    alt: self.$t('common.video'),
+                                    success: function (e) {},
+                                });
+                                uni.hideLoading();
+                            }
+                        },
+                        fail: function (e) {
+                            app.globalData.showToast(e.errMsg);
+                            uni.hideLoading();
+                        },
+                    });
+                });
+            },
+
+            // 更多内容
+            more_event() {
+                this.setData({
+                    more_height: !this.is_more ? '708rpx' : '0',
+                    is_more: !this.is_more,
+                });
+            },
+
+            // 表单提交
+            form_submit(e) {
+                // 数据验证
+                var validation = [
+                    { fields: 'title', msg: this.$t('form.form.v19gg8') },
+                    { fields: 'blog_category_id', msg: this.$t('form.form.gu3x97') },
+                    { fields: 'content', msg: this.$t('form.form.adiq70') },
+                ];
+                var validate = {
+                    blog_category_id: this.data.blog_category_id,
+                    content: this.data.content,
+                    title: e.detail.value.title,
+                };
+                if (app.globalData.fields_check(validate, validation)) {
+                    uni.showLoading({
+                        title: this.$t('buy.buy.r79t77'),
+                    });
+                    this.setData({
+                        form_submit_loading: true,
+                    });
+                    var new_data = {
+                        ...e.detail.value,
+                        ...this.data,
+                    };
+                    // 网络请求
+                    uni.request({
+                        url: app.globalData.get_request_url('save', 'blog', 'blog'),
+                        method: 'POST',
+                        data: new_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                                setTimeout(function () {
+                                    app.globalData.page_back_prev_event();
+                                }, 2000);
+                            } else {
+                                this.setData({
+                                    form_submit_loading: false,
+                                });
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_loading: false,
+                            });
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+        },
+    };
+</script>
+<style>
+    @import './form.css';
+</style>
diff --git a/pages/plugins/blog/index/index.css b/pages/plugins/blog/index/index.css
new file mode 100644
index 0000000..5c4f568
--- /dev/null
+++ b/pages/plugins/blog/index/index.css
@@ -0,0 +1,42 @@
+/*
+* 分类
+*/
+.nav-list {
+    height: 38rpx;
+    line-height: 38rpx;
+    width: calc(100% - 155rpx);
+}
+
+/**
+ * 推荐博文
+ */
+.right-list .item .blog-title {
+    width: calc(100% - 210rpx);
+}
+
+/**
+ * 分类导航
+ */
+.nav-blog-category .item {
+    width: calc(50% - 10rpx);
+}
+.nav-blog-category .item:nth-child(odd) {
+    float: left;
+}
+.nav-blog-category .item:nth-child(even) {
+    float: right;
+}
+.nav-blog-category .item .icon,
+.nav-blog-category .item .icon-text {
+    width: 74rpx;
+    height: 74rpx !important;
+}
+.nav-blog-category .item .icon-text {
+    line-height: 72rpx;
+    font-size: 48rpx;
+    background: #e6f2f8;
+    color: #3f51b5;
+}
+.nav-blog-category .item .right-base {
+    width: calc(100% - 84rpx);
+}
\ No newline at end of file
diff --git a/pages/plugins/blog/index/index.vue b/pages/plugins/blog/index/index.vue
new file mode 100644
index 0000000..76a9a17
--- /dev/null
+++ b/pages/plugins/blog/index/index.vue
@@ -0,0 +1,280 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data_base || null) != null" :class="(data_base || null) != null && (data_base.is_user_add_blog || 0) == 1 ? 'page-bottom-fixed' : ''">
+            <!-- 搜索框 -->
+            <view class="nav-search padding-main">
+                <component-search propBrColor="#efefef" propBgColor="#fff" propUrl="/pages/plugins/blog/search/search"></component-search>
+            </view>
+
+            <!-- 轮播 -->
+            <view v-if="slide_list.length > 0" class="padding-horizontal-main spacing-mb">
+                <component-banner :propData="slide_list"></component-banner>
+            </view>
+
+            <!-- 分类导航 -->
+            <view v-if="(data_base.is_home_category_main_nav || 0) == 1 && (category || null) != null && category.length > 0" class="nav-blog-category padding-horizontal-main oh">
+                <block v-for="(item, index) in category" :key="index">
+                    <view class="item oh padding-main margin-bottom-main radius bg-white bs-bb" :data-value="item.url" @tap="url_event">
+                        <image v-if="(item.icon || null) != null" :src="item.icon" mode="aspectFill" class="fl icon radius"></image>
+                        <view v-else class="fl radius icon-text tc">{{ item.name.substr(0, 1) }}</view>
+                        <view class="fr right-base">
+                            <view class="single-text cr-base">
+                                <text class="fw">{{ item.name }}</text>
+                                <text v-if="(item.blog_data || null) != null && item.blog_data.day_comments_count > 0" class="margin-left-sm cr-red fw">({{ item.blog_data.day_comments_count }})</text>
+                            </view>
+                            <view v-if="(item.blog_data || null) != null" class="single-text cr-grey text-size-xs">
+                                <text>{{ blog_main_name }}: {{ item.blog_data.blog_count }}</text>
+                                <text v-if="(data_base.is_blog_comments_show || 0) == 1" class="margin-left">{{ $t('index.index.lkld04') }}{{ item.blog_data.comments_count }}</text>
+                                <text v-if="(data_base.is_blog_give_thumbs || 0) == 1" class="margin-left">{{ $t('index.index.r6vv25') }}{{ item.blog_data.give_thumbs_count }}</text>
+                            </view>
+                        </view>
+                    </view>
+                </block>
+            </view>
+
+            <!-- 分类 -->
+            <view class="padding-horizontal-main">
+                <view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                    <text class="text-wrapper title-left-border single-text flex-1 flex-width padding-right-main">{{ $t('index.index.6rsqp1') }}{{ blog_main_name }}</text>
+                    <text data-value="/pages/plugins/blog/search/search" @tap="url_event" class="arrow-right padding-right cr-grey cp">{{ $t('common.more') }}</text>
+                </view>
+            </view>
+
+            <!-- 博文列表 -->
+            <view v-if="data_list.length > 0" class="plugins-blog-list padding-horizontal-main">
+                <view v-for="(item, index) in data_list" :key="index">
+                    <view :data-value="item.url" @tap="url_event" class="item oh padding-main border-radius-main bg-white cp spacing-mb">
+                        <image class="blog-img fl radius" :src="item.cover" mode="aspectFill"></image>
+                        <view class="base fr">
+                            <view class="single-text text-size">{{ item.title }}</view>
+                            <view class="cr-grey margin-top-sm">{{ item.add_time_date_cn }}</view>
+                            <view class="cr-base text-size-sm multi-text margin-top-sm">{{ item.describe }}</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 热门博文-滚动 -->
+            <view v-if="hot_list.length > 0" class="padding-horizontal-main spacing-mb">
+                <view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                    <text class="text-wrapper title-left-border single-text flex-1 flex-width padding-right-main">{{ $t('index.index.pot64x') }}{{ blog_main_name }}</text>
+                    <text data-value="/pages/plugins/blog/search/search" @tap="url_event" class="arrow-right padding-right cr-grey cp">{{ $t('common.more') }}</text>
+                </view>
+                <view class="rolling-horizontal border-radius-main oh">
+                    <view class="plugins-blog-rolling-list scroll-view-horizontal">
+                        <swiper :vertical="false" :autoplay="(data_base.is_home_hot_auto_play || 0) == 1" :circular="false" :display-multiple-items="hot_list.length < 3 ? hot_list.length : 3" interval="3000">
+                            <block v-for="(item, index) in hot_list" :key="index">
+                                <swiper-item>
+                                    <view :data-value="item.url" @tap="url_event" class="item bg-white border-radius-main margin-right-main oh pr ht-auto pr cp">
+                                        <image class="blog-img dis-block wh-auto" :src="item.cover" mode="aspectFill"></image>
+                                        <view class="blog-title pa single-text cr-white padding-horizontal-main padding-top-sm padding-bottom-sm">{{ item.title }}</view>
+                                    </view>
+                                </swiper-item>
+                            </block>
+                        </swiper>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 推荐博文 -->
+            <view v-if="right_list.length > 0" class="padding-horizontal-main spacing-mb">
+                <view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                    <text class="text-wrapper title-left-border single-text flex-1 flex-width padding-right-main">{{ $t('detail.detail.455787') }}{{ blog_main_name }}</text>
+                    <text data-value="/pages/plugins/blog/search/search" @tap="url_event" class="arrow-right padding-right cr-grey cp">{{ $t('common.more') }}</text>
+                </view>
+                <view class="right-list padding-horizontal-main border-radius-main bg-white">
+                    <block v-for="(item, index) in right_list" :key="index">
+                        <view :data-value="item.url" @tap="url_event" :class="'item padding-vertical-main oh cp ' + (index > 0 ? 'br-t' : '')">
+                            <view class="blog-title single-text fl">{{ item.title }}</view>
+                            <text class="cr-grey fr">{{ $t('detail.detail.e6ga1y') }}{{ item.access_count }}{{ $t('buy.buy.0pgsrm') }}</text>
+                        </view>
+                    </block>
+                </view>
+            </view>
+
+            <!-- 推荐商品 -->
+            <view v-if="goods_list.length > 0" class="goods-list oh padding-horizontal-main">
+                <view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                    <text class="text-wrapper title-left-border single-text flex-1 flex-width padding-right-main">{{ $t('index.index.8t4j95') }}</text>
+                    <text data-value="/pages/goods-search/goods-search" @tap="url_event" class="arrow-right padding-right cr-grey cp">{{ $t('common.more') }}</text>
+                </view>
+                <component-goods-list :propData="{ style_type: 1, goods_list: goods_list }" :propCurrencySymbol="currency_symbol"></component-goods-list>
+            </view>
+
+            <!-- 发布博文、我的博文入口 -->
+            <view v-if="(data_base || null) != null && (data_base.is_user_add_blog || 0) == 1" class="bottom-fixed" :style="bottom_fixed_style">
+                <view class="bottom-line-exclude">
+                    <view class="item flex-row jc-sa align-c text-size fw-b br bg-white round padding-vertical">
+                        <view data-value="/pages/plugins/blog/form/form" @tap="url_event" class="flex-1 tc flex-col jc-c align-c cp">
+                            <view class="divider-r-d wh-auto"> <iconfont name="icon-edit-below-line" size="30rpx" color="#333" propClass="margin-right-sm"></iconfont>{{$t('detail.detail.fn3w01')}}{{ blog_main_name }}</view>
+                        </view>
+                        <view data-value="/pages/plugins/blog/user-list/user-list" @tap="url_event" class="flex-1 tc flex-col jc-c align-c cp">
+                            <view class="wh-auto"> <iconfont name="icon-list-dot" size="32rpx" color="#333" propClass="margin-right-sm pr top-xs"></iconfont>{{$t('common.my')}}{{ blog_main_name }}</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentSearch from '@/components/search/search';
+    import componentBanner from '@/components/slider/slider';
+    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';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                currency_symbol: app.globalData.currency_symbol(),
+                bottom_fixed_style: '',
+                data_base: null,
+                category: [],
+                data_list: [],
+                slide_list: [],
+                goods_list: [],
+                hot_list: [],
+                right_list: [],
+                blog_main_name: this.$t('detail.detail.e439j9'),
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentSearch,
+            componentBanner,
+            componentCountdown,
+            componentNoData,
+            componentBottomLine,
+            componentGoodsList,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 初始化配置
+            this.init_config();
+
+            // 获取数据
+            this.get_data();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        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');
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'index', 'blog'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_base: data.base || null,
+                                category: data.category || [],
+                                data_list: data.data_list || [],
+                                slide_list: data.slide_list || [],
+                                goods_list: data.goods_list || [],
+                                hot_list: data.hot_list || [],
+                                right_list: data.right_list || [],
+                                blog_main_name: (data.base || null) == null ? this.$t('detail.detail.e439j9') : data.base.blog_main_name || this.$t('detail.detail.e439j9'),
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: true,
+                            });
+
+                            // 基础自定义分享
+                            var title = this.data_base.seo_title || this.data_base.application_name;
+                            this.setData({
+                                share_info: {
+                                    title: title,
+                                    desc: this.data_base.seo_desc,
+                                    path: '/pages/plugins/blog/index/index',
+                                    img: (this.slide_list || null) != null && this.slide_list.length > 0 ? this.slide_list[0]['images_url'] : '',
+                                },
+                            });
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                        }
+
+                        // 标题
+                        uni.setNavigationBarTitle({ title: title });
+
+                        // 分享菜单处理
+                        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: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+        },
+    };
+</script>
+<style>
+    @import './index.css';
+</style>
diff --git a/pages/plugins/blog/search/search.css b/pages/plugins/blog/search/search.css
new file mode 100644
index 0000000..26e9f4c
--- /dev/null
+++ b/pages/plugins/blog/search/search.css
@@ -0,0 +1,31 @@
+/**
+ * 搜索
+ */
+.search-keywords icon {
+    left: 30rpx;
+    top: calc(50% - 6px);
+    z-index: 1;
+}
+.search-keywords input {
+    font-size: 26rpx;
+    padding: 0 30rpx 0 76rpx;
+    box-sizing: border-box;
+    height: 30px;
+    line-height: 30px;
+    background: #f0f0f0;
+}
+
+/**
+* 分类导航
+*/
+.nav-list {
+    height: 80rpx;
+    line-height: 80rpx;
+}
+
+/**
+* 数据列表
+*/
+.scroll-box {
+    height: calc(100vh - 110rpx - 30px);
+}
\ No newline at end of file
diff --git a/pages/plugins/blog/search/search.vue b/pages/plugins/blog/search/search.vue
new file mode 100644
index 0000000..faa6f64
--- /dev/null
+++ b/pages/plugins/blog/search/search.vue
@@ -0,0 +1,342 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data_base || null) != null">
+            <!-- 搜索关键字 -->
+            <view class="padding-horizontal-main padding-top-main padding-bottom-sm bg-white">
+                <view class="search-keywords pr">
+                    <icon type="search" size="12" class="pa"></icon>
+                    <input type="text" confirm-type="search" :placeholder="$t('search.search.723rbx')" :value="search_keywords_value" @confirm="search_keywords_event" class="cr-base round wh-auto" placeholder-class="cr-grey" />
+                </view>
+            </view>
+
+            <!-- 分类 -->
+            <scroll-view v-if="(category || null) != null && category.length > 0" class="nav-list scroll-view-horizontal bg-white oh" scroll-x="true">
+                <view :class="'item cr-grey dis-inline-block padding-horizontal-main ' + (nav_active_value == 0 ? 'cr-main' : '')" @tap="nav_event" data-value="0">{{ $t('common.all') }}</view>
+                <block v-for="(item, index) in category" :key="index">
+                    <view :class="'item cr-grey dis-inline-block padding-horizontal-main ' + (nav_active_value == item.id ? 'cr-main' : '')" @tap="nav_event" :data-value="item.id">{{ item.name }}</view>
+                </block>
+            </scroll-view>
+
+            <!-- 列表 -->
+            <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+                <view :class="(data_base.is_user_add_blog || 0) == 1 ? 'page-bottom-fixed' : ''">
+                    <view v-if="(data_list || null) != null && data_list.length > 0" class="plugins-blog-list padding-horizontal-main padding-top-main oh">
+                        <view v-for="(item, index) in data_list" :key="index">
+                            <view :data-value="item.url" @tap="url_event" class="item oh cp padding-main border-radius-main bg-white spacing-mb">
+                                <image class="blog-img fl radius" :src="item.cover" mode="aspectFill"></image>
+                                <view class="base fr">
+                                    <view class="single-text text-size">{{ item.title }}</view>
+                                    <view class="cr-grey margin-top-sm">{{ item.add_time_date_cn }}</view>
+                                    <view class="cr-base text-size-sm multi-text margin-top-sm">{{ item.describe }}</view>
+                                </view>
+                            </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>
+            </scroll-view>
+
+            <!-- 发布博文、我的博文入口 -->
+            <view v-if="(data_base.is_user_add_blog || 0) == 1" class="bottom-fixed" :style="bottom_fixed_style">
+                <view class="bottom-line-exclude">
+                    <view class="item flex-row jc-sa align-c text-size fw-b br bg-white round padding-vertical">
+                        <view data-value="/pages/plugins/blog/form/form" @tap="url_event" class="flex-1 tc flex-col jc-c align-c cp">
+                            <view class="divider-r-d wh-auto"> <iconfont name="icon-edit-below-line" size="30rpx" color="#333" propClass="margin-right-sm"></iconfont>{{$t('detail.detail.fn3w01')}}{{ blog_main_name }}</view>
+                        </view>
+                        <view data-value="/pages/plugins/blog/user-list/user-list" @tap="url_event" class="flex-1 tc flex-col jc-c align-c cp">
+                            <view class="wh-auto"> <iconfont name="icon-list-dot" size="32rpx" color="#333" propClass="margin-right-sm pr top-xs"></iconfont>{{$t('common.my')}}{{ blog_main_name }}</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                bottom_fixed_style: '',
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                params: null,
+                data_base: null,
+                category: [],
+                nav_active_value: 0,
+                search_keywords_value: '',
+                // 自定义分享信息
+                share_info: {},
+                blog_main_name: this.$t('detail.detail.e439j9'),
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 参数处理
+            params = app.globalData.launch_params_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+                nav_active_value: params.id || 0,
+                search_keywords_value: params.keywords || '',
+            });
+
+            // 数据加载
+            this.get_data();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            // 初始化
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'search', 'blog'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            // 标题
+                            var blog_main_name = (data.base || null) == null ? this.$t('detail.detail.e439j9') : data.base.blog_main_name || this.$t('detail.detail.e439j9');
+                            this.setData({
+                                data_base: data.base || null,
+                                category: data.category || [],
+                                blog_main_name: blog_main_name,
+                            });
+                            uni.setNavigationBarTitle({ title: blog_main_name + this.$t('common.search') });
+
+                            // 获取列表数据
+                            this.get_data_list(1);
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 获取数据列表
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 基础自定义分享
+                this.share_info_handle();
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({ data_is_loading: 1 });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('datalist', 'search', 'blog'),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page,
+                        id: this.nav_active_value,
+                        bwd: this.search_keywords_value,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            if (data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: data.total,
+                                    data_page_total: data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list_loding_msg: this.$t('common.no_relevant_data_tips'),
+                                    data_is_loading: 0,
+                                });
+                                if (this.data_page <= 1) {
+                                    this.setData({
+                                        data_list: [],
+                                        data_bottom_line_status: false,
+                                    });
+                                }
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                                data_is_loading: 0,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 分享设置处理
+            share_info_handle() {
+                // 基础自定义分享
+                var info = this.data_base || {};
+                if ((this.nav_active_value || 0) != 0 && this.category.length > 0) {
+                    for (var i in this.category) {
+                        if (this.nav_active_value == this.category[i]['id']) {
+                            info = this.category[i];
+                            break;
+                        }
+                    }
+                }
+                this.setData({
+                    share_info: {
+                        title: info.seo_title || this.data_base.application_name,
+                        desc: info.seo_desc,
+                        path: '/pages/plugins/blog/search/search',
+                        query: 'id=' + this.nav_active_value + '&keywords=' + this.search_keywords_value,
+                    },
+                });
+
+                // 分享菜单处理
+                app.globalData.page_share_handle(this.share_info);
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_active_value: e.currentTarget.dataset.value || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 关键字输入事件
+            search_keywords_event(e) {
+                this.setData({
+                    search_keywords_value: e.detail.value || '',
+                    data_page: 1,
+                });
+                this.get_data_list(1);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import './search.css';
+</style>
diff --git a/pages/plugins/blog/user-list/user-list.css b/pages/plugins/blog/user-list/user-list.css
new file mode 100644
index 0000000..680732d
--- /dev/null
+++ b/pages/plugins/blog/user-list/user-list.css
@@ -0,0 +1,37 @@
+.blog-img {
+    width: 236rpx;
+    height: 182rpx;
+}
+
+.badge {
+    display: inline-block;
+    height: 32rpx;
+    line-height: 32rpx;
+    border-radius: 18rpx;
+    font-size: 10px;
+    padding: 0 16rpx;
+}
+
+.badge.success {
+    color: #52C41A;
+    background: rgb(82 196 26 / 10%);
+}
+
+.badge.info {
+    color: #999;
+    background: #f4f4f4;
+}
+
+.badge.error {
+    color: #E22C08;
+    background: rgba(226, 45, 8, 0.1);
+}
+
+.add-icon {
+    height: 80rpx;
+    line-height: 76rpx;
+    margin-right: 6rpx;
+}
+.multi-text {
+    min-height: auto;
+}
\ No newline at end of file
diff --git a/pages/plugins/blog/user-list/user-list.vue b/pages/plugins/blog/user-list/user-list.vue
new file mode 100644
index 0000000..154f485
--- /dev/null
+++ b/pages/plugins/blog/user-list/user-list.vue
@@ -0,0 +1,281 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="data.length > 0">
+            <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+                <view class="page-bottom-fixed padding-top-main">
+                    <view v-for="(item, index) in data" class="bg-white spacing-mb" :key="index">
+                        <view class="padding-main flex-row">
+                            <view v-if="item.cover" class="padding-right-main">
+                                <image class="blog-img radius" :src="item.cover" mode="aspectFit"></image>
+                            </view>
+                            <view class="flex-1 flex-width">
+                                <view class="multi-text text-size fw-b margin-bottom-xs">{{ item.title }}</view>
+                                <view class="text-size-sm cr-grey-9 margin-bottom-sm">{{ item.date }}</view>
+                                <view class="badge" :class="item.status == '0' ? 'info' : item.status === '1' ? 'success' : 'error'">{{ item.status_name }}</view>
+                            </view>
+                        </view>
+                        <view class="br-t-f5 flex-row jc-sa align-c text-size tc">
+                            <view class="cr-base flex-1 divider-r-f5 padding-vertical-main" :data-value="'/pages/plugins/blog/form/form?id=' + item.id" @tap="url_event">
+                                <view class="margin-right-xs dis-inline-block">
+                                    <iconfont name="icon-edit-below-line" size="32rpx"></iconfont>
+                                </view>{{$t('common.edit')}}</view>
+                            <view class="cr-main flex-1 padding-vertical-main" :data-id="item.id" @tap="del_event">
+                                <view class="margin-right-xs dis-inline-block">
+                                    <iconfont name="icon-delete" size="32rpx"></iconfont>
+                                </view>{{$t('common.del')}}</view>
+                        </view>
+                    </view>
+                    <!-- 结尾 -->
+                    <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+                </view>
+            </scroll-view>
+        </block>
+
+        <!-- 底部操作 -->
+        <view class="bottom-fixed" :style="bottom_fixed_style">
+            <view class="bottom-line-exclude">
+                <button class="item cr-main bg-white br-main round text-size wh-auto flex-row align-c jc-c" type="default" hover-class="none" data-value="/pages/plugins/blog/form/form" @tap="url_event">
+                    <view class="add-icon">
+                        <iconfont name="icon-xzdz-tianjiabiaoq" size="32rpx"></iconfont>
+                    </view>
+                    <text>{{$t('common.add')}}</text>
+                </button>
+            </view>
+        </view>
+        <block v-if="data.length == 0 && data_list_loding_status != 3">
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: app.globalData.get_theme_color(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                bottom_fixed_style: '',
+                data: [],
+                data_is_loading: 0,
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+            };
+        },
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        // 页面销毁时执行
+        onUnload: function () {},
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data_list(1);
+                } else {
+                    // 提示错误
+                    this.setData({
+                        data_list_loding_status: 2,
+                        data_list_loding_msg: this.$t('form.form.8l3ul5'),
+                    });
+                }
+            },
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'blog', 'blog'),
+                    method: 'POST',
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            if (data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data: temp_data_list,
+                                    data_total: data.total,
+                                    data_page_total: data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_list_loding_msg: '',
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_total: 0,
+                                    data_is_loading: 0,
+                                });
+                                if (this.data_page <= 1) {
+                                    this.setData({
+                                        data: [],
+                                        data_bottom_line_status: false,
+                                    });
+                                }
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                                data_is_loading: 0,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 删除blog
+            del_event(e) {
+                // 是否再次确认
+                if (e.alert_status != 0 && e.alert_status != 1) {
+                    app.globalData.alert({
+                        msg: this.$t('user-list.user-list.yhvl2q'),
+                        is_show_cancel: 1,
+                        object: this,
+                        params: { id: e.currentTarget.dataset.id },
+                        method: 'del_event',
+                    });
+                    return false;
+                }
+                if (e.alert_status == 1) {
+                    // 加载loding
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('delete', 'blog', 'blog'),
+                        method: 'POST',
+                        data: { ids: e.id },
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                var temp_list = [];
+                                var temp_data_list = this.data;
+                                for (var i in temp_data_list) {
+                                    if (e.id.indexOf(temp_data_list[i]['id']) == -1) {
+                                        temp_list.push(temp_data_list[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data: temp_list,
+                                });
+                                app.globalData.showToast(this.$t('common.del_success'), 'success');
+                            } else {
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(this.$t('common.del_fail'));
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+        },
+    };
+</script>
+<style>
+    @import './user-list.css';
+</style>
diff --git a/pages/plugins/brand/index/index.css b/pages/plugins/brand/index/index.css
new file mode 100644
index 0000000..9ede5cc
--- /dev/null
+++ b/pages/plugins/brand/index/index.css
@@ -0,0 +1,64 @@
+/**
+* 分类导航
+*/
+
+.nav-list {
+	width: calc(100% - 70rpx);
+}
+
+.nav-list .item:first-of-type {
+	margin-left: 16rpx;
+}
+
+.nav-list .item {
+	padding: 20rpx 4rpx;
+}
+
+.nav-list image {
+	width: 92rpx;
+	height: 92rpx;
+	margin: 0 15rpx;
+	border-radius: 50%;
+	margin-bottom: 10rpx;
+}
+
+.nav-list-more {
+	width: 100%;
+	max-height: 550rpx;
+	overflow-y: auto;
+}
+
+.nav-list-more image {
+	width: 92rpx;
+	height: 92rpx;
+	border-radius: 50%;
+	margin-bottom: 10rpx;
+}
+
+.nav-list-more .item {
+	width: 20%;
+	padding: 20rpx 0;
+}
+
+/**
+* 数据列表
+*/
+.data-list .item {
+	width: calc(50% - 10rpx);
+	margin-bottom: 20rpx;
+	text-align: center;
+}
+
+.data-list .item:nth-child(2n) {
+	float: right;
+}
+
+.data-list .item:nth-child(2n+1) {
+	float: left;
+}
+
+.data-list .item image {
+	padding-top: 24rpx;
+	width: calc(100% - 48rpx);
+	height: 160rpx !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/brand/index/index.vue b/pages/plugins/brand/index/index.vue
new file mode 100644
index 0000000..c798433
--- /dev/null
+++ b/pages/plugins/brand/index/index.vue
@@ -0,0 +1,224 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data_base || null) != null">
+            <view class="pr">
+                <!-- 分类 -->
+                <scroll-view v-if="(brand_category_list || null) != null && brand_category_list.length > 0" :scroll-x="true" :show-scrollbar="false" :scroll-with-animation="true" :scroll-into-view="'one-nav-item-' + nav_active_index" class="nav-list scroll-view-horizontal bg-white oh" scroll-x="true">
+                    <view class="flex-row flex-nowrap align-c">
+                        <block v-for="(item, index) in brand_category_list" :key="index">
+                            <view class="item flex-col align-c text-size-xss" :id="'one-nav-item-' + index" :data-index="index" @tap="nav_event" :data-value="item.id">
+                                <image :src="item.icon" mode="aspectFit"></image>
+                                <view class="padding-left-sm padding-right-sm round" :class="nav_active_value == item.id ? 'bg-main cr-white' : ''">
+                                    {{ item.name }}
+                                </view>
+                            </view>
+                        </block>
+                    </view>
+                </scroll-view>
+                <component-nav-more propClass="bg-white" :propStatus="popupStatus" @open-popup="open_popup_event">
+                    <view class="nav-list-more">
+                        <view class="flex-row flex-wrap align-c">
+                            <block v-for="(item, index) in brand_category_list" :key="index">
+                                <view class="item flex-col align-c text-size-xss" @tap="nav_event" :id="'one-nav-item-' + index" :data-index="index" :data-value="item.id">
+                                    <image :src="item.icon" mode="aspectFit"></image>
+                                    <view class="padding-left-sm padding-right-sm round" :class="nav_active_value == item.id ? 'bg-main cr-white' : ''">
+                                        {{ item.name }}
+                                    </view>
+                                </view>
+                            </block>
+                        </view>
+                    </view>
+                </component-nav-more>
+            </view>
+
+            <!-- 列表 -->
+            <view v-if="(brand_list || null) != null && brand_list.length > 0" class="data-list padding-horizontal-main padding-top-main oh">
+                <block v-for="(item, index) in brand_list" :key="index">
+                    <view v-if="(item.is_not_show || 0) == 0" :data-value="'/pages/goods-search/goods-search?brand=' + item.id" @tap="url_event" class="item border-radius-main bg-white oh cp spacing-mb">
+                        <image :src="item.logo" mode="aspectFit"></image>
+                        <view class="padding-main tc">
+                            <view class="single-text fw-b cr-base">{{ item.name }}</view>
+                        </view>
+                    </view>
+                </block>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </view>
+
+        <!-- 提示信息 -->
+        <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentNavMore from '@/components/nav-more/nav-more';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                params: null,
+                data_base: null,
+                brand_list: [],
+                brand_category_list: [],
+                nav_active_value: 0,
+                // 自定义分享信息
+                share_info: {},
+                popupStatus: false,
+                nav_active_index: 0,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentNavMore,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.get_data();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        methods: {
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'index', 'brand'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var brand_list = data.brand_list || [];
+                            this.setData({
+                                data_base: data.base || null,
+                                brand_list: brand_list,
+                                brand_category_list: data.brand_category_list || [],
+                                data_list_loding_msg: '',
+                                data_list_loding_status: brand_list.length > 0 ? 3 : 0,
+                                data_bottom_line_status: brand_list.length > 0,
+                            });
+
+                            // 基础自定义分享
+                            this.setData({
+                                share_info: {
+                                    title: this.data_base.seo_title || this.data_base.application_name,
+                                    desc: this.data_base.seo_desc,
+                                    path: '/pages/plugins/brand/index/index',
+                                },
+                            });
+
+                            // 导航选中处理
+                            this.nav_active_handle();
+
+                            // 分享菜单处理
+                            app.globalData.page_share_handle(this.share_info);
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_active_value: e.currentTarget.dataset.value || 0,
+                    popupStatus: false,
+                    nav_active_index: e.currentTarget.dataset.index,
+                });
+                this.nav_active_handle();
+            },
+            // 打开弹窗
+            open_popup_event(e) {
+                this.setData({
+                    popupStatus: e,
+                });
+            },
+
+            // 导航选中处理
+            nav_active_handle() {
+                var value = this.nav_active_value;
+                var temp_brand_list = this.brand_list;
+                var count = 0;
+                for (var i in temp_brand_list) {
+                    if (value == 0) {
+                        temp_brand_list[i]['is_not_show'] = 0;
+                        count++;
+                    } else {
+                        var is_not_show = temp_brand_list[i]['brand_category_ids'].indexOf(value) == -1 ? 1 : 0;
+                        temp_brand_list[i]['is_not_show'] = is_not_show;
+                        if (is_not_show == 0) {
+                            count++;
+                        }
+                    }
+                }
+
+                this.setData({
+                    brand_list: temp_brand_list,
+                    data_list_loding_status: count > 0 ? 3 : 0,
+                    data_bottom_line_status: count > 0,
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import './index.css';
+</style>
diff --git a/pages/plugins/coin/cash-list/cash-list.css b/pages/plugins/coin/cash-list/cash-list.css
new file mode 100644
index 0000000..3de89b7
--- /dev/null
+++ b/pages/plugins/coin/cash-list/cash-list.css
@@ -0,0 +1,32 @@
+.cash .nav {
+    z-index: 102;
+}
+
+.scroll-box {
+    height: calc(100vh - 88rpx);
+}
+
+.convert-group-row .title {
+    min-width: 140rpx;
+}
+
+.recharge-del-btn {
+    padding: 0 60rpx;
+    font-size: 28rpx;
+    margin: 0 0 0 20rpx;
+    color: #0079ff !important;
+    background-color: #fff;
+    border: 2rpx solid #0079ff;
+}
+
+.recharge-del-btn:active {
+    opacity: 0.7;
+}
+
+/* 
+ * 钱包弹窗
+*/
+.popup_accounts_container .item {
+    background-color: #f4f4f4;
+    border-radius: 30rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/coin/cash-list/cash-list.vue b/pages/plugins/coin/cash-list/cash-list.vue
new file mode 100644
index 0000000..2c36512
--- /dev/null
+++ b/pages/plugins/coin/cash-list/cash-list.vue
@@ -0,0 +1,518 @@
+<template>
+    <view :class="theme_view">
+        <view class="cash">
+            <view class="padding-main bg-white pr nav flex-row oa">
+                <view class="flex-shrink flex-row align-c margin-right-xxxl padding-right-xl pr" @tap="popup_accounts_open_event">
+                    <view>{{ accounts_name !== null && accounts_name !== $t('common.all') ? accounts_name : $t('cash-list.cash-list.n74r94') }}</view>
+                    <view class="pa right-0"><iconfont :name="popup_accounts_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
+                </view>
+                <view class="flex-shrink flex-row align-c margin-right-xxxl padding-right-xl pr" @tap="popup_recharge_status_open_event">
+                    <view>{{ recharge_status_name !== null && recharge_status_name !== $t('common.all') ? recharge_status_name : $t('invoice-detail.invoice-detail.rrfex6') }}</view>
+                    <view class="pa right-0"><iconfont :name="popup_recharge_status_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
+                </view>
+                <view class="flex-shrink flex-row align-c padding-right-xl pr" @tap="popup_network_open_event">
+                    <view>{{ network_name !== null && network_name !== $t('common.all') ? network_name : $t('cash-list.cash-list.2g251t') }}</view>
+                    <view class="pa right-0"><iconfont :name="popup_network_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
+                </view>
+            </view>
+            <scroll-view :scroll-y="true" class="scroll-box" lower-threshold="60" @scroll="scroll_event">
+                <view class="padding-main">
+                    <view v-if="data_list.length > 0">
+                        <view v-for="(item, index) in data_list" :key="index" class="padding-main bg-white radius-md margin-bottom-main">
+                            <view class="br-b-dashed padding-bottom-main margin-bottom-main flex-row jc-sb align-c">
+                                <view class="cr-grey-9 title">{{ item.add_time }}</view>
+                                <view :class="item.status == 0 ? 'cr-black' : item.status_type == 1 ? 'cr-grey-9' : 'cr-black'">{{ item.status_name }}</view>
+                            </view>
+                            <view class="convert-group-row">
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title">{{$t('cash-list.cash-list.e6pffe')}}</text>
+                                    <text class="fw-b warp">{{ item.cash_no }}</text>
+                                </view>
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title title">{{$t('cash-list.cash-list.2w20g2')}}</text>
+                                    <text class="fw-b warp">{{ item.platform_name }}</text>
+                                </view>
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title title">{{$t('cash-list.cash-list.23ii8s')}}</text>
+                                    <text class="fw-b warp">{{ item.network_name }}</text>
+                                </view>
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title title">{{$t('cash-list.cash-list.714g2h')}}</text>
+                                    <text class="fw-b warp">{{ item.address }}</text>
+                                </view>
+                                <view class="flex-row">
+                                    <text class="cr-grey-9 title">{{$t('cash-list.cash-list.1o8838')}}</text>
+                                    <text class="fw-b warp">{{ item.coin }}</text>
+                                </view>
+                            </view>
+                            <div v-if="item.status == 0" class="br-t-dashed padding-top-main margin-top-main flex-row jc-e align-c">
+                                <button type="default" class="recharge-del-btn round margin-0" :data-id="item.id" @tap="cash_del_event">{{$t('common.del')}}</button>
+                            </div>
+                        </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>
+            </scroll-view>
+            <!-- 账户 -->
+            <component-popup :propShow="popup_accounts_status" propPosition="top" :propTop="popup_top_height + 'px'" @onclose="popup_accounts_close_event">
+                <view class="padding-vertical-lg">
+                    <view class="padding-horizontal-main text-size-xs">{{$t('cash-list.cash-list.s7l616')}}</view>
+                    <view class="popup_accounts_container padding-sm flex-row flex-wrap align-c tc text-size-md">
+                        <view class="flex-width-half-half">
+                            <view class="item margin-sm padding-vertical-sm" :class="accounts_list_index == null ? 'cr-main bg-main-light' : ''" :data-name="$t('common.all')" :data-value="null" :data-index="null" @tap="accounts_list_event">{{$t('common.all')}}</view>
+                        </view>
+                        <view v-for="(item, index) in accounts_list" class="flex-width-half-half" :key="index">
+                            <view class="item margin-sm padding-vertical-sm" :class="accounts_list_index == index ? 'cr-main bg-main-light' : ''" :data-name="item.platform_name" :data-value="item.id" :data-index="index" @tap="accounts_list_event">{{ item.platform_name }}</view>
+                        </view>
+                    </view>
+                    <view class="tc padding-top-lg br-t" @tap="popup_accounts_close_event">
+                        <text class="padding-right-sm">{{ $t('nav-more.nav-more.h9g4b1') }}</text>
+                        <iconfont name="icon-arrow-top" color="#ccc"></iconfont>
+                    </view>
+                </view>
+            </component-popup>
+            <!-- 类型 -->
+            <component-popup :propShow="popup_recharge_status_status" propPosition="top" :propTop="popup_top_height + 'px'" @onclose="popup_recharge_status_close_event">
+                <view class="padding-vertical-lg">
+                    <view class="padding-horizontal-main text-size-xs">{{$t('cash-list.cash-list.t66tu3')}}</view>
+                    <view class="popup_accounts_container padding-sm flex-row flex-wrap align-c tc text-size-md">
+                        <view class="flex-width-half-half">
+                            <view class="item margin-sm padding-vertical-sm" :class="recharge_status_list_index == null ? 'cr-main bg-main-light' : ''" :data-name="$t('common.all')" :data-value="null" :data-index="null" @tap="recharge_status_list_event">{{$t('common.all')}}</view>
+                        </view>
+                        <view v-for="(item, index) in recharge_status_list" class="flex-width-half-half" :key="index">
+                            <view class="item margin-sm padding-vertical-sm" :class="recharge_status_list_index == index ? 'cr-main bg-main-light' : ''" :data-name="item.name" :data-value="item.value" :data-index="index" @tap="recharge_status_list_event">{{ item.name }}</view>
+                        </view>
+                    </view>
+                    <view class="tc padding-top-lg br-t" @tap="popup_recharge_status_close_event">
+                        <text class="padding-right-sm">{{ $t('nav-more.nav-more.h9g4b1') }}</text>
+                        <iconfont name="icon-arrow-top" color="#ccc"></iconfont>
+                    </view>
+                </view>
+            </component-popup>
+            <!-- 网络 -->
+            <component-popup :propShow="popup_network_status" propPosition="top" :propTop="popup_top_height + 'px'" @onclose="popup_network_close_event">
+                <view class="padding-vertical-lg">
+                    <view class="padding-horizontal-main text-size-xs">{{$t('cash-list.cash-list.311tt2')}}</view>
+                    <view class="popup_accounts_container padding-sm flex-row flex-wrap align-c tc text-size-md">
+                        <view class="flex-width-half-half">
+                            <view class="item margin-sm padding-vertical-sm" :class="network_list_index == null ? 'cr-main bg-main-light' : ''" :data-name="$t('common.all')" :data-value="null" :data-index="null" @tap="network_list_event">{{$t('common.all')}}</view>
+                        </view>
+                        <view v-for="(item, index) in network_list" class="flex-width-half-half" :key="index">
+                            <view class="item margin-sm padding-vertical-sm" :class="network_list_index == index ? 'cr-main bg-main-light' : ''" :data-name="item.name" :data-value="item.id" :data-index="index" @tap="network_list_event">{{ item.name }}</view>
+                        </view>
+                    </view>
+                    <view class="tc padding-top-lg br-t" @tap="popup_network_close_event">
+                        <text class="padding-right-sm">{{ $t('nav-more.nav-more.h9g4b1') }}</text>
+                        <iconfont name="icon-arrow-top" color="#ccc"></iconfont>
+                    </view>
+                </view>
+            </component-popup>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentPopup from '@/components/popup/popup';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    var wallet_static_url = app.globalData.get_static_url('coin', true) + 'app/';
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                wallet_static_url: wallet_static_url,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                params: {},
+
+                // 弹窗距离顶部距离
+                popup_top_height: 0,
+
+                // 账户
+                popup_accounts_status: false,
+                accounts_id: null,
+                accounts_list_index: null,
+                accounts_name: null,
+                accounts_list: [],
+                // 类型
+                popup_recharge_status_status: false,
+                status: null,
+                recharge_status_list_index: null,
+                recharge_status_name: null,
+                recharge_status_list: [],
+                // 网络
+                popup_network_status: false,
+                network_id: null,
+                network_list_index: null,
+                network_name: null,
+                network_list: [],
+
+                data_list: [],
+                data_page_total: 0,
+                data_page: 1,
+                data_is_loading: 0,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentPopup,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+            // 设置参数
+            this.setData({
+                params: params,
+                accounts_id: params.id || null,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 初始数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+        methods: {
+            init(e) {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                    this.get_data_list();
+                    var self = this;
+                    var timer = setInterval(function () {
+                        if (self.popup_top_height == 0) {
+                            self.popup_top_height_computer();
+                        } else {
+                            clearInterval(timer);
+                        }
+                    }, 500);
+                }
+            },
+
+            // 初始化数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('init', 'user', 'coin'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                accounts_list: data.accounts_list || [],
+                                recharge_status_list: data.recharge_status_list || [],
+                                network_list: data.network_list || [],
+                            });
+                            if (this.accounts_list.length > 0 && (this.accounts_id || null) != null) {
+                                var index = this.accounts_list.findIndex((item) => item.id == this.accounts_id);
+                                this.setData({
+                                    accounts_list_index: index,
+                                    accounts_id: this.accounts_list[index].id,
+                                    accounts_name: this.accounts_list[index].platform_name,
+                                });
+                            }
+                        } else {
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+                // 加载loding
+                if (this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+                var new_data = {
+                    accounts_id: this.accounts_id,
+                    network_id: this.network_id,
+                    status: this.status,
+                    page: this.data_page,
+                };
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'cash', 'coin'),
+                    method: 'POST',
+                    data: new_data,
+                    dataType: 'json',
+                    success: (res) => {
+                        if (this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            // 数据列表
+                            var data = res.data.data;
+                            if (this.data_page <= 1) {
+                                var temp_data_list = data.data_list || [];
+                            } else {
+                                var temp_data_list = this.data_list || [];
+                                var temp_data = data.data_list;
+                                for (var i in temp_data) {
+                                    temp_data_list.push(temp_data[i]);
+                                }
+                            }
+
+                            this.setData({
+                                data_list: temp_data_list,
+                                data_total: data.total,
+                                data_page_total: data.page_total,
+                                data_list_loding_status: temp_data_list.length > 0 ? 3 : 0,
+                                data_list_loding_msg: '',
+                                data_page: this.data_page + 1,
+                                data_is_loading: 0,
+                            });
+
+                            // 是否还有数据
+                            this.setData({
+                                data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                        }
+                    },
+                    fail: () => {
+                        if (this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+
+            // 账户打开
+            popup_accounts_open_event() {
+                this.setData({
+                    popup_accounts_status: !this.popup_accounts_status,
+                    popup_recharge_status_status: false,
+                    popup_network_status: false,
+                });
+            },
+
+            // 账户关闭
+            popup_accounts_close_event() {
+                this.setData({
+                    popup_accounts_status: false,
+                });
+            },
+
+            // 账户选择
+            accounts_list_event(e) {
+                this.setData({
+                    accounts_list_index: e.currentTarget.dataset.index,
+                    accounts_id: e.currentTarget.dataset.value,
+                    accounts_name: e.currentTarget.dataset.name,
+                    popup_accounts_status: false,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 类型打开
+            popup_recharge_status_open_event() {
+                this.setData({
+                    popup_recharge_status_status: !this.popup_recharge_status_status,
+                    popup_accounts_status: false,
+                    popup_network_status: false,
+                });
+            },
+
+            // 类型关闭
+            popup_recharge_status_close_event() {
+                this.setData({
+                    popup_recharge_status_status: false,
+                });
+            },
+
+            // 类型选择
+            recharge_status_list_event(e) {
+                this.setData({
+                    recharge_status_list_index: e.currentTarget.dataset.index,
+                    status: e.currentTarget.dataset.value,
+                    recharge_status_name: e.currentTarget.dataset.name,
+                    popup_recharge_status_status: false,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 网络打开
+            popup_network_open_event() {
+                this.setData({
+                    popup_network_status: !this.popup_network_status,
+                    popup_accounts_status: false,
+                    popup_recharge_status_status: false,
+                });
+            },
+
+            // 网络关闭
+            popup_network_close_event() {
+                this.setData({
+                    popup_network_status: false,
+                });
+            },
+
+            // 网络选择
+            network_list_event(e) {
+                this.setData({
+                    network_list_index: e.currentTarget.dataset.index,
+                    network_id: e.currentTarget.dataset.value,
+                    network_name: e.currentTarget.dataset.name,
+                    popup_network_status: false,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 删除支付
+            cash_del_event(e) {
+                // 是否再次确认
+                if (e.alert_status != 0 && e.alert_status != 1) {
+                    app.globalData.alert({
+                        msg: this.$t('cash-list.cash-list.8hrc73'),
+                        is_show_cancel: 1,
+                        object: this,
+                        params: { id: e.currentTarget.dataset.id },
+                        method: 'cash_del_event',
+                    });
+                    return false;
+                }
+                if (e.alert_status == 1) {
+                    // 加载loding
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('delete', 'cash', 'coin'),
+                        method: 'POST',
+                        data: { ids: e.id },
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                this.setData({
+                                    data_page: 1,
+                                });
+                                app.globalData.showToast(this.$t('common.del_success'), 'success');
+                                this.get_data_list(1);
+                            } else {
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(this.$t('common.del_fail'));
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 计算搜索框的高度
+            popup_top_height_computer() {
+                const query = uni.createSelectorQuery();
+                query
+                    .select('.nav')
+                    .boundingClientRect((res) => {
+                        if ((res || null) != null) {
+                            // 获取搜索框高度
+                            this.setData({
+                                popup_top_height: res.height,
+                            });
+                        }
+                    })
+                    .exec();
+            },
+
+            // 页面滚动监听
+            scroll_event(e) {
+                uni.$emit('onPageScroll', e.detail);
+            },
+        },
+    };
+</script>
+<style>
+    @import './cash-list.css';
+</style>
diff --git a/pages/plugins/coin/cash/cash.css b/pages/plugins/coin/cash/cash.css
new file mode 100644
index 0000000..22b2b32
--- /dev/null
+++ b/pages/plugins/coin/cash/cash.css
@@ -0,0 +1,118 @@
+/* 
+ * 顶部
+*/
+.cash .title {
+    background: radial-gradient(60% 70% at 90% 79%, rgba(33, 125, 239, 0.85) 0%, #A6C8F3 100%);
+    padding-top: 130rpx;
+    /* #ifndef H5  */
+    padding-top: calc(var(--status-bar-height) + 5px + 130rpx);
+    /* #endif */
+    padding-bottom: 180rpx;
+}
+
+.coin-dropdown {
+    --height: 48rpx;
+    height: var(--height);
+    line-height: var(--height);
+    padding: 0 64rpx 0 32rpx;
+    background: rgba(255, 255, 255, 0.23);
+    border-radius: 12px;
+}
+
+.coin-dropdown-icon {
+    right: 36rpx;
+    top: 2rpx;
+    padding: 0;
+}
+
+.cash .detail {
+    --height: 64rpx;
+    height: var(--height);
+    line-height: var(--height);
+    background: rgba(255, 255, 255, 0.34);
+    border-radius: 200rpx 0 0 200rpx;
+    padding: 0 32rpx;
+    margin-top: 40rpx;
+}
+
+.cash .text {
+    color: #EBF3FF;
+}
+
+/* 
+ * 内容
+*/
+.cash .content {
+    margin-top: -200rpx;
+    border-radius: 32rpx 32rpx 0 0;
+    min-height: calc(100vh - 528rpx);
+    /* #ifndef H5  */
+    min-height: calc(100vh - 528rpx - var(--status-bar-height) - 5px);
+    /* #endif */
+}
+.cash .recharge-content-input-bg,
+.cash .content-input-bg {
+    background-color: #fafafc;
+}
+
+.cash .price-item {
+    --size: -10rpx;
+    margin-left: var(--size);
+    margin-right: var(--size);
+    width: calc(100% - var(--size));
+}
+
+.cash .price-list {
+    background: #F5F7F9;
+    border: 2rpx solid #F5F7F9;
+    border-radius: 16rpx;
+    padding: 20rpx 0;
+    margin: 18rpx 10rpx;
+    width: calc((100% / 3) - 24rpx);
+}
+
+.cash .price-img {
+    --size: 36rpx;
+    width: var(--size);
+    height: var(--size) !important;
+}
+
+.cash-btn {
+    background: linear-gradient(107deg, #31B4FC 0%, #0842E2 100%);
+    transition: all 0.3s ease-in-out;
+}
+
+.cash-btn:active {
+    background: linear-gradient(107deg, #168ACA 0%, #022A97 100%);
+}
+
+.cash .content-tips .item::before {
+    content: '';
+    width: 12rpx;
+    height: 12rpx;
+    border-radius: 12rpx;
+    background: #30B3FC;
+    position: absolute;
+    left: 0;
+    top: 12rpx;
+}
+
+.coin-content-list-img {
+    --size: 28rpx;
+    width: var(--size);
+    height: var(--size) !important;
+}
+
+/* 
+ * 虚拟币弹窗
+*/
+.popup_coin_status_container .scroll-y {
+    height: 40vh;
+    overflow-y: auto;
+}
+
+.coin-list-img {
+    --size: 40rpx;
+    width: var(--size);
+    height: var(--size) !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/coin/cash/cash.vue b/pages/plugins/coin/cash/cash.vue
new file mode 100644
index 0000000..1fa7ad8
--- /dev/null
+++ b/pages/plugins/coin/cash/cash.vue
@@ -0,0 +1,362 @@
+<template>
+    <view :class="theme_view">
+        <component-nav-back></component-nav-back>
+        <block v-if="accounts_list.length > 0">
+            <view class="cash">
+                <scroll-view :scroll-y="true" class="scroll-box" lower-threshold="60" @scroll="scroll_event">
+                    <view class="title flex-col padding-lg">
+                        <view class="margin-bottom-xxxl flex-row jc-sb margin-top-xl">
+                            <view v-if="(accounts || mull) != null" class="cr-white">
+                                <view class="flex-row align-e margin-bottom-main">
+                                    <view class="flex-row align-c pr coin-dropdown" @tap="popup_coin_status_open_event">
+                                        <image v-if="(accounts.platform_icon || null) != null" :src="accounts.platform_icon" mode="widthFix" class="coin-content-list-img round" />
+                                        <text class="margin-left-xs">{{ accounts.platform_name }}</text>
+                                        <view class="coin-dropdown-icon pa padding-left-xxl">
+                                            <iconfont name="icon-arrow-bottom" size="24rpx" color="#fff"></iconfont>
+                                        </view>
+                                    </view>
+                                    <view class="text-size-xs fw-b padding-left-main text">{{$t('cash.cash.zmhf3n')}}</view>
+                                </view>
+                                <view class="flex-row align-e">
+                                    <view class="text-size-40 fw-b">{{ accounts.normal_coin }}</view>
+                                    <view class="padding-left-sm margin-bottom-main cr-grey-d">{{ accounts.default_symbol }} {{ accounts.default_coin }}</view>
+                                </view>
+                            </view>
+                            <view class="detail pa right-0 fw-b cr-white" :data-value="'/pages/plugins/coin/cash-list/cash-list?id='+accounts.id" @tap="url_event">{{$t('pages.plugins-coin-cash-list')}}</view>
+                        </view>
+                    </view>
+                    <view class="content padding-main">
+                        <view class="padding-xxxl bg-white radius-md margin-bottom-main">
+                            <view class="margin-bottom-xxxl">
+                                <view class="margin-bottom-main fw-b">{{$t('cash.cash.f6p4hm')}}</view>
+                                <view class="padding-vertical-main br-b-e flex-row align-c">
+                                    <input type="digit" :value="coin_num" class="flex-1 flex-width" placeholder-class="text-size-md cr-grey-9" :placeholder="$t('common.please_input')" @input="coin_num_change" />
+                                    <view @tap.stop="all_cash_event">{{$t('cash.cash.6oc6e7')}}</view>
+                                </view>
+                            </view>
+                            <view class="margin-bottom-xxxl">
+                                <view class="margin-bottom-main">{{$t('cash.cash.ucg8e2')}}</view>
+                                <view class="recharge-content-input-bg padding-main border-radius-sm flex-row align-c">
+                                    <input type="text" name="coin_address" class="padding-right-sm flex-1 flex-width" :value="coin_address" placeholder-class="text-size-md cr-grey-9" :placeholder="$t('cash.cash.i1f373')" @input="coin_address_change" />
+                                </view>
+                            </view>
+                            <view>
+                                <view class="margin-bottom-main">{{$t('cash.cash.h9i16y')}}</view>
+                                <block v-if="network_list.length > 0">
+                                    <picker class="content-input-bg padding-main margin-bottom-main border-radius-sm" @change="cash_event" :value="network_list_index" :range="network_list" range-key="name">
+                                        <view class="picker arrow-bottom">
+                                            {{ network_list[network_list_index]['name'] }}
+                                        </view>
+                                    </picker>
+                                </block>
+                                <view v-else class="cr-grey margin-bottom">{{$t('cash.cash.1g49wo')}}</view>
+                                <view class="content-input-bg padding-main border-radius-sm">
+                                    <input type="text" name="user_note" :value="user_note" placeholder-class="text-size-md cr-grey-9" :placeholder="$t('cash.cash.g05p4g')" @input="user_note_change" />
+                                </view>
+                            </view>
+                        </view>
+                        <!-- <view class="padding-main bg-white radius-md">
+                            <view class="padding-vertical-sm border-radius-sm flex-row align-c">
+                                <text class="text-size fw-b">支付密码</text>
+                                <view class="padding-left-lg">
+                                    <input type="digit" name="coin" :value="pay_pwd" placeholder-class="text-size-md cr-grey-9" placeholder="请输入支付密码" />
+                                </view>
+                            </view>
+                        </view> -->
+                        <view class="padding-xxxl">
+                            <button type="default" class="cash-btn cr-white round" @tap="apply_for_cash_event">{{$t('cash.cash.42b37m')}}</button>
+                        </view>
+                    </view>
+                </scroll-view>
+                <!-- 虚拟币下拉框 -->
+                <component-popup :propShow="popup_coin_status" propPosition="bottom" @onclose="popup_coin_status_close_event">
+                    <view class="padding-horizontal-main padding-top-main bg-white">
+                        <view class="oh">
+                            <view class="fr" @tap.stop="popup_coin_status_close_event">
+                                <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                            </view>
+                        </view>
+                        <view class="popup_coin_status_container padding-vertical-main flex-col text-size">
+                            <view class="scroll-y">
+                                <view v-for="(item, index) in accounts_list" :key="index">
+                                    <view class="flex-row jc-sb align-c padding-vertical-main" :class="accounts_list.length == index + 1 ? '' : 'br-b-f9'" :data-value="item.id" :data-index="index" @tap="coin_checked_event">
+                                        <view class="flex-row align-c">
+                                            <image v-if="platform_icon" :src="item.platform_icon" mode="widthFix" class="coin-list-img round" />
+                                            <view class="margin-left-sm text-size-md single-text">{{ item.platform_name }}</view>
+                                        </view>
+                                        <view>
+                                            <iconfont :name="accounts.id == item.id ? 'icon-zhifu-yixuan cr-red' : 'icon-zhifu-weixuan'" size="40rpx"></iconfont>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </component-popup>
+            </view>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNavBack from '@/components/nav-back/nav-back';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentPopup from '@/components/popup/popup';
+    var wallet_static_url = app.globalData.get_static_url('coin', true) + 'app/';
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                wallet_static_url: wallet_static_url,
+                status_bar_height: bar_height,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                params: {},
+
+                // 虚拟币
+                coin_num: '',
+                
+                // 账户
+                accounts: {},
+
+                // 虚拟币下拉框探弹窗状态
+                popup_coin_status: false,
+                // 虚拟币下拉框list
+                accounts_list: [],
+                // 充币网络
+                network_list_index: 0,
+                network_list: [],
+                // 提币地址
+                coin_address: '',
+                // 备注
+                user_note: '',
+                // 支付密码
+                pay_pwd: '',
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNavBack,
+            componentNoData,
+            componentPopup,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+        methods: {
+            init(e) {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('createinfo', 'cash', 'coin'),
+                    method: 'POST',
+                    data: {accounts_id : this.accounts.id || this.params.id || null},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                accounts: data.accounts || {},
+                                accounts_list: data.accounts_list || [],
+                                network_list: data.network_list || [],
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 3,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            app.globalData.is_login_check(res.data, this, 'get_data');
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 显示隐藏虚拟币
+            price_change() {
+                this.setData({});
+            },
+
+            // 虚拟币切换
+            coin_checked_event(e) {
+                this.setData({
+                    accounts: this.accounts_list[e.currentTarget.dataset.index],
+                    coin_num: '',
+                    popup_coin_status: false,
+                });
+                this.get_data();
+            },
+            popup_coin_status_open_event() {
+                this.setData({
+                    popup_coin_status: !this.popup_coin_status,
+                });
+            },
+            popup_coin_status_close_event() {
+                this.setData({
+                    popup_coin_status: false,
+                });
+            },
+
+            // 充币网络切换
+            cash_event(e) {
+                this.setData({
+                    network_list_index: parseInt(e.detail.value || 0),
+                });
+            },
+
+            // 全部提现
+            all_cash_event(e) {
+                this.setData({
+                    coin_num: this.accounts.normal_coin || '',
+                });
+            },
+
+            // 提币地址
+            coin_address_change(e) {
+                this.setData({
+                    coin_address: e.detail.value,
+                });
+            },
+
+            // 提现数量
+            coin_num_change(e) {
+                this.setData({
+                    coin_num: e.detail.value,
+                });
+            },
+
+            // 备注
+            user_note_change(e) {
+                this.setData({
+                    user_note: e.detail.value,
+                });
+            },
+
+            // 申请提现
+            apply_for_cash_event() {
+                if(this.network_list.length == 0) {
+                    app.globalData.showToast(this.$t('cash.cash.en6vsa'));
+                    return false;
+                }
+
+                // 表单数据
+                var new_data = {
+                    accounts_id: this.accounts.id,
+                    network_id: this.network_list[this.network_list_index].id,
+                    address: this.coin_address,
+                    coin: this.coin_num,
+                    user_note: this.user_note,
+                };
+                // 数据校验
+                var validation = [
+                    { fields: 'coin', msg: this.$t('cash.cash.w01qjc') },
+                    { fields: 'address', msg: this.$t('cash.cash.i1f373') },
+                ];
+                // 验证提交表单
+                if (app.globalData.fields_check(new_data, validation)) {
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('create', 'cash', 'coin'),
+                        method: 'POST',
+                        data: new_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                                setTimeout(function () {
+                                    app.globalData.url_open('/pages/plugins/coin/cash-list/cash-list', true);
+                                }, 1000);
+                            } else {
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.stopPullDownRefresh();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 页面滚动监听
+            scroll_event(e) {
+                uni.$emit('onPageScroll', e.detail);
+            },
+
+            // 复制文本
+            text_copy_event(e) {
+                app.globalData.text_copy_event(e);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+        },
+    };
+</script>
+<style>
+    @import './cash.css';
+</style>
diff --git a/pages/plugins/coin/collection/collection.css b/pages/plugins/coin/collection/collection.css
new file mode 100644
index 0000000..eeb4597
--- /dev/null
+++ b/pages/plugins/coin/collection/collection.css
@@ -0,0 +1,19 @@
+.collection .qrcode {
+    margin-bottom: 80rpx;
+    margin-top: 52rpx;
+}
+
+.collection .code {
+    margin-bottom: 52rpx;
+}
+
+.collection .code .num {
+    padding: 20rpx 28rpx;
+    word-break: break-all;
+    text-align: left;
+}
+
+.collection .code .copy {
+    padding: 40rpx;
+    color: #635BFF;
+}
\ No newline at end of file
diff --git a/pages/plugins/coin/collection/collection.vue b/pages/plugins/coin/collection/collection.vue
new file mode 100644
index 0000000..5e06b64
--- /dev/null
+++ b/pages/plugins/coin/collection/collection.vue
@@ -0,0 +1,87 @@
+<template>
+    <view :class="theme_view">
+        <view class="collection">
+            <view class="padding-main pr">
+                <block v-if="(params.accounts_key || null) != null">
+                    <view class="padding-lg bg-white radius-md margin-bottom-main tc">
+                        <view class="flex-row jc-c qrcode">
+                            <w-qrcode :options="qrcode"></w-qrcode>
+                        </view>
+                        <view class="code br-c radius flex-row">
+                            <view class="num flex-1 flex-width flex-row align-c text-size-md">{{ params.accounts_key }}</view>
+                            <view class="copy br-l-c text-size fw-b" :data-value="params.accounts_key" @tap.stop="text_copy_event">{{$t('collection.collection.856g12')}}</view>
+                        </view>
+                    </view>
+                    <view class="cr-grey-9 margin-top-xxl flex-row">
+                        <view class="pr">
+                            <iconfont name="icon-sigh-o" size="32rpx"></iconfont>
+                        </view>
+                        <text class="margin-left-sm text-size-xs">{{$t('collection.collection.9p43lu')}}</text>
+                    </view>
+                </block>
+                <block v-else>
+                    <!-- 提示信息 -->
+                    <component-no-data propStatus="0"></component-no-data>
+                </block>
+            </view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                params: {},
+                qrcode: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+            // 设置参数
+            this.setData({
+                params: params,
+                qrcode: {
+                    code: params.accounts_key || null,
+                    size: 280,
+                }
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        methods: {
+            // 复制文本
+            text_copy_event(e) {
+                app.globalData.text_copy_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import './collection.css';
+</style>
diff --git a/pages/plugins/coin/convert-list/convert-list.css b/pages/plugins/coin/convert-list/convert-list.css
new file mode 100644
index 0000000..69707d2
--- /dev/null
+++ b/pages/plugins/coin/convert-list/convert-list.css
@@ -0,0 +1,18 @@
+.convert .nav {
+    z-index: 102;
+}
+.scroll-box {
+    height: calc(100vh - 88rpx);
+}
+
+.convert-group-row .title {
+    min-width: 140rpx;
+}
+
+/* 
+ * 钱包弹窗
+*/
+.popup_accounts_container .item {
+    background-color: #f4f4f4;
+    border-radius: 30rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/coin/convert-list/convert-list.vue b/pages/plugins/coin/convert-list/convert-list.vue
new file mode 100644
index 0000000..17ca2e7
--- /dev/null
+++ b/pages/plugins/coin/convert-list/convert-list.vue
@@ -0,0 +1,408 @@
+<template>
+    <view :class="theme_view">
+        <view class="convert">
+            <view class="padding-main bg-white pr nav flex-row oa">
+                <view class="flex-shrink flex-row align-c margin-right-xxxl padding-right-xl pr" @tap="popup_send_accounts_open_event">
+                    <view>{{ send_accounts_name !== null && send_accounts_name !== $t('common.all') ? send_accounts_name : $t('convert-list.convert-list.q48666') }}</view>
+                    <view class="pa right-0"><iconfont :name="popup_send_accounts_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
+                </view>
+                <view class="flex-shrink flex-row align-c padding-right-xl pr" @tap="popup_receive_accounts_open_event">
+                    <view>{{ receive_accounts_name !== null && receive_accounts_name !== $t('common.all') ? receive_accounts_name : $t('convert-list.convert-list.47646p') }}</view>
+                    <view class="pa right-0"><iconfont :name="popup_receive_accounts_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
+                </view>
+            </view>
+            <scroll-view :scroll-y="true" class="scroll-box" lower-threshold="60" @scroll="scroll_event">
+                <view class="padding-main">
+                    <view v-if="data_list.length > 0">
+                        <view v-for="(item, index) in data_list" :key="index" class="padding-main bg-white radius-md margin-bottom-main">
+                            <view class="br-b-dashed padding-bottom-main margin-bottom-main flex-row jc-e align-c">
+                                <view class="cr-grey-9">{{ item.add_time }}</view>
+                            </view>
+                            <view class="convert-group-row">
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title">{{$t('convert-list.convert-list.8813rd')}}</text>
+                                    <text class="fw-b warp">{{ item.convert_no }}</text>
+                                </view>
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title">{{$t('convert-list.convert-list.c374ec')}}</text>
+                                    <text class="fw-b warp">{{ item.convert_value }}</text>
+                                </view>
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title">{{$t('convert-list.convert-list.6mxu85')}}</text>
+                                    <text class="fw-b warp">{{ item.send_accounts_id }}</text>
+                                </view>
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title">{{$t('convert-list.convert-list.733518')}}</text>
+                                    <text class="fw-b warp">{{ item.receive_accounts_id }}</text>
+                                </view>
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title">{{$t('convert-list.convert-list.6347mw')}}</text>
+                                    <text class="fw-b warp">{{ item.coin }}</text>
+                                </view>
+                                <view class="flex-row">
+                                    <text class="cr-grey-9 title">{{$t('convert-list.convert-list.9oy325')}}</text>
+                                    <text class="fw-b warp">{{ item.note }}</text>
+                                </view>
+                            </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>
+            </scroll-view>
+            <!-- 发起账户 -->
+            <component-popup :propShow="popup_send_accounts_status" propPosition="top" :propTop="popup_top_height + 'px'" @onclose="popup_send_accounts_close_event">
+                <view class="padding-vertical-lg">
+                    <view class="padding-horizontal-main text-size-xs">{{$t('convert-list.convert-list.q48666')}}</view>
+                    <view class="popup_accounts_container padding-sm flex-row flex-wrap align-c tc text-size-md">
+                        <view class="flex-width-half-half">
+                            <view class="item margin-sm padding-vertical-sm" :class="send_accounts_list_index == null ? 'cr-main bg-main-light' : ''" :data-name="$t('common.all')" :data-value="null" :data-index="null" @tap="send_accounts_list_event">{{$t('common.all')}}</view>
+                        </view>
+                        <view v-for="(item, index) in send_accounts_list" class="flex-width-half-half" :key="index">
+                            <view class="item margin-sm padding-vertical-sm" :class="send_accounts_list_index == index ? 'cr-main bg-main-light' : ''" :data-name="item.platform_name" :data-value="item.id" :data-index="index" @tap="send_accounts_list_event">{{ item.platform_name }}</view>
+                        </view>
+                    </view>
+                    <view class="tc padding-top-lg br-t" @tap="popup_send_accounts_close_event">
+                        <text class="padding-right-sm">{{ $t('nav-more.nav-more.h9g4b1') }}</text>
+                        <iconfont name="icon-arrow-top" color="#ccc"></iconfont>
+                    </view>
+                </view>
+            </component-popup>
+            <!-- 接收账户 -->
+            <component-popup :propShow="popup_receive_accounts_status" propPosition="top" :propTop="popup_top_height + 'px'" @onclose="popup_receive_accounts_close_event">
+                <view class="padding-vertical-lg">
+                    <view class="padding-horizontal-main text-size-xs">{{$t('convert-list.convert-list.47646p')}}</view>
+                    <view class="popup_accounts_container padding-sm flex-row flex-wrap align-c tc text-size-md">
+                        <view class="flex-width-half-half">
+                            <view class="item margin-sm padding-vertical-sm" :class="receive_accounts_list_index == null ? 'cr-main bg-main-light' : ''" :data-name="$t('common.all')" :data-value="null" :data-index="null" @tap="receive_accounts_list_event">{{$t('common.all')}}</view>
+                        </view>
+                        <view v-for="(item, index) in receive_accounts_list" class="flex-width-half-half" :key="index">
+                            <view class="item margin-sm padding-vertical-sm" :class="receive_accounts_list_index == index ? 'cr-main bg-main-light' : ''" :data-name="item.platform_name" :data-value="item.id" :data-index="index" @tap="receive_accounts_list_event">{{ item.platform_name }}</view>
+                        </view>
+                    </view>
+                    <view class="tc padding-top-lg br-t" @tap="popup_receive_accounts_close_event">
+                        <text class="padding-right-sm">{{ $t('nav-more.nav-more.h9g4b1') }}</text>
+                        <iconfont name="icon-arrow-top" color="#ccc"></iconfont>
+                    </view>
+                </view>
+            </component-popup>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentPopup from '@/components/popup/popup';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    var accounts_static_url = app.globalData.get_static_url('coin', true) + 'app/';
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                accounts_static_url: accounts_static_url,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                params: {},
+
+                // 弹窗距离顶部距离
+                popup_top_height: 0,
+
+                // 发起账户
+                popup_send_accounts_status: false,
+                send_accounts_id: null,
+                send_accounts_list_index: null,
+                send_accounts_name: null,
+                send_accounts_list: [],
+                // 接收账户
+                popup_receive_accounts_status: false,
+                receive_accounts_id: null,
+                receive_accounts_list_index: null,
+                receive_accounts_name: null,
+                receive_accounts_list: [],
+
+                data_list: [],
+                data_page_total: 0,
+                data_page: 1,
+                data_is_loading: 0,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentPopup,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+            // 设置参数
+            this.setData({
+                params: params,
+                send_accounts_id: params.id || null,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 初始数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+        methods: {
+            init(e) {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                    this.get_data_list();
+                    var self = this;
+                    var timer = setInterval(function () {
+                        if (self.popup_top_height == 0) {
+                            self.popup_top_height_computer();
+                        } else {
+                            clearInterval(timer);
+                        }
+                    }, 500);
+                }
+            },
+
+            // 初始化数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('init', 'user', 'coin'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                send_accounts_list: data.accounts_list || [],
+                                receive_accounts_list: data.accounts_list || [],
+                            });
+                            if (this.send_accounts_list.length > 0 && (this.send_accounts_id || null) != null) {
+                                var index = this.send_accounts_list.findIndex((item) => item.id == this.send_accounts_id);
+                                this.setData({
+                                    send_accounts_list_index: index,
+                                    send_accounts_id: this.send_accounts_list[index].id,
+                                    send_accounts_name: this.send_accounts_list[index].platform_name,
+                                });
+                            }
+                        } else {
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+                // 加载loding
+                if (this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+                var new_data = {
+                    send_accounts_id: this.send_accounts_id,
+                    receive_accounts_id: this.receive_accounts_id,
+                    page: this.data_page,
+                };
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'convert', 'coin'),
+                    method: 'POST',
+                    data: new_data,
+                    dataType: 'json',
+                    success: (res) => {
+                        if (this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            // 数据列表
+                            var data = res.data.data;
+                            if (this.data_page <= 1) {
+                                var temp_data_list = data.data_list || [];
+                            } else {
+                                var temp_data_list = this.data_list || [];
+                                var temp_data = data.data_list;
+                                for (var i in temp_data) {
+                                    temp_data_list.push(temp_data[i]);
+                                }
+                            }
+
+                            this.setData({
+                                data_list: temp_data_list,
+                                data_total: data.total,
+                                data_page_total: data.page_total,
+                                data_list_loding_status: temp_data_list.length > 0 ? 3 : 0,
+                                data_list_loding_msg: '',
+                                data_page: this.data_page + 1,
+                                data_is_loading: 0,
+                            });
+
+                            // 是否还有数据
+                            this.setData({
+                                data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                        }
+                    },
+                    fail: () => {
+                        if (this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+
+            // 账户打开
+            popup_send_accounts_open_event() {
+                this.setData({
+                    popup_send_accounts_status: !this.popup_send_accounts_status,
+                    popup_receive_accounts_status: false,
+                });
+            },
+
+            // 账户关闭
+            popup_send_accounts_close_event() {
+                this.setData({
+                    popup_send_accounts_status: false,
+                });
+            },
+
+            // 账户选择
+            send_accounts_list_event(e) {
+                this.setData({
+                    send_accounts_list_index: e.currentTarget.dataset.index,
+                    send_accounts_id: e.currentTarget.dataset.value,
+                    send_accounts_name: e.currentTarget.dataset.name,
+                    popup_send_accounts_status: false,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 账户打开
+            popup_receive_accounts_open_event() {
+                this.setData({
+                    popup_receive_accounts_status: !this.popup_receive_accounts_status,
+                    popup_send_accounts_status: false,
+                });
+            },
+
+            // 账户关闭
+            popup_receive_accounts_close_event() {
+                this.setData({
+                    popup_receive_accounts_status: false,
+                });
+            },
+
+            // 账户选择
+            receive_accounts_list_event(e) {
+                this.setData({
+                    receive_accounts_list_index: e.currentTarget.dataset.index,
+                    receive_accounts_id: e.currentTarget.dataset.value,
+                    receive_accounts_name: e.currentTarget.dataset.name,
+                    popup_receive_accounts_status: false,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 计算搜索框的高度
+            popup_top_height_computer() {
+                const query = uni.createSelectorQuery();
+                query
+                    .select('.nav')
+                    .boundingClientRect((res) => {
+                        if ((res || null) != null) {
+                            // 获取搜索框高度
+                            this.setData({
+                                popup_top_height: res.height,
+                            });
+                        }
+                    })
+                    .exec();
+            },
+
+            // 页面滚动监听
+            scroll_event(e) {
+                uni.$emit('onPageScroll', e.detail);
+            },
+        },
+    };
+</script>
+<style>
+    @import './convert-list.css';
+</style>
diff --git a/pages/plugins/coin/convert/convert.css b/pages/plugins/coin/convert/convert.css
new file mode 100644
index 0000000..9b105a3
--- /dev/null
+++ b/pages/plugins/coin/convert/convert.css
@@ -0,0 +1,77 @@
+.coin-dropdown {
+    --height: 72rpx;
+    height: var(--height);
+    line-height: var(--height);
+    padding: 0 52rpx 0 20rpx;
+    background: #F6F6F6;
+    border-radius: 36rpx;
+    width: 180rpx;
+}
+
+.coin-dropdown-icon {
+    right: 24rpx;
+    top: 2rpx;
+    padding: 0;
+}
+
+.coin-list-img {
+    --size: 40rpx;
+    width: var(--size);
+    height: var(--size) !important;
+}
+
+.coin-num {
+    --height: 72rpx;
+    display: inline-block;
+}
+
+.num.input-br {
+    border: 2rpx solid #F6F6F6;
+}
+
+.coin-num .num {
+    height: var(--height);
+    line-height: var(--height);
+    padding: 0 20rpx 0 20rpx;
+    border-radius: 36rpx;
+    width: 196rpx;
+}
+
+.coin-center-convert {
+    --size: 82rpx;
+    left: 50%;
+    transform: translateX(-50%);
+    margin-top: -54rpx;
+    width: var(--size);
+    height: var(--size);
+    border: 2rpx solid #e1e1e1;
+    border-radius: 50%;
+    background-color: #fff;
+}
+
+.convert-icon {
+    transition: all 0.5s ease-in-out;
+}
+
+.convert_true {
+    transform: rotate3d(1, 0, 0, 180deg);
+}
+
+.convert_false {
+    transform: rotate3d(1, 0, 0, 0deg);
+}
+
+.convert-btn {
+    background: linear-gradient(107deg, #31B4FC 0%, #0842E2 100%);
+    transition: all 0.3s ease-in-out;
+}
+
+.convert-btn:active {
+    background: linear-gradient(107deg, #168ACA 0%, #022A97 100%);
+}
+
+.coin-content-list-img {
+    --size: 36rpx;
+    width: var(--size);
+    height: var(--size) !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/coin/convert/convert.vue b/pages/plugins/coin/convert/convert.vue
new file mode 100644
index 0000000..dafd808
--- /dev/null
+++ b/pages/plugins/coin/convert/convert.vue
@@ -0,0 +1,342 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="accounts_list.length > 0">
+            <scroll-view :scroll-y="true" class="scroll-box" lower-threshold="60" @scroll="scroll_event">
+                <view class="padding-main pr">
+                    <view class="padding-lg bg-white radius-md margin-bottom-main">
+                        <view class="br-f5 margin-bottom-main radius-md padding-lg flex-row jc-sb">
+                            <view>
+                                <view class="flex-row align-c pr coin-dropdown" @tap="popup_coin_status_event(1)">
+                                    <image v-if="accounts_list[send_accounts_id_index]['platform_icon']" :src="accounts_list[send_accounts_id_index]['platform_icon']" mode="widthFix" class="coin-content-list-img round" />
+                                    <text class="margin-left-sm fw-b single-text">{{ accounts_list[send_accounts_id_index]['platform_name'] }}</text>
+                                    <view class="coin-dropdown-icon pa padding-left-xxl">
+                                        <iconfont name="icon-arrow-bottom" size="24rpx" color="#666"></iconfont>
+                                    </view>
+                                </view>
+                                <view class="margin-top-main text-size-xs flex-row align-c">
+                                    <text class="margin-right-sm">{{$t('convert.convert.o56h58')}}</text><text class="cr-blue">{{ accounts_list[send_accounts_id_index]['platform_symbol'] }} {{ accounts_list[send_accounts_id_index]['normal_coin'] }}</text>
+                                </view>
+                            </view>
+                            <view class="coin-num pr flex-col">
+                                <input type="digit" name="coin" :value="default_value" class="num input-br text-size" placeholder-class="text-size-sm cr-grey-9" :placeholder="$t('common.please_input')" @input="default_coin_change_event" />
+                                <view class="margin-top-main tr text-size-xs">{{ accounts_list[send_accounts_id_index]['platform_symbol'] }} {{ accounts_list[send_accounts_id_index]['default_coin'] }}</view>
+                            </view>
+                        </view>
+                        <view class="coin-center-convert pa flex-row jc-c align-c" @tap="coin_center_convert_event(2)">
+                            <iconfont name="icon-convert" class="pa convert-icon" :class="convert_bool ? 'convert_true' : 'convert_false'" color="#1D7DEF" size="36rpx"></iconfont>
+                        </view>
+                        <view class="br-f5 margin-bottom-main radius-md padding-lg flex-row jc-sb">
+                            <view>
+                                <view class="flex-row align-c pr coin-dropdown" @tap="popup_coin_status_event">
+                                    <image v-if="accounts_list[receive_accounts_id_index]['platform_icon']" :src="accounts_list[receive_accounts_id_index]['platform_icon']" mode="widthFix" class="coin-content-list-img round" />
+                                    <text class="margin-left-sm fw-b single-text">{{ accounts_list[receive_accounts_id_index]['platform_name'] }}</text>
+                                    <view class="coin-dropdown-icon pa padding-left-xxl">
+                                        <iconfont name="icon-arrow-bottom" size="24rpx" color="#666"></iconfont>
+                                    </view>
+                                </view>
+                                <view class="margin-top-main text-size-xs flex-row align-c">
+                                    <text class="margin-right-sm">{{$t('convert.convert.o56h58')}}</text><text class="cr-blue">{{ accounts_list[receive_accounts_id_index]['platform_symbol'] }} {{ accounts_list[receive_accounts_id_index]['normal_coin'] }}</text>
+                                </view>
+                            </view>
+                            <view class="coin-num pr flex-col">
+                                <input type="digit" :value="convert_value" class="num text-size" placeholder-class="text-size-sm cr-grey-9" disabled />
+                                <view class="margin-top-main tr text-size-xs">{{ accounts_list[receive_accounts_id_index]['platform_symbol'] }} {{ accounts_list[receive_accounts_id_index]['default_coin'] }}</view>
+                            </view>
+                        </view>
+                        <view class="flex-row align-c">
+                            <iconfont name="icon-recharge" color="#333" size="32rpx"></iconfont>
+                            <view class="margin-left-sm">{{ default_value || 0 }} * {{ accounts_list[send_accounts_id_index]['platform_rate'] }} = {{ Math.round(default_value * accounts_list[receive_accounts_id_index]['platform_rate'] * 100) / 100 }}</view>
+                        </view>
+                    </view>
+                    <!-- <view class="padding-main bg-white radius-md margin-bottom-xxxxl flex-row align-c">
+                        <text class="padding-right">支付密码</text>
+                        <input type="password" :value="pay_pwd" class="text-size flex-1 flex-width" placeholder-class="text-size-md cr-grey-9" placeholder="请输入支付密码" />
+                    </view> -->
+                    <view class="padding-main radius-md margin-bottom-main">
+                        <button type="default" class="convert-btn cr-white round" @tap="convert_submit">{{$t('convert.convert.4kcix6')}}</button>
+                    </view>
+                </view>
+            </scroll-view>
+            <!-- 虚拟币下拉框 -->
+            <component-popup :propShow="popup_coin_status" propPosition="bottom" @onclose="popup_coin_status_close_event">
+                <view class="padding-horizontal-main padding-top-main bg-white">
+                    <view class="oh">
+                        <view class="fr" @tap.stop="popup_coin_status_close_event">
+                            <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                        </view>
+                    </view>
+                    <view class="popup_coin_status_container padding-vertical-main flex-col text-size">
+                        <view class="scroll-y">
+                            <view v-for="(item, index) in accounts_list" :key="index" class="flex-row jc-sb align-c padding-vertical-main" :class="accounts_list.length == index + 1 ? '' : 'br-b-f9'" :data-value="item.id" :data-index="index" @tap="coin_checked_event">
+                                <view class="flex-row align-c">
+                                    <image v-if="item.platform_icon" :src="item.platform_icon" mode="widthFix" class="coin-list-img round" />
+                                    <view class="margin-left-sm text-size-md single-text">{{ item.platform_name }}</view>
+                                </view>
+                                <view>
+                                    <iconfont :name="coin_index == index ? 'icon-zhifu-yixuan cr-red' : 'icon-zhifu-weixuan'" size="40rpx"></iconfont>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </component-popup>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentPopup from '@/components/popup/popup';
+    var wallet_static_url = app.globalData.get_static_url('coin', true) + 'app/';
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                wallet_static_url: wallet_static_url,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+
+                // 虚拟币状态
+                coin_type: 1,
+                coin_index: 0,
+                // 下标
+                send_accounts_id_index: 0,
+                receive_accounts_id_index: 0,
+                // id
+                send_accounts_id: 0,
+                receive_accounts_id: 0,
+                popup_coin_status: false,
+                accounts_list: [],
+                // 是否转换
+                convert_bool: false,
+                // 输入默认币
+                default_value: '',
+                // 转换币
+                convert_value: '0.00',
+                // 支付密码
+                pay_pwd: '',
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentPopup,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+        methods: {
+            init(e) {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('createinfo', 'convert', 'coin'),
+                    method: 'POST',
+                    data: { send_accounts_id: this.send_accounts_id, receive_accounts_id: this.receive_accounts_id },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var send_accounts = data.send_accounts || null;
+                            var receive_accounts = data.receive_accounts || null;
+                            this.setData({
+                                data_base: data.base || null,
+                                accounts_list: data.accounts_list || [],
+                                convert_value: data.convert_value || '0',
+                                send_accounts_id: (send_accounts == null) ? 0 : send_accounts.id,
+                                receive_accounts_id: (receive_accounts == null) ? 0 : receive_accounts.id,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 3,
+                            });
+                            if (data.accounts_list.length > 0) {
+                                this.setData({
+                                    send_accounts_id_index: data.accounts_list.findIndex((item) => item.id == data.send_accounts.id),
+                                    receive_accounts_id_index: data.accounts_list.findIndex((item) => item.id == data.receive_accounts.id),
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            app.globalData.is_login_check(res.data, this, 'get_data');
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 虚拟币切换
+            popup_coin_status_event(type) {
+                this.setData({
+                    coin_type: type,
+                    receive_accounts_idsend_accounts_id_index: this.receive_accounts_id_index,
+                    popup_coin_status: true,
+                });
+            },
+            // 切换账户
+            coin_checked_event(e) {
+                var index = parseInt(e.currentTarget.dataset.index || 0);
+                var old_index = (this.coin_type == 1) ? this.receive_accounts_id_index : this.send_accounts_id_index;
+                if(index == old_index) {
+                    app.globalData.showToast(this.$t('convert.convert.327y2v'));
+                    return false;
+                }
+                if (this.coin_type == 1) {
+                    this.setData({
+                        send_accounts_id_index: index,
+                        send_accounts_id: e.currentTarget.dataset.value,
+                    });
+                } else {
+                    this.setData({
+                        receive_accounts_id_index: index,
+                        receive_accounts_id: e.currentTarget.dataset.value,
+                    });
+                }
+                this.setData({
+                    coin_index: index,
+                    popup_coin_status: false,
+                });
+            },
+            // 关闭账户选择弹窗
+            popup_coin_status_close_event() {
+                this.setData({
+                    popup_coin_status: false,
+                });
+            },
+
+            // 虚拟货币调换
+            coin_center_convert_event() {
+                var send_index = this.send_accounts_id_index;
+                var receive_index = this.receive_accounts_id_index;
+                var send_id = this.send_accounts_id;
+                var receive_id = this.receive_accounts_id;
+                this.setData({
+                    receive_accounts_id_index: send_index,
+                    send_accounts_id_index: receive_index,
+                    receive_accounts_id: send_id,
+                    send_accounts_id: receive_id,
+                    convert_bool: !this.convert_bool,
+                });
+            },
+            // 需要转换的值事件
+            default_coin_change_event(e) {
+                this.setData({
+                    default_value: e.detail.value,
+                    convert_value: Math.round(e.detail.value * this.accounts_list[this.receive_accounts_id_index]['platform_rate'] * 100) / 100,
+                });
+            },
+
+            // 立即转换
+            convert_submit() {
+                var new_data = {
+                    send_accounts_id: this.send_accounts_id,
+                    receive_accounts_id: this.receive_accounts_id,
+                    coin: this.default_value,
+                };
+
+                // 数据校验
+                var validation = [{ fields: 'coin', msg: this.$t('convert.convert.vyjy7s') }];
+
+                // 验证提交表单
+                if (app.globalData.fields_check(new_data, validation)) {
+                    // 远程请求
+                    this.setData({
+                        form_submit_loading: true,
+                    });
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('create', 'convert', 'coin'),
+                        method: 'POST',
+                        data: new_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                                setTimeout(function () {
+                                    app.globalData.url_open('/pages/plugins/coin/convert-list/convert-list', true);
+                                }, 1000);
+                            } else {
+                                this.setData({
+                                    form_submit_loading: false,
+                                });
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            this.setData({
+                                form_submit_loading: false,
+                            });
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 页面滚动监听
+            scroll_event(e) {
+                uni.$emit('onPageScroll', e.detail);
+            },
+        },
+    };
+</script>
+<style>
+    @import './convert.css';
+</style>
diff --git a/pages/plugins/coin/detail/detail.css b/pages/plugins/coin/detail/detail.css
new file mode 100644
index 0000000..2ad8926
--- /dev/null
+++ b/pages/plugins/coin/detail/detail.css
@@ -0,0 +1,56 @@
+/* 
+ * 顶部
+*/
+.coin-title {
+    background: radial-gradient(60% 70% at 90% 79%, rgba(33, 125, 239, 0.41) 0%, rgba(222, 237, 255, 0.56) 100%);
+    padding-top: 130rpx;
+    /* #ifndef H5  */
+    padding-top: calc(var(--status-bar-height) + 5px + 130rpx);
+    /* #endif */
+    border-bottom-left-radius: 60rpx;
+    border-bottom-right-radius: 60rpx;
+}
+
+.coin-oprate-list {
+    --size: 76rpx;
+    height: var(--size);
+    border-radius: 32rpx;
+}
+
+/* 
+ * 内容
+*/
+.coin-content .coin-item {
+    max-height: calc(100vh - 688rpx);
+    /* #ifndef H5  */
+    max-height: calc(100vh - 688rpx - var(--status-bar-height) - 5px);
+    /* #endif */
+    overflow-y: auto;
+}
+
+.coin-content-list-img {
+    --size: 80rpx;
+    width: var(--size);
+    height: var(--size) !important;
+}
+
+/* 
+ * 虚拟币弹窗
+*/
+.popup_coin_status_container .scroll-y {
+    height: 40vh;
+    overflow-y: auto;
+}
+
+.coin-list-img {
+    --size: 40rpx;
+    width: var(--size);
+    height: var(--size) !important;
+}
+
+/* 
+ * 明细弹窗
+*/
+.popup_user_detail_container .item {
+    background: #EFF0F1;
+}
\ No newline at end of file
diff --git a/pages/plugins/coin/detail/detail.vue b/pages/plugins/coin/detail/detail.vue
new file mode 100644
index 0000000..eb1c5d3
--- /dev/null
+++ b/pages/plugins/coin/detail/detail.vue
@@ -0,0 +1,348 @@
+<template>
+    <view :class="theme_view">
+        <component-nav-back :propName="$t('detail.detail.yvmu0z')"></component-nav-back>
+        <view v-if="accounts_list.length > 0">
+            <scroll-view :scroll-y="true" class="scroll-box" lower-threshold="60" @scroll="scroll_event">
+                <view class="coin-title flex-col padding-lg">
+                    <view v-if="accounts_list.length > 0 && (accounts || null) != null" class="margin-bottom-xxxxl padding-bottom-main flex-row jc-sb align-c">
+                        <view class="flex-row">
+                            <image v-if="(accounts.platform_icon || null) != null" :src="accounts.platform_icon" mode="widthFix" class="coin-content-list-img round" />
+                            <view class="padding-left-main">
+                                <view class="coin-dropdown text-size-md pr margin-bottom-xs flex-row" @tap="popup_coin_status_open_event">
+                                    <text class="cr-666">{{ accounts.platform_name }}</text>
+                                    <view class="padding-left-sm">
+                                        <iconfont name="icon-arrow-bottom" size="24rpx" color="#666"></iconfont>
+                                    </view>
+                                </view>
+                                <view>
+                                    <text class="fw-b text-size">{{ is_price_show ? accounts.normal_coin : '***' }}</text>
+                                    <text v-if="is_price_show" class="cr-grey-9 text-size-xs margin-left">{{ accounts.default_symbol }} {{ accounts.default_coin }}</text>
+                                </view>
+                            </view>
+                        </view>
+                        <view @tap="price_change">
+                            <iconfont :name="is_price_show ? 'icon-wodeqianbao-eye' : 'icon-eye-half'" size="44rpx"></iconfont>
+                        </view>
+                    </view>
+                    <view class="flex-row jc-sb">
+                        <view v-for="(item, index) in coin_oprate_list" class="flex-1 padding-sm tc text-size-md" :key="index" :data-value="item.url" :data-method="item.method" @tap="url_event">
+                            <view class="coin-oprate-list bg-white flex-row align-c jc-c">
+                                <view class="pr top-xs">
+                                    <iconfont :name="item.icon" size="28rpx" color="#635BFF"></iconfont>
+                                </view>
+                                <view class="margin-left-sm fw-b">{{ item.name }}</view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <view class="coin-content padding-lg pr">
+                    <block v-if="log_list.length > 0" >
+                        <view v-for="(item, index) in log_list" :key="index" class="bg-white radius-md padding-main margin-bottom-main">
+                            <view class="br-b-dashed padding-bottom-main margin-bottom-main flex-row jc-sb align-c">
+                                <view>{{ item.coin_type_name }}</view>
+                                <view class="cr-grey-9">{{ item.add_time }}</view>
+                            </view>
+                            <view>
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9">{{$t('detail.detail.4w20tq')}}</text>
+                                    <text class="fw-b warp">{{ item.operate_type_name }}</text>
+                                </view>
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9">{{$t('detail.detail.s101d1')}}</text>
+                                    <text class="fw-b warp">{{ item.operate_coin }}</text>
+                                </view>
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9">{{$t('detail.detail.e30wj1')}}</text>
+                                    <text class="fw-b warp">{{ item.original_coin }}</text>
+                                </view>
+                                <view class="flex-row">
+                                    <text class="cr-grey-9">{{$t('detail.detail.jdour8')}}</text>
+                                    <text class="fw-b warp">{{ item.latest_coin }}</text>
+                                </view>
+                            </view>
+                        </view>
+                        <view class="tc cr-grey cp" :data-value="'/pages/plugins/coin/transaction-list/transaction-list?id=' + accounts.id" @tap="url_event">
+                            <text class="va-m">{{$t('detail.detail.7fhy2u')}}</text>
+                            <view class="dis-inline-block va-m margin-top-xs margin-left-xs">
+                                <iconfont name="icon-arrow-right" color="#999"></iconfont>
+                            </view>
+                        </view>
+                    </block>
+                    <block v-else>
+                        <!-- 提示信息 -->
+                        <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+                    </block>
+                </view>
+            </scroll-view>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+        <!-- 虚拟币下拉框 -->
+        <component-popup :propShow="popup_coin_status" propPosition="bottom" @onclose="popup_coin_status_close_event">
+            <view class="padding-horizontal-main padding-top-main bg-white">
+                <view class="oh">
+                    <view class="fr" @tap.stop="popup_coin_status_close_event">
+                        <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                    </view>
+                </view>
+                <view class="popup_coin_status_container padding-vertical-main flex-col text-size">
+                    <view class="scroll-y">
+                        <view v-for="(item, index) in accounts_list" :key="index">
+                            <view class="flex-row jc-sb align-c padding-vertical-main" :class="accounts_list.length == index + 1 ? '' : 'br-b-f9'" :data-value="item" :data-index="index" @tap="coin_checked_event">
+                                <view class="flex-row align-c">
+                                    <image v-if="item.platform_icon" :src="item.platform_icon" mode="widthFix" class="coin-list-img round" />
+                                    <view class="margin-left-sm text-size-md single-text">{{ item.platform_name }}</view>
+                                </view>
+                                <view>
+                                    <iconfont :name="accounts.id == item.id ? 'icon-zhifu-yixuan cr-red' : 'icon-zhifu-weixuan'" size="40rpx"></iconfont>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </component-popup>
+        <!-- 明细 -->
+        <component-popup :propShow="popup_user_detail_status" propPosition="bottom" @onclose="popup_user_detail_close_event">
+            <view class="padding-horizontal-main padding-top-main bg-white">
+                <view class="oh">
+                    <text class="text-size">{{$t('pages.plugins-coin-detail')}}</text>
+                    <view class="fr" @tap.stop="popup_user_detail_close_event">
+                        <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                    </view>
+                </view>
+                <view v-if="accounts_list.length > 0 && (accounts || null) != null" class="popup_user_detail_container padding-vertical-main flex-row flex-wrap align-c tc text-size">
+                    <view class="flex-width-half">
+                        <view class="item padding-vertical-lg radius margin-sm" :data-value="'/pages/plugins/coin/recharge-list/recharge-list?id=' + accounts.id" @tap="url_event">{{$t('pages.plugins-coin-recharge-list')}}</view>
+                    </view>
+                    <view class="flex-width-half">
+                        <view class="item padding-vertical-lg radius margin-sm" :data-value="'/pages/plugins/coin/transfer-list/transfer-list?id=' + accounts.id" @tap="url_event">{{$t('pages.plugins-coin-transfer-list')}}</view>
+                    </view>
+                    <view class="flex-width-half">
+                        <view class="item padding-vertical-lg radius margin-sm" :data-value="'/pages/plugins/coin/transaction-list/transaction-list?id=' + accounts.id" @tap="url_event">{{$t('pages.plugins-coin-transaction-list')}}</view>
+                    </view>
+                    <view class="flex-width-half">
+                        <view class="item padding-vertical-lg radius margin-sm" :data-value="'/pages/plugins/coin/cash-list/cash-list?id=' + accounts.id" @tap="url_event">{{$t('pages.plugins-coin-cash-list')}}</view>
+                    </view>
+                    <view class="flex-width-half">
+                        <view class="item padding-vertical-lg radius margin-sm" :data-value="'/pages/plugins/coin/convert-list/convert-list?id=' + accounts.id" @tap="url_event">{{$t('pages.plugins-coin-convert-list')}}</view>
+                    </view>
+                </view>
+            </view>
+        </component-popup>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNavBack from '@/components/nav-back/nav-back';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentPopup from '@/components/popup/popup';
+    var wallet_static_url = app.globalData.get_static_url('coin', true) + 'app/';
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                wallet_static_url: wallet_static_url,
+                status_bar_height: bar_height,
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+
+                // 虚拟币下拉框探弹窗状态
+                popup_coin_status: false,
+                // 虚拟币下拉框list
+                accounts_list: [],
+                // 账户
+                accounts: {},
+
+                // 是否显示虚拟币
+                is_price_show: false,
+                // 虚拟币操作列表
+                coin_oprate_list: [],
+
+                // 明细弹窗
+                popup_user_detail_status: false,
+
+                // 日志列表
+                log_list: [],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNavBack,
+            componentNoData,
+            componentPopup,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+        methods: {
+            init(e) {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('detail', 'accounts', 'coin'),
+                    method: 'POST',
+                    data: {id: this.accounts.id || this.params.id || null},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_base: data.base || null,
+                                accounts: data.accounts || {},
+                                accounts_list: data.accounts_list || [],
+                                log_list: data.log_list || [],
+                                accounts_summary: data.accounts_summary || 0,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                            });
+
+                            // 操作导航
+                            var temp_coin_oprate_list = [];
+                            if(parseInt(this.accounts.platform_data.is_enable_transfer || 0) == 1) {
+                                temp_coin_oprate_list.push({
+                                    name: this.$t('user.user.29f6n5'),
+                                    icon: 'icon-transfer-count',
+                                    url: '/pages/plugins/coin/transfer/transfer?id=' + this.accounts.id,
+                                });
+                            }
+                            temp_coin_oprate_list.push({
+                                name: this.$t('index.index.6941e7'),
+                                icon: 'icon-collection',
+                                url: '/pages/plugins/coin/collection/collection?accounts_key=' + this.accounts.accounts_key,
+                            });
+                            temp_coin_oprate_list.push({
+                                name: this.$t('pages.plugins-coin-detail'),
+                                icon: 'icon-detail',
+                                url: '',
+                                method: true,
+                            });
+                            this.setData({
+                                coin_oprate_list: temp_coin_oprate_list
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 显示隐藏虚拟币
+            price_change() {
+                this.setData({
+                    is_price_show: !this.is_price_show,
+                });
+            },
+
+            // 页面滚动监听
+            scroll_event(e) {
+                uni.$emit('onPageScroll', e.detail);
+            },
+
+            // 虚拟币切换
+            coin_checked_event(e) {
+                this.setData({
+                    accounts: this.accounts_list[e.currentTarget.dataset.index],
+                    popup_coin_status: false,
+                    log_list: [],
+                    data_list_loding_status: 1,
+                });
+                this.get_data();
+            },
+            popup_coin_status_open_event() {
+                this.setData({
+                    popup_coin_status: !this.popup_coin_status,
+                });
+            },
+            popup_coin_status_close_event() {
+                this.setData({
+                    popup_coin_status: false,
+                });
+            },
+
+            // 明细弹窗打开
+            popup_user_detail_open_event() {
+                this.setData({
+                    popup_user_detail_status: true,
+                });
+            },
+            // 明细弹窗关闭
+            popup_user_detail_close_event(e) {
+                this.setData({
+                    popup_user_detail_status: false,
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                if (e.currentTarget.dataset.method) {
+                    this.popup_user_detail_open_event();
+                } else {
+                    app.globalData.url_event(e);
+                }
+            },
+        },
+    };
+</script>
+<style>
+    @import './detail.css';
+</style>
diff --git a/pages/plugins/coin/recharge-list/recharge-list.css b/pages/plugins/coin/recharge-list/recharge-list.css
new file mode 100644
index 0000000..87aa760
--- /dev/null
+++ b/pages/plugins/coin/recharge-list/recharge-list.css
@@ -0,0 +1,42 @@
+.convert .nav {
+    z-index: 102;
+}
+
+.scroll-box {
+    height: calc(100vh - 88rpx);
+}
+
+.recharge-apy-btn,
+.recharge-del-btn {
+    padding: 0 60rpx;
+    font-size: 28rpx;
+    margin: 0 0 0 20rpx;
+}
+
+.recharge-apy-btn:active,
+.recharge-del-btn:active {
+    opacity: 0.7;
+}
+
+.recharge-del-btn {
+    color: #0079ff !important;
+    background-color: #fff;
+    border: 2rpx solid #0079ff;
+}
+
+.recharge-apy-btn {
+    background: linear-gradient(107deg, #31B4FC 0%, #0842E2 100%), #0079FF;
+    color: #fff !important;
+}
+
+.convert-group-row .title {
+    min-width: 140rpx;
+}
+
+/* 
+ * 钱包弹窗
+*/
+.popup_accounts_container .item {
+    background-color: #f4f4f4;
+    border-radius: 30rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/coin/recharge-list/recharge-list.vue b/pages/plugins/coin/recharge-list/recharge-list.vue
new file mode 100644
index 0000000..141317e
--- /dev/null
+++ b/pages/plugins/coin/recharge-list/recharge-list.vue
@@ -0,0 +1,523 @@
+<template>
+    <view :class="theme_view">
+        <view class="convert">
+            <view class="padding-main bg-white pr nav flex-row oa">
+                <view class="flex-shrink flex-row align-c margin-right-xxxl padding-right-xl pr" @tap="popup_accounts_open_event">
+                    <view>{{ accounts_name !== null && accounts_name !== $t('common.all') ? accounts_name : $t('cash-list.cash-list.n74r94') }}</view>
+                    <view class="pa right-0"><iconfont :name="popup_accounts_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
+                </view>
+                <view class="flex-shrink flex-row align-c margin-right-xxxl padding-right-xl pr" @tap="popup_recharge_status_open_event">
+                    <view>{{ recharge_status_name !== null && recharge_status_name !== $t('common.all') ? recharge_status_name : $t('invoice-detail.invoice-detail.rrfex6') }}</view>
+                    <view class="pa right-0"><iconfont :name="popup_recharge_status_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
+                </view>
+                <view class="flex-shrink flex-row align-c padding-right-xl pr" @tap="popup_network_open_event">
+                    <view>{{ network_name !== null && network_name !== $t('common.all') ? network_name : $t('cash-list.cash-list.2g251t') }}</view>
+                    <view class="pa right-0"><iconfont :name="popup_network_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
+                </view>
+            </view>
+            <scroll-view :scroll-y="true" class="scroll-box" lower-threshold="60" @scroll="scroll_event">
+                <view class="padding-main">
+                    <view v-if="data_list.length > 0">
+                        <view v-for="(item, index) in data_list" :key="index" class="padding-main bg-white radius-md margin-bottom-main">
+                            <view class="br-b-dashed padding-bottom-main margin-bottom-main flex-row jc-sb align-c">
+                                <view>{{ item.status_name }}</view>
+                                <view class="cr-grey-9">{{ item.add_time }}</view>
+                            </view>
+                            <view class="convert-group-row">
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title">{{$t('recharge-list.recharge-list.6b9399')}}</text>
+                                    <text class="fw-b warp">{{ item.recharge_no }}</text>
+                                </view>
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title">{{$t('cash-list.cash-list.2w20g2')}}</text>
+                                    <text class="fw-b warp">{{ item.platform_name }}</text>
+                                </view>
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title">{{$t('cash-list.cash-list.23ii8s')}}</text>
+                                    <text class="fw-b warp">{{ item.network_name }}</text>
+                                </view>
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title">{{$t('cash-list.cash-list.714g2h')}}</text>
+                                    <text class="fw-b warp">{{ item.address }}</text>
+                                </view>
+                                <view class="flex-row">
+                                    <text class="cr-grey-9 title">{{$t('recharge-list.recharge-list.epd531')}}</text>
+                                    <text class="fw-b warp">{{ item.coin }}</text>
+                                </view>
+                            </view>
+                            <div v-if="item.status == 0" class="br-t-dashed padding-top-main margin-top-main flex-row jc-e align-c">
+                                <button type="default" class="recharge-del-btn round" :data-id="item.id" @tap="recharge_del_event">{{$t('common.del')}}</button>
+                                <button type="default" class="recharge-apy-btn round" :data-id="item.id" @tap="recharge_pay_event">{{$t('order.order.1i873j')}}</button>
+                            </div>
+                        </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>
+            </scroll-view>
+            <!-- 账户 -->
+            <component-popup :propShow="popup_accounts_status" propPosition="top" :propTop="popup_top_height + 'px'" @onclose="popup_accounts_close_event">
+                <view class="padding-vertical-lg">
+                    <view class="padding-horizontal-main text-size-xs">{{$t('cash-list.cash-list.s7l616')}}</view>
+                    <view class="popup_accounts_container padding-sm flex-row flex-wrap align-c tc text-size-md">
+                        <view class="flex-width-half-half">
+                            <view class="item margin-sm padding-vertical-sm" :class="accounts_list_index == null ? 'cr-main bg-main-light' : ''" :data-name="$t('common.all')" :data-value="null" :data-index="null" @tap="accounts_list_event">{{$t('common.all')}}</view>
+                        </view>
+                        <view v-for="(item, index) in accounts_list" class="flex-width-half-half" :key="index">
+                            <view class="item margin-sm padding-vertical-sm" :class="accounts_list_index == index ? 'cr-main bg-main-light' : ''" :data-name="item.platform_name" :data-value="item.id" :data-index="index" @tap="accounts_list_event">{{ item.platform_name }}</view>
+                        </view>
+                    </view>
+                    <view class="tc padding-top-lg br-t" @tap="popup_accounts_close_event">
+                        <text class="padding-right-sm">{{ $t('nav-more.nav-more.h9g4b1') }}</text>
+                        <iconfont name="icon-arrow-top" color="#ccc"></iconfont>
+                    </view>
+                </view>
+            </component-popup>
+            <!-- 类型 -->
+            <component-popup :propShow="popup_recharge_status_status" propPosition="top" :propTop="popup_top_height + 'px'" @onclose="popup_recharge_status_close_event">
+                <view class="padding-vertical-lg">
+                    <view class="padding-horizontal-main text-size-xs">{{$t('cash-list.cash-list.t66tu3')}}</view>
+                    <view class="popup_accounts_container padding-sm flex-row flex-wrap align-c tc text-size-md">
+                        <view class="flex-width-half-half">
+                            <view class="item margin-sm padding-vertical-sm" :class="recharge_status_list_index == null ? 'cr-main bg-main-light' : ''" :data-name="$t('common.all')" :data-value="null" :data-index="null" @tap="recharge_status_list_event">{{$t('common.all')}}</view>
+                        </view>
+                        <view v-for="(item, index) in recharge_status_list" class="flex-width-half-half" :key="index">
+                            <view class="item margin-sm padding-vertical-sm" :class="recharge_status_list_index == index ? 'cr-main bg-main-light' : ''" :data-name="item.name" :data-value="item.value" :data-index="index" @tap="recharge_status_list_event">{{ item.name }}</view>
+                        </view>
+                    </view>
+                    <view class="tc padding-top-lg br-t" @tap="popup_recharge_status_close_event">
+                        <text class="padding-right-sm">{{ $t('nav-more.nav-more.h9g4b1') }}</text>
+                        <iconfont name="icon-arrow-top" color="#ccc"></iconfont>
+                    </view>
+                </view>
+            </component-popup>
+            <!-- 网络 -->
+            <component-popup :propShow="popup_network_status" propPosition="top" :propTop="popup_top_height + 'px'" @onclose="popup_network_close_event">
+                <view class="padding-vertical-lg">
+                    <view class="padding-horizontal-main text-size-xs">{{$t('cash-list.cash-list.311tt2')}}</view>
+                    <view class="popup_accounts_container padding-sm flex-row flex-wrap align-c tc text-size-md">
+                        <view class="flex-width-half-half">
+                            <view class="item margin-sm padding-vertical-sm" :class="network_list_index == null ? 'cr-main bg-main-light' : ''" :data-name="$t('common.all')" :data-value="null" :data-index="null" @tap="network_list_event">{{$t('common.all')}}</view>
+                        </view>
+                        <view v-for="(item, index) in network_list" class="flex-width-half-half" :key="index">
+                            <view class="item margin-sm padding-vertical-sm" :class="network_list_index == index ? 'cr-main bg-main-light' : ''" :data-name="item.name" :data-value="item.id" :data-index="index" @tap="network_list_event">{{ item.name }}</view>
+                        </view>
+                    </view>
+                    <view class="tc padding-top-lg br-t" @tap="popup_network_close_event">
+                        <text class="padding-right-sm">{{ $t('nav-more.nav-more.h9g4b1') }}</text>
+                        <iconfont name="icon-arrow-top" color="#ccc"></iconfont>
+                    </view>
+                </view>
+            </component-popup>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentPopup from '@/components/popup/popup';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    var accounts_static_url = app.globalData.get_static_url('coin', true) + 'app/';
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                accounts_static_url: accounts_static_url,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                params: {},
+
+                // 弹窗距离顶部距离
+                popup_top_height: 0,
+
+                // 账户
+                popup_accounts_status: false,
+                accounts_id: null,
+                accounts_list_index: null,
+                accounts_name: null,
+                accounts_list: [],
+                // 类型
+                popup_recharge_status_status: false,
+                status: null,
+                recharge_status_list_index: null,
+                recharge_status_name: null,
+                recharge_status_list: [],
+                // 网络
+                popup_network_status: false,
+                network_id: null,
+                network_list_index: null,
+                network_name: null,
+                network_list: [],
+
+                data_list: [],
+                data_page_total: 0,
+                data_page: 1,
+                data_is_loading: 0,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentPopup,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+            // 设置参数
+            this.setData({
+                params: params,
+                accounts_id: params.id || null,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 初始数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+        methods: {
+            init(e) {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                    this.get_data_list();
+                    var self = this;
+                    var timer = setInterval(function () {
+                        if (self.popup_top_height == 0) {
+                            self.popup_top_height_computer();
+                        } else {
+                            clearInterval(timer);
+                        }
+                    }, 500);
+                }
+            },
+
+            // 初始化数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('init', 'user', 'coin'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                accounts_list: data.accounts_list || [],
+                                recharge_status_list: data.recharge_status_list || [],
+                                network_list: data.network_list || [],
+                            });
+                            if (this.accounts_list.length > 0 && (this.accounts_id || null) != null) {
+                                var index = this.accounts_list.findIndex((item) => item.id == this.accounts_id);
+                                this.setData({
+                                    accounts_list_index: index,
+                                    accounts_id: this.accounts_list[index].id,
+                                    accounts_name: this.accounts_list[index].platform_name,
+                                });
+                            }
+                        } else {
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+                // 加载loding
+                if (this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+                var new_data = {
+                    accounts_id: this.accounts_id,
+                    network_id: this.network_id,
+                    status: this.status,
+                    page: this.data_page,
+                };
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'recharge', 'coin'),
+                    method: 'POST',
+                    data: new_data,
+                    dataType: 'json',
+                    success: (res) => {
+                        if (this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            // 数据列表
+                            var data = res.data.data;
+                            if (this.data_page <= 1) {
+                                var temp_data_list = data.data_list || [];
+                            } else {
+                                var temp_data_list = this.data_list || [];
+                                var temp_data = data.data_list;
+                                for (var i in temp_data) {
+                                    temp_data_list.push(temp_data[i]);
+                                }
+                            }
+
+                            this.setData({
+                                data_list: temp_data_list,
+                                data_total: data.total,
+                                data_page_total: data.page_total,
+                                data_list_loding_status: temp_data_list.length > 0 ? 3 : 0,
+                                data_list_loding_msg: '',
+                                data_page: this.data_page + 1,
+                                data_is_loading: 0,
+                            });
+
+                            // 是否还有数据
+                            this.setData({
+                                data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                        }
+                    },
+                    fail: () => {
+                        if (this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+
+            // 账户打开
+            popup_accounts_open_event() {
+                this.setData({
+                    popup_accounts_status: !this.popup_accounts_status,
+                    popup_recharge_status_status: false,
+                    popup_network_status: false,
+                });
+            },
+
+            // 账户关闭
+            popup_accounts_close_event() {
+                this.setData({
+                    popup_accounts_status: false,
+                });
+            },
+
+            // 账户选择
+            accounts_list_event(e) {
+                this.setData({
+                    accounts_list_index: e.currentTarget.dataset.index,
+                    accounts_id: e.currentTarget.dataset.value,
+                    accounts_name: e.currentTarget.dataset.name,
+                    popup_accounts_status: false,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 类型打开
+            popup_recharge_status_open_event() {
+                this.setData({
+                    popup_recharge_status_status: !this.popup_recharge_status_status,
+                    popup_accounts_status: false,
+                    popup_network_status: false,
+                });
+            },
+
+            // 类型关闭
+            popup_recharge_status_close_event() {
+                this.setData({
+                    popup_recharge_status_status: false,
+                });
+            },
+
+            // 类型选择
+            recharge_status_list_event(e) {
+                this.setData({
+                    recharge_status_list_index: e.currentTarget.dataset.index,
+                    status: e.currentTarget.dataset.value,
+                    recharge_status_name: e.currentTarget.dataset.name,
+                    popup_recharge_status_status: false,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 网络打开
+            popup_network_open_event() {
+                this.setData({
+                    popup_network_status: !this.popup_network_status,
+                    popup_accounts_status: false,
+                    popup_recharge_status_status: false,
+                });
+            },
+
+            // 网络关闭
+            popup_network_close_event() {
+                this.setData({
+                    popup_network_status: false,
+                });
+            },
+
+            // 网络选择
+            network_list_event(e) {
+                this.setData({
+                    network_list_index: e.currentTarget.dataset.index,
+                    network_id: e.currentTarget.dataset.value,
+                    network_name: e.currentTarget.dataset.name,
+                    popup_network_status: false,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 删除
+            recharge_del_event(e) {
+                // 是否再次确认
+                if (e.alert_status != 0 && e.alert_status != 1) {
+                    app.globalData.alert({
+                        msg: this.$t('recharge-list.recharge-list.l5g8m1'),
+                        is_show_cancel: 1,
+                        object: this,
+                        params: { id: e.currentTarget.dataset.id },
+                        method: 'recharge_del_event',
+                    });
+                    return false;
+                }
+                if (e.alert_status == 1) {
+                    // 加载loding
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('delete', 'recharge', 'coin'),
+                        method: 'POST',
+                        data: { ids: e.id },
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                this.setData({
+                                    data_page: 1,
+                                });
+                                app.globalData.showToast(this.$t('common.del_success'), 'success');
+                                this.get_data_list(1);
+                            } else {
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(this.$t('common.del_fail'));
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+            // 支付
+            recharge_pay_event(e) {
+                app.globalData.url_open('/pages/plugins/coin/recharge-pay/recharge-pay?id=' + e.currentTarget.dataset.id);
+            },
+
+            // 计算搜索框的高度
+            popup_top_height_computer() {
+                const query = uni.createSelectorQuery();
+                query
+                    .select('.nav')
+                    .boundingClientRect((res) => {
+                        if ((res || null) != null) {
+                            // 获取搜索框高度
+                            this.setData({
+                                popup_top_height: res.height,
+                            });
+                        }
+                    })
+                    .exec();
+            },
+
+            // 页面滚动监听
+            scroll_event(e) {
+                uni.$emit('onPageScroll', e.detail);
+            },
+        },
+    };
+</script>
+<style>
+    @import './recharge-list.css';
+</style>
diff --git a/pages/plugins/coin/recharge-pay/recharge-pay.css b/pages/plugins/coin/recharge-pay/recharge-pay.css
new file mode 100644
index 0000000..379fc04
--- /dev/null
+++ b/pages/plugins/coin/recharge-pay/recharge-pay.css
@@ -0,0 +1,105 @@
+.coin-dropdown {
+    --height: 72rpx;
+    height: var(--height);
+    line-height: var(--height);
+    padding: 0 52rpx 0 20rpx;
+    background: #F6F6F6;
+    border-radius: 36rpx;
+    width: 168rpx;
+}
+
+.coin-dropdown-icon {
+    right: 24rpx;
+    top: 2rpx;
+    padding: 0;
+}
+
+.coin-list-img {
+    --size: 40rpx;
+    width: var(--size);
+    height: var(--size) !important;
+}
+
+.coin-num {
+    --height: 72rpx;
+    display: inline-block;
+}
+
+.num.input-br {
+    border: 2rpx solid #F6F6F6;
+}
+
+.coin-num .num {
+    height: var(--height);
+    line-height: var(--height);
+    padding: 0 20rpx 0 20rpx;
+    border-radius: 36rpx;
+    width: 196rpx;
+}
+
+.coin-center-convert {
+    --size: 82rpx;
+    left: 50%;
+    transform: translateX(-50%);
+    margin-top: -54rpx;
+    width: var(--size);
+    height: var(--size);
+    border: 2rpx solid #e1e1e1;
+    border-radius: 50%;
+    background-color: #fff;
+}
+
+.convert-icon {
+    transition: all 0.5s ease-in-out;
+}
+
+.convert_true {
+    transform: rotate3d(1, 0, 0, 180deg);
+}
+
+.convert_false {
+    transform: rotate3d(1, 0, 0, 0deg);
+}
+
+.convert-btn {
+    background: linear-gradient(107deg, #31B4FC 0%, #0842E2 100%);
+    transition: all 0.3s ease-in-out;
+}
+
+.convert-btn:active {
+    background: linear-gradient(107deg, #168ACA 0%, #022A97 100%);
+}
+
+.coin-content-list-img {
+    --size: 36rpx;
+    width: var(--size);
+    height: var(--size) !important;
+}
+
+.convert-group-row .title {
+    min-width: 140rpx;
+}
+
+.cancel-btn,
+.submit-btn {
+    width: 50%;
+    height: 88rpx;
+    line-height: 88rpx;
+    font-size: 32rpx;
+}
+
+.cancel-btn:active,
+.submit-btn:active {
+    opacity: 0.7;
+}
+
+.cancel-btn {
+    border: 2rpx solid #0079FF;
+    background-color: transparent;
+    color: #0079FF !important;
+}
+
+.submit-btn {
+    background: linear-gradient(107deg, #3AB1F3 0%, #3C6BF7 100%);
+    color: #fff !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/coin/recharge-pay/recharge-pay.vue b/pages/plugins/coin/recharge-pay/recharge-pay.vue
new file mode 100644
index 0000000..11646da
--- /dev/null
+++ b/pages/plugins/coin/recharge-pay/recharge-pay.vue
@@ -0,0 +1,243 @@
+<template>
+    <view :class="theme_view">
+        <scroll-view :scroll-y="true" class="scroll-box" lower-threshold="60" @scroll="scroll_event">
+            <view class="padding-main pr page-bottom-fixed">
+                <view class="padding-lg bg-white radius-md margin-bottom-main">
+                    <view class="convert-group-row">
+                        <view class="margin-bottom-sm flex-row">
+                            <text class="cr-grey-9 title">{{$t('recharge-list.recharge-list.6b9399')}}</text>
+                            <text class="fw-b">{{ accounts.recharge_no }}</text>
+                        </view>
+                        <view class="margin-bottom-sm flex-row">
+                            <text class="cr-grey-9 title">{{$t('cash-list.cash-list.714g2h')}}</text>
+                            <text class="fw-b">{{ accounts.address }}</text>
+                        </view>
+                        <view class="margin-bottom-sm flex-row">
+                            <text class="cr-grey-9 title">{{$t('cash-list.cash-list.23ii8s')}}</text>
+                            <text class="fw-b">{{ accounts.network_name }}</text>
+                        </view>
+                        <view class="margin-bottom-sm flex-row">
+                            <text class="cr-grey-9 title">{{$t('recharge-list.recharge-list.epd531')}}</text>
+                            <text class="fw-b">{{ accounts.coin }}</text>
+                        </view>
+                        <view class="margin-bottom-sm flex-row">
+                            <text class="cr-grey-9 title">{{$t('cash-list.cash-list.2w20g2')}}</text>
+                            <text class="fw-b">{{ accounts.platform_name }}</text>
+                        </view>
+                        <view class="flex-row">
+                            <text class="cr-grey-9 title">{{$t('cash-list.cash-list.2w20g2')}}</text>
+                            <text class="fw-b">{{ accounts.add_time }}</text>
+                        </view>
+                    </view>
+                </view>
+                <view class="padding-main bg-white radius-md margin-bottom-main">
+                    <view class="flex-row align-e margin-bottom-main">
+                        <text class="fw-b">{{$t('recharge-pay.recharge-pay.lutmsv')}}</text>
+                        <text class="cr-grey-c text-size-xs">{{$t('recharge-pay.recharge-pay.1a5vqk')}}</text>
+                    </view>
+                    <component-upload :propData="image_list" :propMaxNum="10" :propPathType="editor_path_type" @call-back="return_image_event"></component-upload>
+                </view>
+                <view class="padding-main bg-white radius-md margin-bottom-xxxxl">
+                    <view class="flex-row align-e margin-bottom-main">
+                        <text class="fw-b">{{$t('recharge-pay.recharge-pay.wu49vk')}}</text>
+                    </view>
+                    <textarea :placeholder="$t('recharge-pay.recharge-pay.95pfkd')" name="pay_note" placeholder-class="cr-base" class="wh-auto bg-white" :value="pay_note" :maxlength="pay_note_length_max" @input="pay_note_event"></textarea>
+                </view>
+                <view class="bottom-fixed" :style="bottom_fixed_style">
+                    <view class="bottom-line-exclude">
+                        <view class="flex-row align-c">
+                            <button type="default" class="item cancel-btn round margin-right-sm" @tap="cancel_event">{{$t('common.cancel')}}</button>
+                            <button type="default" class="item submit-btn round margin-left-sm" @tap="submit_event">{{$t('form.form.4yd066')}}</button>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentPopup from '@/components/popup/popup';
+    import componentUpload from '@/components/upload/upload';
+    var wallet_static_url = app.globalData.get_static_url('coin', true) + 'app/';
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                wallet_static_url: wallet_static_url,
+                bottom_fixed_style: '',
+                params: null,
+                accounts: {},
+                image_list: [],
+                editor_path_type: '',
+                // 备注
+                pay_note: '',
+                pay_note_length_max: '500',
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentPopup,
+            componentUpload,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+        methods: {
+            init(e) {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('detail', 'recharge', 'coin'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                editor_path_type: data.editor_path_type || '',
+                                accounts: data.data || {},
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 3,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 上传图片回调
+            return_image_event(data) {
+                this.setData({
+                    image_list: data,
+                });
+            },
+
+            // 备注
+            pay_note_event(e) {
+                this.setData({
+                    pay_note: e.detail.value.trim(),
+                });
+            },
+
+            // 取消
+            cancel_event() {
+                app.globalData.page_back_prev_event();
+            },
+
+            // 提交
+            submit_event() {
+                var new_data = {
+                    id: this.params.id,
+                    pay_voucher: this.image_list,
+                    pay_note: this.pay_note,
+                };
+                // 数据校验
+                var validation = [
+                    { fields: 'pay_voucher', msg: this.$t('recharge-pay.recharge-pay.v5fok8') },
+                    { fields: 'pay_note', msg: this.$t('recharge-pay.recharge-pay.95pfkd') },
+                ];
+                if (app.globalData.fields_check(new_data, validation)) {
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('pay', 'recharge', 'coin'),
+                        method: 'POST',
+                        data: new_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                                setTimeout(function () {
+                                    app.globalData.url_open('/pages/plugins/coin/recharge-list/recharge-list', true);
+                                }, 1000);
+                            } else {
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.stopPullDownRefresh();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 页面滚动监听
+            scroll_event(e) {
+                uni.$emit('onPageScroll', e.detail);
+            },
+        },
+    };
+</script>
+<style>
+    @import './recharge-pay.css';
+</style>
diff --git a/pages/plugins/coin/recharge/recharge.css b/pages/plugins/coin/recharge/recharge.css
new file mode 100644
index 0000000..e978c19
--- /dev/null
+++ b/pages/plugins/coin/recharge/recharge.css
@@ -0,0 +1,137 @@
+/* 
+ * 顶部
+*/
+.recharge-title {
+    background: radial-gradient(60% 70% at 90% 79%, rgba(33, 125, 239, 0.85) 0%, #A6C8F3 100%);
+    padding-top: 130rpx;
+    /* #ifndef H5  */
+    padding-top: calc(var(--status-bar-height) + 5px + 130rpx);
+    /* #endif */
+}
+
+.coin-dropdown {
+    --height: 48rpx;
+    display: inline-block;
+    height: var(--height);
+    line-height: var(--height);
+    padding: 0 64rpx 0 32rpx;
+    background: rgba(255, 255, 255, 0.23);
+    border-radius: 12px;
+}
+
+.coin-dropdown-icon {
+    right: -36rpx;
+    top: 2rpx;
+    padding: 0;
+}
+
+.recharge-qrcode {
+    background-color: #fff;
+    border-radius: 40rpx;
+    text-align: center;
+    padding: 20rpx;
+}
+
+.recharge-qrcode .img {
+    width: 160rpx !important;
+    height: 160rpx !important;
+}
+
+/* 
+ * 内容
+*/
+.recharge-content {
+    margin-top: -32rpx;
+    border-radius: 32rpx 32rpx 0 0;
+    min-height: calc(100vh - 528rpx);
+    /* #ifndef H5  */
+    min-height: calc(100vh - 528rpx - var(--status-bar-height) - 5px);
+    /* #endif */
+}
+
+.recharge-content-input-bg {
+    background-color: #fafafc;
+}
+
+.recharge-price-item {
+    --size: -10rpx;
+    margin-left: var(--size);
+    margin-right: var(--size);
+    width: calc(100% - var(--size));
+}
+
+.recharge-price-list {
+    background: #F5F7F9;
+    border: 2rpx solid #F5F7F9;
+    border-radius: 16rpx;
+    padding: 20rpx 0;
+    margin: 18rpx 10rpx;
+    width: calc((100% / 3) - 24rpx);
+}
+
+.recharge-price-badge {
+    background: linear-gradient(107deg, #8A18DF 0%, #8D17DD 100%), #D8D8D8;
+    border-radius: 16rpx 0px 16rpx 0px;
+    padding: 2rpx 20rpx;
+    position: absolute;
+    left: 0;
+    top: -20rpx;
+    max-width: calc(100% - 20px);
+}
+
+.recharge-price-list.active {
+    background: rgba(8, 140, 226, 0.06);
+    border-radius: 8px;
+    border: 1px solid #2FB0FB;
+}
+
+.recharge-price-name {
+    font-size: 44rpx;
+}
+
+.recharge-price-img {
+    --size: 36rpx;
+    width: var(--size);
+    height: var(--size) !important;
+}
+
+.recharge-btn {
+    background: linear-gradient(107deg, #31B4FC 0%, #0842E2 100%);
+    transition: all 0.3s ease-in-out;
+}
+
+.recharge-btn:active {
+    background: linear-gradient(107deg, #168ACA 0%, #022A97 100%);
+}
+
+.recharge-content-tips .item::before {
+    content: '';
+    width: 12rpx;
+    height: 12rpx;
+    border-radius: 12rpx;
+    background: #30B3FC;
+    position: absolute;
+    left: 0;
+    top: 12rpx;
+}
+
+.coin-content-list-img {
+    --size: 28rpx;
+    width: var(--size);
+    height: var(--size) !important;
+}
+
+/* 
+ * 虚拟币弹窗
+*/
+.popup_coin_status_container .scroll-y {
+    height: 40vh;
+    overflow-y: auto;
+    padding-right: 20rpx;
+}
+
+.coin-list-img {
+    --size: 40rpx;
+    width: var(--size);
+    height: var(--size) !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/coin/recharge/recharge.vue b/pages/plugins/coin/recharge/recharge.vue
new file mode 100644
index 0000000..9121dda
--- /dev/null
+++ b/pages/plugins/coin/recharge/recharge.vue
@@ -0,0 +1,338 @@
+<template>
+    <view :class="theme_view">
+        <component-nav-back></component-nav-back>
+        <block v-if="accounts_list.length > 0">
+            <scroll-view :scroll-y="true" class="scroll-box" lower-threshold="60" @scroll="scroll_event">
+                <view class="recharge-title flex-col padding-lg">
+                    <view v-if="(accounts || mull) != null" class="margin-bottom-xxxl flex-row jc-sb margin-top-xl">
+                        <view class="cr-white flex-1 flex-width">
+                            <view class="coin-dropdown margin-bottom-main">
+                                <view class="flex-row align-c pr" @tap="popup_coin_status_open_event">
+                                    <image v-if="(accounts.platform_icon || null) != null" :src="accounts.platform_icon" mode="widthFix" class="coin-content-list-img round" />
+                                    <text class="margin-left-xs">{{ accounts.platform_name }}</text>
+                                    <view class="coin-dropdown-icon pa padding-left-xxl">
+                                        <iconfont name="icon-arrow-bottom" size="24rpx" color="#fff"></iconfont>
+                                    </view>
+                                </view>
+                            </view>
+                            <view class="text-size-xl fw-b single-text">{{ accounts.normal_coin }}</view>
+                        </view>
+                        <view class="recharge-qrcode">
+                            <block v-if="accounts.platform_data.recharge_qrcode">
+                                <image :src="accounts.platform_data.recharge_qrcode" mode="widthFix" class="img margin-right-xs radius dis-block" :data-value="accounts.platform_data.recharge_qrcode" @tap="recharge_qrcode_event" />
+                            </block>
+                            <block v-else>
+                                <iconfont name="icon-qrcode" size="160rpx" color="#f6f6f6"></iconfont>
+                            </block>
+                        </view>
+                    </view>
+                </view>
+                <view class="recharge-content padding-xxl bg-white">
+                    <view class="margin-bottom-xxxl">
+                        <view class="margin-bottom-main">{{$t('recharge.recharge.lh6k86')}}</view>
+                        <view class="recharge-content-input-bg padding-main border-radius-sm flex-row align-c">
+                            <view class="single-text padding-right-sm flex-1 flex-width">{{ accounts.platform_data.recharge_address }}</view>
+                            <view :data-value="accounts.platform_data.recharge_address" @tap.stop="text_copy_event">
+                                <iconfont name="icon-copy" size="24rpx" color="#999"></iconfont>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="margin-bottom-xxxl">
+                        <view class="margin-bottom-main">{{$t('recharge.recharge.e5rblc')}}</view>
+                        <block v-if="network_list.length > 0">
+                            <picker class="recharge-content-input-bg padding-main border-radius-sm" @change="recharge_event" :value="network_list_index" :range="network_list" range-key="name">
+                                <view class="picker arrow-bottom">
+                                    {{ network_list[network_list_index]['name'] }}
+                                </view>
+                            </picker>
+                        </block>
+                        <view v-else class="cr-grey">{{$t('cash.cash.1g49wo')}}</view>
+                    </view>
+                    <view class="margin-bottom-xxxl">
+                        <view v-if="accounts.platform_data.preset_data.length > 0">
+                            <view class="margin-bottom-xs">{{$t('recharge.recharge.eb6722')}}</view>
+                            <view class="flex-row flex-wrap recharge-price-item margin-bottom-xs">
+                                <block v-for="(item, index) in accounts.platform_data.preset_data" :key="index">
+                                    <view class="recharge-price-list flex-col align-c jc-c pr" :class="preset_data_index == index ? 'active' : ''" :data-index="index" :data-value="item.value" @tap="preset_data_change">
+                                        <view class="flex-row align-c jc-c">
+                                            <image :src="wallet_static_url + 'recharge-price.png'" mode="widthFix" class="recharge-price-img round" />
+                                            <view class="margin-left-xs recharge-price-name">{{ item.value }}</view>
+                                        </view>
+                                        <view class="margin-top-sm cr-grey-9 text-size-xs">10000</view>
+                                        <view v-if="item.tips" class="recharge-price-badge text-size-xss cr-white single-text">{{ item.tips }}</view>
+                                    </view>
+                                </block>
+                            </view>
+                        </view>
+                        <view class="recharge-content-input-bg padding-main border-radius-sm flex-row align-c margin-bottom-xxl">
+                            <text>{{$t('recharge.recharge.k1e7hs')}}</text>
+                            <view class="padding-left-lg">
+                                <input type="digit" name="coin" :value="recharge_num" placeholder-class="text-size-md cr-grey-9" :placeholder="$t('recharge.recharge.0i541i')" @input="recharge_num_change" />
+                            </view>
+                        </view>
+                        <button type="default" class="recharge-btn cr-white round" @tap="recharge_submit">{{$t('recharge.recharge.x27b25')}}</button>
+                    </view>
+                    <view v-if="accounts.platform_data.recharge_desc.length > 0" class="margin-bottom-xxxl">
+                        <view class="margin-bottom-main">{{$t('recharge.recharge.e8n7ul')}}</view>
+                        <view class="recharge-content-tips">
+                            <view v-for="(item, index) in accounts.platform_data.recharge_desc" :key="index" class="item pr padding-left-xl margin-bottom-sm cr-grey-9 text-size-xs">{{ item }}</view>
+                        </view>
+                    </view>
+                </view>
+            </scroll-view>
+            <!-- 虚拟币下拉框 -->
+            <component-popup :propShow="popup_coin_status" propPosition="bottom" @onclose="popup_coin_status_close_event">
+                <view class="padding-horizontal-main padding-top-main bg-white">
+                    <view class="oh">
+                        <view class="fr" @tap.stop="popup_coin_status_close_event">
+                            <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                        </view>
+                    </view>
+                    <view class="popup_coin_status_container padding-vertical-main flex-col text-size">
+                        <view class="scroll-y">
+                            <view v-for="(item, index) in accounts_list" :key="index" class="flex-row jc-sb align-c padding-vertical-main" :class="accounts_list.length == index + 1 ? '' : 'br-b-f9'" :data-value="item" :data-index="index" @tap="coin_checked_event">
+                                <view class="flex-row align-c">
+                                    <image v-if="item.platform_icon" :src="item.platform_icon" mode="widthFix" class="coin-list-img round" />
+                                    <view class="margin-left-sm text-size-md single-text">{{ item.platform_name }}</view>
+                                </view>
+                                <view>
+                                    <iconfont :name="accounts.id == item.id ? 'icon-zhifu-yixuan cr-red' : 'icon-zhifu-weixuan'" size="40rpx"></iconfont>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </component-popup>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNavBack from '@/components/nav-back/nav-back';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentPopup from '@/components/popup/popup';
+    var wallet_static_url = app.globalData.get_static_url('coin', true) + 'app/';
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                wallet_static_url: wallet_static_url,
+                status_bar_height: bar_height,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                params: {},
+
+                // 账户
+                accounts: {},
+                // 虚拟币下拉框探弹窗状态
+                popup_coin_status: false,
+                // 虚拟币下拉框list
+                accounts_list: [],
+                // 充币网络
+                network_list_index: 0,
+                network_list: [],
+                // 充值选中下标
+                preset_data_index: null,
+                // 充值数量
+                recharge_num: '',
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNavBack,
+            componentNoData,
+            componentPopup,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+        methods: {
+            init(e) {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('createinfo', 'recharge', 'coin'),
+                    method: 'POST',
+                    data: {accounts_id : this.accounts.id || this.params.id || null},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                accounts: data.accounts || {},
+                                accounts_list: data.accounts_list || [],
+                                network_list: data.network_list || [],
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 3,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            app.globalData.is_login_check(res.data, this, 'get_data');
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 虚拟币切换
+            coin_checked_event(e) {
+                this.setData({
+                    accounts: this.accounts_list[e.currentTarget.dataset.index],
+                    popup_coin_status: false,
+                });
+                this.get_data();
+            },
+            popup_coin_status_open_event() {
+                this.setData({
+                    popup_coin_status: !this.popup_coin_status,
+                });
+            },
+            popup_coin_status_close_event() {
+                this.setData({
+                    popup_coin_status: false,
+                });
+            },
+            // 充币网络切换
+            recharge_event(e) {
+                this.setData({
+                    network_list_index: parseInt(e.detail.value || 0),
+                });
+            },
+            // 充值币选中
+            recharge_num_change(e) {
+                this.setData({
+                    recharge_num: e.detail.value,
+                });
+            },
+            // 其他充值数量
+            preset_data_change(e) {
+                this.setData({
+                    preset_data_index: parseInt(e.currentTarget.dataset.index || 0),
+                    recharge_num: parseInt(e.currentTarget.dataset.value || 0),
+                });
+            },
+            // 立即充值
+            recharge_submit() {
+                if(this.network_list.length == 0) {
+                    app.globalData.showToast(this.$t('cash.cash.en6vsa'));
+                    return false;
+                }
+
+                // 表单数据
+                var new_data = {
+                    accounts_id: this.accounts.id,
+                    network_id: this.network_list[this.network_list_index].id,
+                    address: this.accounts.platform_data.recharge_address,
+                    coin: this.recharge_num,
+                };
+                // 数据校验
+                var validation = [{ fields: 'coin', msg: this.$t('recharge.recharge.5q02ar') }];
+
+                // 验证提交表单
+                if (app.globalData.fields_check(new_data, validation)) {
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('create', 'recharge', 'coin'),
+                        method: 'POST',
+                        data: new_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                                setTimeout(function () {
+                                    app.globalData.url_open('/pages/plugins/coin/recharge-list/recharge-list', true);
+                                }, 1000);
+                            } else {
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.stopPullDownRefresh();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+            // 页面滚动监听
+            scroll_event(e) {
+                uni.$emit('onPageScroll', e.detail);
+            },
+
+            // 复制文本
+            text_copy_event(e) {
+                app.globalData.text_copy_event(e);
+            },
+            
+            // 二维码预览
+            recharge_qrcode_event(e) {
+                app.globalData.image_show_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import './recharge.css';
+</style>
diff --git a/pages/plugins/coin/transaction-list/transaction-list.css b/pages/plugins/coin/transaction-list/transaction-list.css
new file mode 100644
index 0000000..21b544d
--- /dev/null
+++ b/pages/plugins/coin/transaction-list/transaction-list.css
@@ -0,0 +1,18 @@
+.transaction .nav {
+    z-index: 102;
+}
+.scroll-box {
+    height: calc(100vh - 88rpx);
+}
+
+.convert-group-row .title {
+    min-width: 140rpx;
+}
+
+/* 
+ * 钱包弹窗
+*/
+.popup_accounts_container .item {
+    background-color: #f4f4f4;
+    border-radius: 30rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/coin/transaction-list/transaction-list.vue b/pages/plugins/coin/transaction-list/transaction-list.vue
new file mode 100644
index 0000000..a7d066e
--- /dev/null
+++ b/pages/plugins/coin/transaction-list/transaction-list.vue
@@ -0,0 +1,537 @@
+<template>
+    <view :class="theme_view">
+        <view class="transaction">
+            <view class="padding-main bg-white pr nav flex-row oa">
+                <view class="flex-shrink flex-row align-c margin-right-xxxl padding-right-xl pr" @tap="popup_accounts_open_event">
+                    <view>{{ accounts_name !== null && accounts_name !== $t('common.all') ? accounts_name : $t('cash-list.cash-list.n74r94') }}</view>
+                    <view class="pa right-0"><iconfont :name="popup_accounts_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
+                </view>
+                <view class="flex-shrink flex-row align-c margin-right-xxxl padding-right-xl pr" @tap="popup_operate_type_open_event">
+                    <view>{{ operate_type_name !== null && operate_type_name !== $t('common.all') ? operate_type_name : $t('wallet-log-detail.wallet-log-detail.tdf3wo') }}</view>
+                    <view class="pa right-0"><iconfont :name="popup_operate_type_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
+                </view>
+                <view class="flex-shrink flex-row align-c margin-right-xxxl padding-right-xl pr" @tap="popup_business_type_open_event">
+                    <view>{{ business_type_name !== null && business_type_name !== $t('common.all') ? business_type_name : $t('invoice.invoice.l3832z') }}</view>
+                    <view class="pa right-0"><iconfont :name="popup_business_type_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
+                </view>
+                <view class="flex-shrink flex-row align-c padding-right-xl pr" @tap="popup_coin_type_open_event">
+                    <view>{{ coin_type_name !== null && coin_type_name !== $t('common.all') ? coin_type_name : $t('transaction-list.transaction-list.cu39n5') }}</view>
+                    <view class="pa right-0"><iconfont :name="popup_coin_type_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
+                </view>
+            </view>
+            <scroll-view :scroll-y="true" class="scroll-box" lower-threshold="60" @scroll="scroll_event">
+                <view class="padding-main">
+                    <view v-if="data_list.length > 0">
+                        <view v-for="(item, index) in data_list" :key="index" class="padding-main bg-white radius-md margin-bottom-main">
+                            <view class="br-b-dashed padding-bottom-main margin-bottom-main flex-row jc-sb align-c">
+                                <view>{{ item.business_type_name }}</view>
+                                <view class="cr-grey-9">{{ item.add_time }}</view>
+                            </view>
+                            <view class="convert-group-row">
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title">{{$t('transaction-list.transaction-list.1mf6wj')}}</text>
+                                    <text class="fw-b warp">{{ item.coin_type_name }}</text>
+                                </view>
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title">{{$t('detail.detail.4w20tq')}}</text>
+                                    <text class="fw-b warp">{{ item.operate_type_name }}</text>
+                                </view>
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title">{{$t('transaction-list.transaction-list.2w1o1l')}}</text>
+                                    <text class="fw-b warp">{{ item.operate_coin }}</text>
+                                </view>
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title">{{$t('transaction-list.transaction-list.jgx0cf')}}</text>
+                                    <text class="fw-b warp">{{ item.original_coin }}</text>
+                                </view>
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title">{{$t('convert-list.convert-list.6347mw')}}</text>
+                                    <text class="fw-b warp">{{ item.latest_coin }}</text>
+                                </view>
+                                <view class="flex-row">
+                                    <text class="cr-grey-9 title">{{$t('transaction-list.transaction-list.7cv11k')}}</text>
+                                    <text class="fw-b warp">{{ item.msg }}</text>
+                                </view>
+                            </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>
+            </scroll-view>
+            <!-- 账户 -->
+            <component-popup :propShow="popup_accounts_status" propPosition="top" :propTop="popup_top_height + 'px'" @onclose="popup_accounts_close_event">
+                <view class="padding-vertical-lg">
+                    <view class="padding-horizontal-main text-size-xs">{{$t('cash-list.cash-list.s7l616')}}</view>
+                    <view class="popup_accounts_container padding-sm flex-row flex-wrap align-c tc text-size-md">
+                        <view class="flex-width-half-half">
+                            <view class="item margin-sm padding-vertical-sm" :class="accounts_list_index == null ? 'cr-main bg-main-light' : ''" :data-name="$t('common.all')" :data-value="null" :data-index="null" @tap="accounts_list_event">{{$t('common.all')}}</view>
+                        </view>
+                        <view v-for="(item, index) in accounts_list" class="flex-width-half-half" :key="index">
+                            <view class="item margin-sm padding-vertical-sm" :class="accounts_list_index == index ? 'cr-main bg-main-light' : ''" :data-name="item.platform_name" :data-value="item.id" :data-index="index" @tap="accounts_list_event">{{ item.platform_name }}</view>
+                        </view>
+                    </view>
+                    <view class="tc padding-top-lg br-t" @tap="popup_accounts_close_event">
+                        <text class="padding-right-sm">{{ $t('nav-more.nav-more.h9g4b1') }}</text>
+                        <iconfont name="icon-arrow-top" color="#ccc"></iconfont>
+                    </view>
+                </view>
+            </component-popup>
+            <!-- 操作类型 -->
+            <component-popup :propShow="popup_operate_type_status" propPosition="top" :propTop="popup_top_height + 'px'" @onclose="popup_operate_type_close_event">
+                <view class="padding-vertical-lg">
+                    <view class="padding-horizontal-main text-size-xs">{{$t('wallet-log-detail.wallet-log-detail.tdf3wo')}}</view>
+                    <view class="popup_accounts_container padding-sm flex-row flex-wrap align-c tc text-size-md">
+                        <view class="flex-width-half-half">
+                            <view class="item margin-sm padding-vertical-sm" :class="operate_type_list_index == null ? 'cr-main bg-main-light' : ''" :data-name="$t('common.all')" :data-value="null" :data-index="null" @tap="operate_type_list_event">{{$t('common.all')}}</view>
+                        </view>
+                        <view v-for="(item, index) in operate_type_list" class="flex-width-half-half" :key="index">
+                            <view class="item margin-sm padding-vertical-sm" :class="operate_type_list_index == index ? 'cr-main bg-main-light' : ''" :data-name="item.name" :data-value="item.value" :data-index="index" @tap="operate_type_list_event">{{ item.name }}</view>
+                        </view>
+                    </view>
+                    <view class="tc padding-top-lg br-t" @tap="popup_operate_type_close_event">
+                        <text class="padding-right-sm">{{ $t('nav-more.nav-more.h9g4b1') }}</text>
+                        <iconfont name="icon-arrow-top" color="#ccc"></iconfont>
+                    </view>
+                </view>
+            </component-popup>
+            <!-- 业务类型 -->
+            <component-popup :propShow="popup_business_type_status" propPosition="top" :propTop="popup_top_height + 'px'" @onclose="popup_business_type_close_event">
+                <view class="padding-vertical-lg">
+                    <view class="padding-horizontal-main text-size-xs">{{$t('invoice.invoice.l3832z')}}</view>
+                    <view class="popup_accounts_container padding-sm flex-row flex-wrap align-c tc text-size-md">
+                        <view class="flex-width-half-half">
+                            <view class="item margin-sm padding-vertical-sm" :class="business_type_list_index == null ? 'cr-main bg-main-light' : ''" :data-name="$t('common.all')" :data-value="null" :data-index="null" @tap="business_type_list_event">{{$t('common.all')}}</view>
+                        </view>
+                        <view v-for="(item, index) in business_type_list" class="flex-width-half-half" :key="index">
+                            <view class="item margin-sm padding-vertical-sm" :class="business_type_list_index == index ? 'cr-main bg-main-light' : ''" :data-name="item.name" :data-value="item.value" :data-index="index" @tap="business_type_list_event">{{ item.name }}</view>
+                        </view>
+                    </view>
+                    <view class="tc padding-top-lg br-t" @tap="popup_business_type_close_event">
+                        <text class="padding-right-sm">{{ $t('nav-more.nav-more.h9g4b1') }}</text>
+                        <iconfont name="icon-arrow-top" color="#ccc"></iconfont>
+                    </view>
+                </view>
+            </component-popup>
+            <!-- 币类型 -->
+            <component-popup :propShow="popup_coin_type_status" propPosition="top" :propTop="popup_top_height + 'px'" @onclose="popup_coin_type_close_event">
+                <view class="padding-vertical-lg">
+                    <view class="padding-horizontal-main text-size-xs">{{$t('transaction-list.transaction-list.cu39n5')}}</view>
+                    <view class="popup_accounts_container padding-sm flex-row flex-wrap align-c tc text-size-md">
+                        <view class="flex-width-half-half">
+                            <view class="item margin-sm padding-vertical-sm" :class="coin_type_list_index == null ? 'cr-main bg-main-light' : ''" :data-name="$t('common.all')" :data-value="null" :data-index="null" @tap="coin_type_list_event">{{$t('common.all')}}</view>
+                        </view>
+                        <view v-for="(item, index) in coin_type_list" class="flex-width-half-half" :key="index">
+                            <view class="item margin-sm padding-vertical-sm" :class="coin_type_list_index == index ? 'cr-main bg-main-light' : ''" :data-name="item.name" :data-value="item.value" :data-index="index" @tap="coin_type_list_event">{{ item.name }}</view>
+                        </view>
+                    </view>
+                    <view class="tc padding-top-lg br-t" @tap="popup_coin_type_close_event">
+                        <text class="padding-right-sm">{{ $t('nav-more.nav-more.h9g4b1') }}</text>
+                        <iconfont name="icon-arrow-top" color="#ccc"></iconfont>
+                    </view>
+                </view>
+            </component-popup>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentPopup from '@/components/popup/popup';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    var accounts_static_url = app.globalData.get_static_url('coin', true) + 'app/';
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                accounts_static_url: accounts_static_url,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                params: {},
+
+                // 弹窗距离顶部距离
+                popup_top_height: 0,
+
+                // 账户
+                popup_accounts_status: false,
+                accounts_id: null,
+                accounts_list_index: null,
+                accounts_name: null,
+                accounts_list: [],
+                // 操作类型
+                popup_operate_type_status: false,
+                operate_type: null,
+                operate_type_list_index: null,
+                operate_type_name: null,
+                operate_type_list: [],
+                // 业务类型
+                popup_business_type_status: false,
+                business_type: null,
+                business_type_list_index: null,
+                business_type_name: null,
+                business_type_list: [],
+                // 币类型
+                popup_coin_type_status: false,
+                coin_type: null,
+                coin_type_list_index: null,
+                coin_type_name: null,
+                coin_type_list: [],
+
+                data_list: [],
+                data_page_total: 0,
+                data_page: 1,
+                data_is_loading: 0,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentPopup,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+            // 设置参数
+            this.setData({
+                params: params,
+                accounts_id: params.id || null,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 初始数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+        methods: {
+            init(e) {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                    this.get_data_list();
+                    var self = this;
+                    var timer = setInterval(function () {
+                        if (self.popup_top_height == 0) {
+                            self.popup_top_height_computer();
+                        } else {
+                            clearInterval(timer);
+                        }
+                    }, 500);
+                }
+            },
+
+            // 初始化数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('init', 'user', 'coin'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                accounts_list: data.accounts_list || [],
+                                operate_type_list: data.log_operate_type_list || [],
+                                business_type_list: data.log_business_type_list || [],
+                                coin_type_list: data.log_coin_type_list || [],
+                            });
+                            if (this.accounts_list.length > 0 && (this.accounts_id || null) != null) {
+                                var index = this.accounts_list.findIndex((item) => item.id == this.accounts_id);
+                                this.setData({
+                                    accounts_list_index: index,
+                                    accounts_id: this.accounts_list[index].id,
+                                    accounts_name: this.accounts_list[index].platform_name,
+                                });
+                            }
+                        } else {
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+                // 加载loding
+                if (this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+                var new_data = {
+                    accounts_id: this.accounts_id,
+                    business_type: this.business_type,
+                    operate_type: this.operate_type,
+                    coin_type: this.coin_type,
+                    page: this.data_page,
+                };
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'accountslog', 'coin'),
+                    method: 'POST',
+                    data: new_data,
+                    dataType: 'json',
+                    success: (res) => {
+                        if (this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            // 数据列表
+                            var data = res.data.data;
+                            if (this.data_page <= 1) {
+                                var temp_data_list = data.data_list || [];
+                            } else {
+                                var temp_data_list = this.data_list || [];
+                                var temp_data = data.data_list;
+                                for (var i in temp_data) {
+                                    temp_data_list.push(temp_data[i]);
+                                }
+                            }
+
+                            this.setData({
+                                data_list: temp_data_list,
+                                data_total: data.total,
+                                data_page_total: data.page_total,
+                                data_list_loding_status: temp_data_list.length > 0 ? 3 : 0,
+                                data_list_loding_msg: '',
+                                data_page: this.data_page + 1,
+                                data_is_loading: 0,
+                            });
+
+                            // 是否还有数据
+                            this.setData({
+                                data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                        }
+                    },
+                    fail: () => {
+                        if (this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+
+            // 账户打开
+            popup_accounts_open_event() {
+                this.setData({
+                    popup_accounts_status: !this.popup_accounts_status,
+                    popup_operate_type_status: false,
+                    popup_business_type_status: false,
+                    popup_coin_type_status: false,
+                });
+            },
+
+            // 账户关闭
+            popup_accounts_close_event() {
+                this.setData({
+                    popup_accounts_status: false,
+                });
+            },
+
+            // 账户选择
+            accounts_list_event(e) {
+                this.setData({
+                    accounts_list_index: e.currentTarget.dataset.index,
+                    accounts_id: e.currentTarget.dataset.value,
+                    accounts_name: e.currentTarget.dataset.name,
+                    popup_accounts_status: false,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 操作类型打开
+            popup_operate_type_open_event() {
+                this.setData({
+                    popup_operate_type_status: !this.popup_operate_type_status,
+                    popup_accounts_status: false,
+                    popup_business_type_status: false,
+                    popup_coin_type_status: false,
+                });
+            },
+
+            // 操作类型关闭
+            popup_operate_type_close_event() {
+                this.setData({
+                    popup_operate_type_status: false,
+                });
+            },
+
+            // 操作类型选择
+            operate_type_list_event(e) {
+                this.setData({
+                    operate_type_list_index: e.currentTarget.dataset.index,
+                    operate_type: e.currentTarget.dataset.value,
+                    operate_type_name: e.currentTarget.dataset.name,
+                    popup_operate_type_status: false,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 业务类型打开
+            popup_business_type_open_event() {
+                this.setData({
+                    popup_business_type_status: !this.popup_business_type_status,
+                    popup_accounts_status: false,
+                    popup_operate_type_status: false,
+                    popup_coin_type_status: false,
+                });
+            },
+
+            // 业务类型关闭
+            popup_business_type_close_event() {
+                this.setData({
+                    popup_business_type_status: false,
+                });
+            },
+
+            // 业务类型选择
+            business_type_list_event(e) {
+                this.setData({
+                    business_type_list_index: e.currentTarget.dataset.index,
+                    business_type: e.currentTarget.dataset.value,
+                    business_type_name: e.currentTarget.dataset.name,
+                    popup_business_type_status: false,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 币类型打开
+            popup_coin_type_open_event() {
+                this.setData({
+                    popup_coin_type_status: !this.popup_coin_type_status,
+                    popup_accounts_status: false,
+                    popup_operate_type_status: false,
+                    popup_business_type_status: false,
+                });
+            },
+
+            // 币类型关闭
+            popup_coin_type_close_event() {
+                this.setData({
+                    popup_coin_type_status: false,
+                });
+            },
+
+            // 币类型选择
+            coin_type_list_event(e) {
+                this.setData({
+                    coin_type_list_index: e.currentTarget.dataset.index,
+                    coin_type: e.currentTarget.dataset.value,
+                    coin_type_name: e.currentTarget.dataset.name,
+                    popup_coin_type_status: false,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 计算搜索框的高度
+            popup_top_height_computer() {
+                const query = uni.createSelectorQuery();
+                query
+                    .select('.nav')
+                    .boundingClientRect((res) => {
+                        if ((res || null) != null) {
+                            // 获取搜索框高度
+                            this.setData({
+                                popup_top_height: res.height,
+                            });
+                        }
+                    })
+                    .exec();
+            },
+
+            // 页面滚动监听
+            scroll_event(e) {
+                uni.$emit('onPageScroll', e.detail);
+            },
+        },
+    };
+</script>
+<style>
+    @import './transaction-list.css';
+</style>
diff --git a/pages/plugins/coin/transfer-list/transfer-list.css b/pages/plugins/coin/transfer-list/transfer-list.css
new file mode 100644
index 0000000..025b1d2
--- /dev/null
+++ b/pages/plugins/coin/transfer-list/transfer-list.css
@@ -0,0 +1,18 @@
+.transfer-accounts .nav {
+    z-index: 102;
+}
+.scroll-box {
+    height: calc(100vh - 88rpx);
+}
+
+.convert-group-row .title {
+    min-width: 140rpx;
+}
+
+/* 
+ * 钱包弹窗
+*/
+.popup_accounts_container .item {
+    background-color: #f4f4f4;
+    border-radius: 30rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/coin/transfer-list/transfer-list.vue b/pages/plugins/coin/transfer-list/transfer-list.vue
new file mode 100644
index 0000000..e889580
--- /dev/null
+++ b/pages/plugins/coin/transfer-list/transfer-list.vue
@@ -0,0 +1,342 @@
+<template>
+    <view :class="theme_view">
+        <view class="transfer-accounts">
+            <view class="padding-main bg-white pr nav flex-row oa">
+                <view class="flex-shrink flex-row align-c padding-right-xl pr" @tap="popup_accounts_open_event">
+                    <view>{{ accounts_name !== null && accounts_name !== $t('common.all') ? accounts_name : $t('cash-list.cash-list.n74r94') }}</view>
+                    <view class="pa right-0"><iconfont :name="popup_accounts_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
+                </view>
+            </view>
+            <scroll-view :scroll-y="true" class="scroll-box" lower-threshold="60" @scroll="scroll_event" @scrolltolower="scroll_lower">
+                <view class="padding-main">
+                    <view v-if="data_list.length > 0">
+                        <view v-for="(item, index) in data_list" :key="index" class="padding-main bg-white radius-md margin-bottom-main">
+                            <view class="br-b-dashed padding-bottom-main margin-bottom-main flex-row jc-sb align-c">
+                                <view>{{$t('user-transfer-detail.user-transfer-detail.x17599')}}</view>
+                                <view class="cr-grey-9">{{ item.add_time }}</view>
+                            </view>
+                            <view class="convert-group-row">
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title">{{$t('transfer-list.transfer-list.69rnx6')}}</text>
+                                    <text class="fw-b warp">{{ item.transfer_no }}</text>
+                                </view>
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title">{{$t('transfer-list.transfer-list.4aj248')}}</text>
+                                    <text class="fw-b warp">{{ item.receive_user.username }}</text>
+                                </view>
+                                <view class="margin-bottom-sm flex-row">
+                                    <text class="cr-grey-9 title">{{$t('transfer-list.transfer-list.m2r55k')}}</text>
+                                    <text class="fw-b warp">{{ item.coin }}</text>
+                                </view>
+                                <view class="flex-row">
+                                    <text class="cr-grey-9 title">{{$t('transfer-list.transfer-list.9g8lyb')}}</text>
+                                    <text class="fw-b warp">{{ item.note }}</text>
+                                </view>
+                            </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>
+            </scroll-view>
+            <!-- 账户 -->
+            <component-popup :propShow="popup_accounts_status" propPosition="top" :propTop="popup_top_height + 'px'" @onclose="popup_accounts_close_event">
+                <view class="padding-vertical-lg">
+                    <view class="padding-horizontal-main text-size-xs">{{$t('cash-list.cash-list.s7l616')}}</view>
+                    <view class="popup_accounts_container padding-sm flex-row flex-wrap align-c tc text-size-md">
+                        <view class="flex-width-half-half">
+                            <view class="item margin-sm padding-vertical-sm" :class="accounts_list_index == null ? 'cr-main bg-main-light' : ''" :data-name="$t('common.all')" :data-value="null" :data-index="null" @tap="accounts_list_event">{{$t('common.all')}}</view>
+                        </view>
+                        <view v-for="(item, index) in accounts_list" class="flex-width-half-half" :key="index">
+                            <view class="item margin-sm padding-vertical-sm" :class="accounts_list_index == index ? 'cr-main bg-main-light' : ''" :data-name="item.platform_name" :data-value="item.id" :data-index="index" @tap="accounts_list_event">{{ item.platform_name }}</view>
+                        </view>
+                    </view>
+                    <view class="tc padding-top-lg br-t" @tap="popup_accounts_close_event">
+                        <text class="padding-right-sm">{{ $t('nav-more.nav-more.h9g4b1') }}</text>
+                        <iconfont name="icon-arrow-top" color="#ccc"></iconfont>
+                    </view>
+                </view>
+            </component-popup>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentPopup from '@/components/popup/popup';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    var accounts_static_url = app.globalData.get_static_url('coin', true) + 'app/';
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                accounts_static_url: accounts_static_url,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                params: {},
+
+                // 弹窗距离顶部距离
+                popup_top_height: 0,
+
+                // 账户
+                popup_accounts_status: false,
+                accounts_id: null,
+                accounts_list_index: null,
+                accounts_name: null,
+                accounts_list: [],
+
+                data_list: [],
+                data_page_total: 0,
+                data_page: 1,
+                data_is_loading: 0,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentPopup,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+            // 设置参数
+            this.setData({
+                params: params,
+                accounts_id: params.id || null,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 初始数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+        methods: {
+            init(e) {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                    this.get_data_list();
+                    var self = this;
+                    var timer = setInterval(function () {
+                        if (self.popup_top_height == 0) {
+                            self.popup_top_height_computer();
+                        } else {
+                            clearInterval(timer);
+                        }
+                    }, 500);
+                }
+            },
+            // 初始化数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('init', 'user', 'coin'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                accounts_list: data.accounts_list || [],
+                            });
+                            if (this.accounts_list.length > 0 && (this.accounts_id || null) != null) {
+                                var index = data.accounts_list.findIndex((item) => item.id == this.accounts_id);
+                                this.setData({
+                                    accounts_list_index: index,
+                                    accounts_id: this.accounts_list[index].id,
+                                    accounts_name: this.accounts_list[index].platform_name,
+                                });
+                            }
+                        } else {
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+                // 加载loding
+                if (this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+                var new_data = {
+                    send_accounts_id: this.accounts_id,
+                    page: this.data_page,
+                };
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'transfer', 'coin'),
+                    method: 'POST',
+                    data: new_data,
+                    dataType: 'json',
+                    success: (res) => {
+                        if (this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            // 数据列表
+                            var data = res.data.data;
+                            if (this.data_page <= 1) {
+                                var temp_data_list = data.data_list || [];
+                            } else {
+                                var temp_data_list = this.data_list || [];
+                                var temp_data = data.data_list;
+                                for (var i in temp_data) {
+                                    temp_data_list.push(temp_data[i]);
+                                }
+                            }
+
+                            this.setData({
+                                data_list: temp_data_list,
+                                data_total: data.total,
+                                data_page_total: data.page_total,
+                                data_list_loding_status: temp_data_list.length > 0 ? 3 : 0,
+                                data_list_loding_msg: '',
+                                data_page: this.data_page + 1,
+                                data_is_loading: 0,
+                            });
+
+                            // 是否还有数据
+                            this.setData({
+                                data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                        }
+                    },
+                    fail: () => {
+                        if (this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+
+            // 账户打开
+            popup_accounts_open_event() {
+                this.setData({
+                    popup_accounts_status: !this.popup_accounts_status,
+                });
+            },
+
+            // 账户关闭
+            popup_accounts_close_event() {
+                this.setData({
+                    popup_accounts_status: false,
+                });
+            },
+
+            // 账户选择
+            accounts_list_event(e) {
+                this.setData({
+                    accounts_list_index: e.currentTarget.dataset.index,
+                    accounts_id: e.currentTarget.dataset.value,
+                    accounts_name: e.currentTarget.dataset.name,
+                    popup_accounts_status: false,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 计算搜索框的高度
+            popup_top_height_computer() {
+                const query = uni.createSelectorQuery();
+                query
+                    .select('.nav')
+                    .boundingClientRect((res) => {
+                        if ((res || null) != null) {
+                            // 获取搜索框高度
+                            this.setData({
+                                popup_top_height: res.height,
+                            });
+                        }
+                    })
+                    .exec();
+            },
+
+            // 页面滚动监听
+            scroll_event(e) {},
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+        },
+    };
+</script>
+<style>
+    @import './transfer-list.css';
+</style>
diff --git a/pages/plugins/coin/transfer/transfer.css b/pages/plugins/coin/transfer/transfer.css
new file mode 100644
index 0000000..416d47a
--- /dev/null
+++ b/pages/plugins/coin/transfer/transfer.css
@@ -0,0 +1,19 @@
+.note {
+    background-color: #fafafc;
+}
+
+.accounts-btn,
+.transfer-btn {
+    background: linear-gradient(107deg, #31B4FC 0%, #0842E2 100%);
+}
+
+.accounts-btn,
+.transfer-btn:active {
+    background: linear-gradient(107deg, #168ACA 0%, #022A97 100%);
+}
+
+.coin-content-list-img {
+    --size: 80rpx;
+    width: var(--size);
+    height: var(--size) !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/coin/transfer/transfer.vue b/pages/plugins/coin/transfer/transfer.vue
new file mode 100644
index 0000000..8629080
--- /dev/null
+++ b/pages/plugins/coin/transfer/transfer.vue
@@ -0,0 +1,260 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="data_list_loding_status == 3" class="transfer">
+            <view class="padding-main">
+                <view class="bg-white padding-main radius-md margin-bottom-main">
+                    <view class="padding-vertical-sm border-radius-sm flex-row align-c">
+                        <view class="flex-row">
+                            <image v-if="accounts.platform_icon" :src="accounts.platform_icon" mode="widthFix" class="coin-content-list-img round" />
+                            <view class="padding-left-main">
+                                <view class="coin-dropdown text-size-md pr margin-bottom-xs flex-row">
+                                    <text class="cr-666">{{ accounts.platform_name }}</text>
+                                </view>
+                                <view class="fw-b text-size">{{ accounts.platform_symbol }} {{ accounts.normal_coin }}</view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <view class="bg-white padding-main radius-md margin-bottom-main">
+                    <view class="padding-vertical-sm flex-row align-c">
+                        <iconfont name="icon-scan" size="40rpx" @tap="scancode_event"></iconfont>
+                        <view class="padding-left-lg flex-row jc-sb align-c flex-1 flex-width">
+                            <view class="flex-1 padding-right-main">
+                                <input type="text" name="receive_accounts_key" :value="receive_accounts_key" placeholder-class="text-size-md cr-grey-9" :placeholder="$t('transfer.transfer.1aijp1')" @input="receive_accounts_key_change" />
+                            </view>
+                            <button type="default" class="accounts-btn text-size-xs cr-white round" @tap="receive_accounts_key_event">{{$t('common.confirm')}}</button>
+                        </view>
+                    </view>
+                </view>
+                <view class="bg-white padding-main radius-md margin-bottom-main">
+                    <view class="padding-vertical-sm">
+                        <text class="text-size fw-b">{{$t('transfer.transfer.b4m5p3')}}</text>
+                        <view class="margin-top-xxxxl">
+                            <input type="digit" name="coin" :value="coin" class="text-size-xl tc" placeholder-class="cr-grey-9" :placeholder="$t('transfer.transfer.d15853')" @input="coin_change" />
+                            <view class="cr-grey-9 tc margin-top-main">{{$t('transfer.transfer.9xe2bl')}}<text class="cr-black fw-b">{{ accounts.platform_symbol }} {{ accounts.default_coin }}</text>
+                            </view>
+                        </view>
+                        <view class="note padding-main radius margin-top-xxxl">
+                            <input type="text" name="note" :value="note" placeholder-class="text-size-md cr-grey-9" :placeholder="$t('transfer.transfer.2bwh7h')" @input="note_change" />
+                        </view>
+                    </view>
+                </view>
+                <!-- <view class="padding-main bg-white radius-md">
+                    <view class="padding-vertical-sm border-radius-sm flex-row align-c">
+                        <text class="text-size fw-b">转账密码</text>
+                        <view class="padding-left-lg">
+                            <input type="password" name="pay_pwd" :value="pay_pwd" placeholder-class="text-size-md cr-grey-9" placeholder="请输入支付密码" @input="pwd_num_change" />
+                        </view>
+                    </view>
+                </view> -->
+                <view class="padding-xxxl margin-top-sm">
+                    <button type="default" class="transfer-btn cr-white round" @tap="transfer_event">{{$t('transfer.transfer.3i4h4z')}}</button>
+                </view>
+            </view>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    var accounts_static_url = app.globalData.get_static_url('coin', true) + 'app/';
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                accounts_static_url: accounts_static_url,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+
+                accounts_id: null,
+                receive_accounts_key: null,
+                receive_accounts_id: null,
+                accounts: {},
+                receive_accounts: {},
+                coin: null,
+                note: '',
+                // pay_pwd: '',
+            };
+        },
+        components: {
+            componentCommon,
+            componentNoData
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+            // 设置参数
+            this.setData({
+                accounts_id: params.id,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+
+            // 初始数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+        methods: {
+            init(e) {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                }
+            },
+            // 初始化数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('createinfo', 'transfer', 'coin'),
+                    method: 'POST',
+                    data: { accounts_id: this.accounts_id, accounts_key: this.receive_accounts_key },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                accounts: data.accounts || {},
+                                receive_accounts: data.receive_accounts || {},
+                                receive_accounts_id: data.receive_accounts ? data.receive_accounts.id : null,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 3,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+            scancode_event() {
+                // 调用扫码
+                var self = this;
+                uni.scanCode({
+                    success: function (res) {
+                        self.setData({
+                            receive_accounts_key: res.result,
+                        });
+                    },
+                });
+            },
+            // 收款账号
+            receive_accounts_key_change(e) {
+                this.setData({
+                    receive_accounts_key: e.detail.value,
+                });
+            },
+            // 确认收款账号
+            receive_accounts_key_event() {
+                this.get_data();
+            },
+            // 转账币
+            coin_change(e) {
+                this.setData({
+                    coin: e.detail.value,
+                });
+            },
+            // 备注
+            note_change(e) {
+                this.setData({
+                    note: e.detail.value,
+                });
+            },
+            // 转账密码
+            pwd_num_change(e) {
+                this.setData({
+                    pwd_num: e.detail.value,
+                });
+            },
+            // 立即转账
+            transfer_event(e) {
+                var new_data = {
+                    receive_accounts_id: this.receive_accounts_id,
+                    coin: this.coin,
+                    note: this.note,
+                    // pwd_num: this.pwd_num,
+                };
+                // 数据校验
+                var validation = [
+                    { fields: 'receive_accounts_key', msg: this.$t('transfer.transfer.1aijp1') },
+                    { fields: 'coin', msg: this.$t('transfer.transfer.d15853') },
+                ];
+                // 验证提交表单
+                if (app.globalData.fields_check(new_data, validation)) {
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('create', 'transfer', 'coin'),
+                        method: 'POST',
+                        data: new_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                                setTimeout(function () {
+                                    app.globalData.url_open('/pages/plugins/coin/transfer-list/transfer-list', true);
+                                }, 1000);
+                            } else {
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.stopPullDownRefresh();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+        },
+    };
+</script>
+<style>
+    @import './transfer.css';
+</style>
diff --git a/pages/plugins/coin/user/user.css b/pages/plugins/coin/user/user.css
new file mode 100644
index 0000000..1b0ec7f
--- /dev/null
+++ b/pages/plugins/coin/user/user.css
@@ -0,0 +1,43 @@
+/* 
+ * 顶部
+*/
+.coin-title {
+    background-size: 100% auto;
+    padding-top: 130rpx;
+    /* #ifndef H5  */
+    padding-top: calc(var(--status-bar-height) + 5px + 130rpx);
+    /* #endif */
+    border-bottom-left-radius: 60rpx;
+    border-bottom-right-radius: 60rpx;
+}
+
+.coin-operate-list {
+    --size: 96rpx;
+    width: var(--size);
+    height: var(--size);
+    border-radius: 32rpx;
+}
+
+/* 
+ * 内容
+*/
+.coin-content .coin-item {
+    max-height: calc(100vh - 688rpx);
+    /* #ifndef H5  */
+    max-height: calc(100vh - 688rpx - var(--status-bar-height) - 5px);
+    /* #endif */
+    overflow-y: auto;
+}
+
+.coin-content-list-img {
+    --size: 80rpx;
+    width: var(--size);
+    height: var(--size) !important;
+}
+
+/* 
+ * 明细弹窗
+*/
+.popup_user_detail_container .item {
+    background: #EFF0F1;
+}
\ No newline at end of file
diff --git a/pages/plugins/coin/user/user.vue b/pages/plugins/coin/user/user.vue
new file mode 100644
index 0000000..6cbd4ff
--- /dev/null
+++ b/pages/plugins/coin/user/user.vue
@@ -0,0 +1,257 @@
+<template>
+    <view :class="theme_view">
+        <component-nav-back></component-nav-back>
+        <view v-if="(data_base || null) != null">
+            <scroll-view :scroll-y="true" class="scroll-box" lower-threshold="60" @scroll="scroll_event">
+                <view class="coin-title flex-col padding-lg" :style="'background-image:url(' + wallet_static_url + 'user-head-bg.png)'">
+                    <view class="margin-bottom-main flex-row jc-sb align-c">
+                        <view>
+                            <view class="cr-base text-size-md">{{$t('user.user.67p34x')}}</view>
+                            <view class="text-size-40 fw-b">{{ is_price_show ? accounts_summary : '***' }}</view>
+                        </view>
+                        <view @tap="price_change">
+                            <iconfont :name="is_price_show ? 'icon-wodeqianbao-eye' : 'icon-eye-half'" size="44rpx"></iconfont>
+                        </view>
+                    </view>
+                    <view class="flex-row jc-sb padding-bottom-main">
+                        <view v-if="data_base.is_enable_recharge == 1" class="tc text-size-xs" data-value="/pages/plugins/coin/recharge/recharge" @tap="url_event">
+                            <view class="coin-operate-list bg-white flex-row align-c jc-c margin-bottom-main">
+                                <iconfont name="icon-recharge" size="44rpx" color="#635BFF"></iconfont>
+                            </view>
+                            <view>{{$t('recharge.recharge.otwkjn')}}</view>
+                        </view>
+                        <view v-if="data_base.is_enable_convert == 1" class="tc text-size-xs" data-value="/pages/plugins/coin/convert/convert" @tap="url_event">
+                            <view class="coin-operate-list bg-white flex-row align-c jc-c margin-bottom-main">
+                                <iconfont name="icon-convert-o" size="44rpx" color="#635BFF"></iconfont>
+                            </view>
+                            <view>{{$t('pages.plugins-coin-convert')}}</view>
+                        </view>
+                        <view v-if="data_base.is_enable_cash == 1" class="tc text-size-xs" data-value="/pages/plugins/coin/cash/cash" @tap="url_event">
+                            <view class="coin-operate-list bg-white flex-row align-c jc-c margin-bottom-main">
+                                <iconfont name="icon-cash" size="44rpx" color="#635BFF"></iconfont>
+                            </view>
+                            <view>{{$t('user.user.8752a4')}}</view>
+                        </view>
+                        <view class="tc text-size-xs" data-value="/pages/plugins/coin/detail/detail" data-method="true" @tap="url_event">
+                            <view class="coin-operate-list bg-white flex-row align-c jc-c margin-bottom-main">
+                                <iconfont name="icon-detail" size="44rpx" color="#635BFF"></iconfont>
+                            </view>
+                            <view>{{$t('pages.plugins-coin-detail')}}</view>
+                        </view>
+                    </view>
+                </view>
+                <view v-if="accounts_list.length > 0" class="coin-content padding-lg">
+                    <view class="bg-white radius-lg padding-sm">
+                        <view class="coin-item padding-main">
+                            <view v-for="(item, index) in accounts_list" :key="index" class="flex-row jc-sb align-c" :class="accounts_list.length == index + 1 ? '' : 'br-b-f5 margin-bottom-lg padding-bottom-lg'" :data-value="'/pages/plugins/coin/detail/detail?id=' + item.id" @tap="url_event">
+                                <view class="flex-1 flex-width flex-row align-c padding-right-main">
+                                    <image v-if="item.platform_icon" :src="item.platform_icon" mode="widthFix" class="coin-content-list-img round" />
+                                    <text class="fw-b single-text margin-left-main">{{ item.platform_name }}</text>
+                                </view>
+                                <view class="flex-col align-e">
+                                    <view class="margin-bottom-xss text-size">{{ item.platform_symbol }} {{ item.normal_coin }}</view>
+                                    <view class="cr-grey-9 text-size-xs">{{ item.default_symbol }} {{ item.default_coin }}</view>
+                                </view>
+                            </view>
+                            <!-- 结尾 -->
+                            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+                        </view>
+                    </view>
+                </view>
+                <view v-else>
+                    <!-- 提示信息 -->
+                    <component-no-data propStatus="0"></component-no-data>
+                </view>
+            </scroll-view>
+            <!-- 明细 -->
+            <component-popup :propShow="popup_user_detail_status" propPosition="bottom" @onclose="popup_user_detail_close_event">
+                <view class="padding-horizontal-main padding-top-main bg-white">
+                    <view class="oh">
+                        <text class="text-size">{{$t('pages.plugins-coin-detail')}}</text>
+                        <view class="fr" @tap.stop="popup_user_detail_close_event">
+                            <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                        </view>
+                    </view>
+                    <view class="popup_user_detail_container padding-vertical-main flex-row flex-wrap align-c tc text-size">
+                        <view class="flex-width-half">
+                            <view class="item padding-vertical-lg radius margin-sm" data-value="/pages/plugins/coin/recharge-list/recharge-list" @tap="url_event">{{$t('pages.plugins-coin-recharge-list')}}</view>
+                        </view>
+                        <view class="flex-width-half">
+                            <view class="item padding-vertical-lg radius margin-sm" data-value="/pages/plugins/coin/transfer-list/transfer-list" @tap="url_event">{{$t('pages.plugins-coin-transfer-list')}}</view>
+                        </view>
+                        <view class="flex-width-half">
+                            <view class="item padding-vertical-lg radius margin-sm" data-value="/pages/plugins/coin/transaction-list/transaction-list" @tap="url_event">{{$t('pages.plugins-coin-transaction-list')}}</view>
+                        </view>
+                        <view class="flex-width-half">
+                            <view class="item padding-vertical-lg radius margin-sm" data-value="/pages/plugins/coin/cash-list/cash-list" @tap="url_event">{{$t('pages.plugins-coin-cash-list')}}</view>
+                        </view>
+                        <view class="flex-width-half">
+                            <view class="item padding-vertical-lg radius margin-sm" data-value="/pages/plugins/coin/convert-list/convert-list" @tap="url_event">{{$t('pages.plugins-coin-convert-list')}}</view>
+                        </view>
+                    </view>
+                </view>
+            </component-popup>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNavBack from '@/components/nav-back/nav-back';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentPopup from '@/components/popup/popup';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    var wallet_static_url = app.globalData.get_static_url('coin', true) + 'app/';
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                wallet_static_url: wallet_static_url,
+                status_bar_height: bar_height,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+
+                // 是否显示虚拟币
+                is_price_show: false,
+                data_base: null,
+                // 虚拟币数量
+                accounts_summary: 0,
+                accounts_list: [],
+                // 明细弹窗
+                popup_user_detail_status: false,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNavBack,
+            componentNoData,
+            componentPopup,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+        methods: {
+            init(e) {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'user', 'coin'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_base: data.base || null,
+                                accounts_list: data.accounts_list || [],
+                                accounts_summary: data.accounts_summary || 0,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: false,
+                            });
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 显示隐藏虚拟币
+            price_change() {
+                this.setData({
+                    is_price_show: !this.is_price_show,
+                });
+            },
+
+            // 明细弹窗打开
+            popup_user_detail_open_event() {
+                this.setData({
+                    popup_user_detail_status: true,
+                });
+            },
+            // 明细弹窗关闭
+            popup_user_detail_close_event(e) {
+                this.setData({
+                    popup_user_detail_status: false,
+                });
+            },
+
+            // 页面滚动监听
+            scroll_event(e) {
+                uni.$emit('onPageScroll', e.detail);
+            },
+
+            // url事件
+            url_event(e) {
+                if (e.currentTarget.dataset.method) {
+                    this.popup_user_detail_open_event();
+                } else {
+                    app.globalData.url_event(e);
+                }
+            },
+        },
+    };
+</script>
+<style>
+    @import './user.css';
+</style>
diff --git a/pages/plugins/coupon/detail/detail.vue b/pages/plugins/coupon/detail/detail.vue
new file mode 100644
index 0000000..35e9179
--- /dev/null
+++ b/pages/plugins/coupon/detail/detail.vue
@@ -0,0 +1,206 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data_base || null) != null" class="ht bg-white">
+            <view class="plugins-coupon-container">
+                <view class="coupon-content padding-top-main page-bottom-fixed">
+                    <!-- 优惠劵列表 -->
+                    <block v-if="(data || null) != null">
+                        <component-coupon-card :propData="data" :propStatusType="data.status_type" :propStatusOperableName="data.status_operable_name" propIndex="0" propIsProgress @call-back="coupon_receive_event"></component-coupon-card>
+                    </block>
+                    <block v-else>
+                        <!-- 提示信息 -->
+                        <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+                    </block>
+
+                    <!-- 结尾 -->
+                    <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+                </view>
+            </view>
+            <view class="bottom-fixed">
+                <view class="bottom-line-exclude">
+                    <button class="item round cr-main bg-white br-main text-size wh-auto" type="default" hover-class="none" data-value="/pages/plugins/coupon/user/user" @tap="url_event">{{$t('index.index.lk0i6c')}}</button>
+                </view>
+            </view>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentCouponCard from '@/components/coupon-card/coupon-card.vue';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                params: {},
+                data: null,
+                data_base: null,
+                // 优惠劵领取
+                temp_coupon_receive_index: null,
+                temp_coupon_receive_value: null,
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentCouponCard,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.get_data();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+        methods: {
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('detail', 'index', 'coupon'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_base: data.base || null,
+                                data: data.data || null,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: false,
+                            });
+                            if ((this.data || null) != null) {
+                                // 基础自定义分享
+                                this.setData({
+                                    share_info: {
+                                        title: this.data.name,
+                                        desc: this.data.desc,
+                                        path: '/pages/plugins/coupon/detail/detail',
+                                        query: 'id='+this.data.id
+                                    },
+                                });
+
+                                // 导航名称
+                                uni.setNavigationBarTitle({
+                                    title: this.data.name,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 0,
+                                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: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+            // 优惠劵领取事件
+            coupon_receive_event(index, value) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                // 参数处理
+                if ((index || null) == null && (value || null) == null) {
+                    var index = this.temp_coupon_receive_index;
+                    var value = this.temp_coupon_receive_value;
+                } else {
+                    this.setData({
+                        temp_coupon_receive_index: index,
+                        temp_coupon_receive_value: value,
+                    });
+                }
+                // 登录校验
+                var user = app.globalData.get_user_info(this, 'coupon_receive_event');
+                if (user != false) {
+                    var data = this.data;
+                    if (data['is_operable'] != 0) {
+                        uni.showLoading({
+                            title: this.$t('common.processing_in_text'),
+                        });
+                        uni.request({
+                            url: app.globalData.get_request_url('receive', 'coupon', 'coupon'),
+                            method: 'POST',
+                            data: {
+                                coupon_id: value,
+                            },
+                            dataType: 'json',
+                            success: (res) => {
+                                uni.hideLoading();
+                                if (res.data.code == 0) {
+                                    app.globalData.showToast(res.data.msg, 'success');
+                                    data = res.data.data.coupon;
+                                    this.setData({
+                                        data_list: data,
+                                    });
+                                } else {
+                                    if (app.globalData.is_login_check(res.data, this, 'coupon_receive_event')) {
+                                        app.globalData.showToast(res.data.msg);
+                                    }
+                                }
+                            },
+                            fail: () => {
+                                uni.hideLoading();
+                                app.globalData.showToast(this.$t('common.internet_error_tips'));
+                            },
+                        });
+                    }
+                }
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        }
+    };
+</script>
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/pages/plugins/coupon/index/index.css b/pages/plugins/coupon/index/index.css
new file mode 100644
index 0000000..16affab
--- /dev/null
+++ b/pages/plugins/coupon/index/index.css
@@ -0,0 +1,38 @@
+/**
+ * 领券中心
+ */
+.plugins-coupon-container {
+    padding-top: 408rpx;
+    height: calc(100vh - 500rpx - var(--status-bar-height) - 5px);
+    /* #ifdef H5 */
+    padding-top: 408rpx;
+    height: calc(100vh - 560rpx);
+    /* #endif */
+}
+
+.coupon-content {
+    border-top: 42rpx solid #fff;
+    border-radius: 32rpx 32rpx 0 0;
+    min-height: calc(100% - 42rpx);
+}
+
+.coupon-content .item {
+    padding: 0 24rpx 24rpx 24rpx;
+}
+
+.popup-btn {
+    border: 2rpx solid #FF6E01;
+    color: #FF6E01;
+    border-radius: 22px;
+    font-size: 32rpx;
+    padding: 20rpx 0;
+}
+
+@media screen and (min-width: 960px) {
+    .plugins-coupon-container {
+        /* #ifdef H5 */
+        padding-top: 450px;
+        height: calc(100vh - 525px);
+        /* #endif */
+    }
+}
\ No newline at end of file
diff --git a/pages/plugins/coupon/index/index.vue b/pages/plugins/coupon/index/index.vue
new file mode 100644
index 0000000..8e9cb3f
--- /dev/null
+++ b/pages/plugins/coupon/index/index.vue
@@ -0,0 +1,231 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="(data_base || null) != null">
+            <component-nav-back :propName="data_base.application_name || $t('index.index.p4872s')"></component-nav-back>
+            <view class="pr">
+                <view class="pa top-0 bg-img wh-auto">
+                    <image class="wh-auto dis-block" :src="data_base.app_banner_images || coupon_static_url + 'coupon-bg.png'" mode="widthFix" :data-value="data_base.url || ''" @tap="url_event"></image>
+                </view>
+                <view class="plugins-coupon-container">
+                    <view class="coupon-content bg-white pr page-bottom-fixed">
+                        <!-- 优惠劵列表 -->
+                        <view v-if="data_list.length > 0" class="flex-col">
+                            <block v-for="(item, index) in data_list" :key="index">
+                                <component-coupon-card :propData="item" :propStatusType="item.status_type" :propStatusOperableName="item.status_operable_name" :propIndex="index" propIsProgress @call-back="coupon_receive_event"></component-coupon-card>
+                            </block>
+                        </view>
+                        <block v-else>
+                            <!-- 提示信息 -->
+                            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+                        </block>
+
+                        <!-- 结尾 -->
+                        <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+                    </view>
+                </view>
+                <view class="bottom-fixed">
+                    <view class="bottom-line-exclude">
+                        <button class="item round cr-main bg-white br-main text-size wh-auto" type="default" hover-class="none" data-value="/pages/plugins/coupon/user/user" @tap="url_event">{{$t('index.index.lk0i6c')}}</button>
+                    </view>
+                </view>
+            </view>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNavBack from '@/components/nav-back/nav-back';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentCouponCard from '@/components/coupon-card/coupon-card.vue';
+    var coupon_static_url = app.globalData.get_static_url('coupon', true);
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                coupon_static_url: coupon_static_url + 'app/',
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_list: [],
+                data_base: null,
+                // 优惠劵领取
+                temp_coupon_receive_index: null,
+                temp_coupon_receive_value: null,
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+        components: {
+            componentCommon,
+            componentNavBack,
+            componentNoData,
+            componentBottomLine,
+            componentCouponCard,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data_list();
+        },
+        methods: {
+            // 获取数据
+            init() {
+                this.get_data_list();
+            },
+            // 获取数据
+            get_data_list() {
+                if (this.data_list.length <= 0) {
+                    this.setData({
+                        data_list_loding_status: 1,
+                    });
+                }
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'index', 'coupon'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var status = (data.data || []).length > 0;
+                            this.setData({
+                                data_base: data.base || null,
+                                data_list: data.data || [],
+                                data_list_loding_msg: '',
+                                data_list_loding_status: status ? 3 : 0,
+                                data_bottom_line_status: status,
+                            });
+                            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/coupon/index/index',
+                                    },
+                                });
+
+                                // #ifndef MP-ALIPAY
+                                // 导航名称
+                                if ((this.data_base.application_name || null) != null) {
+                                    uni.setNavigationBarTitle({
+                                        title: this.data_base.application_name,
+                                    });
+                                }
+                                // #endif
+                            }
+                        } 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: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+            // 优惠劵领取事件
+            coupon_receive_event(index, value) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                // 参数处理
+                if ((index || null) == null && (value || null) == null) {
+                    var index = this.temp_coupon_receive_index;
+                    var value = this.temp_coupon_receive_value;
+                } else {
+                    this.setData({
+                        temp_coupon_receive_index: index,
+                        temp_coupon_receive_value: value,
+                    });
+                }
+                // 登录校验
+                var user = app.globalData.get_user_info(this, 'coupon_receive_event');
+                if (user != false) {
+                    var temp_list = this.data_list;
+                    if (temp_list[index]['is_operable'] != 0) {
+                        uni.showLoading({
+                            title: this.$t('common.processing_in_text'),
+                        });
+                        uni.request({
+                            url: app.globalData.get_request_url('receive', 'coupon', 'coupon'),
+                            method: 'POST',
+                            data: {
+                                coupon_id: value,
+                            },
+                            dataType: 'json',
+                            success: (res) => {
+                                uni.hideLoading();
+                                if (res.data.code == 0) {
+                                    app.globalData.showToast(res.data.msg, 'success');
+                                    temp_list[index] = res.data.data.coupon;
+                                    this.setData({
+                                        data_list: temp_list,
+                                    });
+                                } else {
+                                    if (app.globalData.is_login_check(res.data, this, 'coupon_receive_event')) {
+                                        app.globalData.showToast(res.data.msg);
+                                    }
+                                }
+                            },
+                            fail: () => {
+                                uni.hideLoading();
+                                app.globalData.showToast(this.$t('common.internet_error_tips'));
+                            },
+                        });
+                    }
+                }
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 页面滚动监听
+            onPageScroll(res) {
+                uni.$emit('onPageScroll', res);
+            },
+        },
+    };
+</script>
+<style scoped>
+    @import './index.css';
+</style>
diff --git a/pages/plugins/coupon/shop/shop.css b/pages/plugins/coupon/shop/shop.css
new file mode 100644
index 0000000..7146199
--- /dev/null
+++ b/pages/plugins/coupon/shop/shop.css
@@ -0,0 +1,11 @@
+/**
+ * 领券中心
+ */
+.coupon-content .item {
+    padding: 0 24rpx 24rpx 24rpx;
+}
+
+.popup-bottom {
+    box-shadow: inset 0px 1px 3px 0px rgba(0, 0, 0, 0.08);
+    z-index: 2;
+}
\ No newline at end of file
diff --git a/pages/plugins/coupon/shop/shop.vue b/pages/plugins/coupon/shop/shop.vue
new file mode 100644
index 0000000..2aa81e1
--- /dev/null
+++ b/pages/plugins/coupon/shop/shop.vue
@@ -0,0 +1,231 @@
+<template>
+    <view :class="theme_view">
+        <view class="plugins-coupon-container">
+            <!-- 优惠劵列表 -->
+            <view v-if="data_list.length > 0" class="coupon-content bg-white pr padding-top-main page-bottom-fixed">
+                <view class="flex-col">
+                    <block v-for="(item, index) in data_list" :key="index">
+                        <component-coupon-card :propData="item" :propStatusType="item.status_type" :propStatusOperableName="item.status_operable_name" :propIndex="index" propIsProgress @call-back="coupon_receive_event"></component-coupon-card>
+                    </block>
+                </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>
+        <!-- 回到店铺 -->
+        <view v-if="(shop || null) != null" class="popup-bottom bottom-fixed bg-white">
+            <view class="bottom-line-exclude">
+                <button class="bg-white cr-main br-main round dis-block text-size" type="default" hover-class="none" :data-value="shop.url" @tap="shop_event">{{ $t('index.index.i78v36') }}</button>
+            </view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentCouponCard from '@/components/coupon-card/coupon-card.vue';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                params: null,
+                data_list: [],
+                data_base: null,
+                shop: null,
+                // 优惠劵领取
+                temp_coupon_receive_index: null,
+                temp_coupon_receive_value: null,
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentCouponCard,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data_list();
+        },
+
+        methods: {
+            // 获取数据
+            init() {
+                this.get_data_list();
+            },
+
+            // 获取数据
+            get_data_list() {
+                if (this.data_list.length <= 0) {
+                    this.setData({
+                        data_list_loding_status: 1,
+                    });
+                }
+                uni.request({
+                    url: app.globalData.get_request_url('shop', 'index', 'coupon'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var status = (data.data || []).length > 0;
+                            this.setData({
+                                data_base: data.base || null,
+                                shop: data.shop || null,
+                                data_list: data.data || [],
+                                data_list_loding_msg: '',
+                                data_list_loding_status: status ? 3 : 0,
+                                data_bottom_line_status: status,
+                            });
+
+                            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/coupon/shop/shop',
+                                    },
+                                });
+
+                                // 导航名称
+                                if ((this.data_base.shop_application_name || null) != null) {
+                                    uni.setNavigationBarTitle({
+                                        title: this.data_base.shop_application_name,
+                                    });
+                                }
+                            }
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            app.globalData.showToast(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: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 优惠劵领取事件
+            coupon_receive_event(index, value) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                // 参数处理
+                if ((index || null) == null && (value || null) == null) {
+                    var index = this.temp_coupon_receive_index;
+                    var value = this.temp_coupon_receive_value;
+                } else {
+                    this.setData({
+                        temp_coupon_receive_index: index,
+                        temp_coupon_receive_value: value,
+                    });
+                }
+                // 登录校验
+                var user = app.globalData.get_user_info(this, 'coupon_receive_event');
+                if (user != false) {
+                    var temp_list = this.data_list;
+                    if (temp_list[index]['is_operable'] != 0) {
+                        uni.showLoading({
+                            title: this.$t('common.processing_in_text'),
+                        });
+                        uni.request({
+                            url: app.globalData.get_request_url('receive', 'coupon', 'coupon'),
+                            method: 'POST',
+                            data: {
+                                coupon_id: value,
+                            },
+                            dataType: 'json',
+                            success: (res) => {
+                                uni.hideLoading();
+                                if (res.data.code == 0) {
+                                    app.globalData.showToast(res.data.msg, 'success');
+                                    temp_list[index] = res.data.data.coupon;
+                                    this.setData({
+                                        data_list: temp_list,
+                                    });
+                                } else {
+                                    if (app.globalData.is_login_check(res.data, this, 'coupon_receive_event')) {
+                                        app.globalData.showToast(res.data.msg);
+                                    }
+                                }
+                            },
+                            fail: () => {
+                                uni.hideLoading();
+                                app.globalData.showToast(this.$t('common.internet_error_tips'));
+                            },
+                        });
+                    }
+                }
+            },
+
+            // 店铺事件
+            shop_event(e) {
+                var prev_url = app.globalData.prev_page();
+                if (prev_url != null && prev_url.indexOf('pages/plugins/shop/detail/detail') != -1) {
+                    uni.navigateBack();
+                } else {
+                    app.globalData.url_event(e);
+                }
+            },
+        },
+    };
+</script>
+<style>
+    @import './shop.css';
+</style>
diff --git a/pages/plugins/coupon/user/user.css b/pages/plugins/coupon/user/user.css
new file mode 100644
index 0000000..988e523
--- /dev/null
+++ b/pages/plugins/coupon/user/user.css
@@ -0,0 +1,15 @@
+/*
+* 导航
+*/
+.nav-base .item {
+    width: 33.33%;
+}
+
+/*
+* 数据列表
+*/
+.plugins-coupon-container .item,
+.plugins-coupon-container .v-right,
+.plugins-coupon-container .v-right .circle {
+    height: 230rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/coupon/user/user.vue b/pages/plugins/coupon/user/user.vue
new file mode 100644
index 0000000..eeea467
--- /dev/null
+++ b/pages/plugins/coupon/user/user.vue
@@ -0,0 +1,197 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav-base bg-white">
+            <block v-for="(item, index) in nav_tabs_list" :key="index">
+                <view :class="'item fl tc cr-grey ' + (item.value == nav_tabs_value ? 'cr-main nav-active-line' : '')" :data-index="index" :data-value="item.value" @tap="nav_tabs_event">{{ item.name }} </view>
+            </block>
+        </view>
+        <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" lower-threshold="60">
+            <!-- 优惠劵列表 -->
+            <view v-if="data_list != null" class="plugins-coupon-container padding-top-main">
+                <!-- 未使用 -->
+                <block v-if="(data_list.not_use || null) != null && data_list.not_use.length > 0 && nav_tabs_value == 'not_use'">
+                    <block v-for="(item, index) in data_list.not_use" :key="index">
+                        <component-coupon-card :propData="item.coupon" :propStartTime="item.time_start_show_text" :propEndTime="item.time_end_show_text" :propStatusType="item.status_type" :propStatusOperableName="item.status_operable_name" propBg="#f5f5f5"></component-coupon-card>
+                    </block>
+                </block>
+
+                <!-- 已使用 -->
+                <block v-if="(data_list.already_use || null) != null && data_list.already_use.length > 0 && nav_tabs_value == 'already_use'">
+                    <block v-for="(item, index) in data_list.already_use" :key="index">
+                        <component-coupon-card :propData="item.coupon" :propStartTime="item.time_start_show_text" :propEndTime="item.time_end_show_text" :propStatusType="item.status_type" :propStatusOperableName="item.status_operable_name" propBg="#f5f5f5"></component-coupon-card>
+                    </block>
+                </block>
+
+                <!-- 已过期 -->
+                <block v-if="(data_list.already_expire || null) != null && data_list.already_expire.length > 0 && nav_tabs_value == 'already_expire'">
+                    <block v-for="(item, index) in data_list.already_expire" :key="index">
+                        <component-coupon-card :propData="item.coupon" :propStartTime="item.time_start_show_text" :propEndTime="item.time_end_show_text" :propStatusType="item.status_type" :propStatusOperableName="item.status_operable_name" propBg="#f5f5f5"></component-coupon-card>
+                    </block>
+                </block>
+            </view>
+
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg" :propUrl="coupon_static_url + 'no-data.png'"></component-no-data>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentCouponCard from '@/components/coupon-card/coupon-card.vue';
+    const coupon_static_url = app.globalData.get_static_url('coupon', true);
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                coupon_static_url: coupon_static_url + 'app/',
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_list: null,
+                nav_tabs_list: [
+                    {
+                        name: this.$t('user.user.s3y4ji'),
+                        value: 'not_use',
+                    },
+                    {
+                        name: this.$t('user.user.pggs6s'),
+                        value: 'already_use',
+                    },
+                    {
+                        name: this.$t('user.user.528t26'),
+                        value: 'already_expire',
+                    },
+                ],
+                nav_tabs_value: 'not_use',
+                // 首页地址
+                home_page_url: app.globalData.app_tabbar_pages()[0],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentCouponCard,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data_list();
+        },
+
+        methods: {
+            // 获取数据
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list() {
+                if (this.data_list == null || (this.data_list[this.nav_tabs_value] || null) == null || this.data_list[this.nav_tabs_value].length <= 0) {
+                    this.setData({
+                        data_list_loding_status: 1,
+                    });
+                }
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'coupon', 'coupon'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            this.setData({
+                                data_list: res.data.data || null,
+                                data_list_loding_msg: this.$t('user.user.3ks1wi'),
+                            });
+                            this.data_view_handle();
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+
+            // 数据处理
+            data_view_handle() {
+                if(this.data_list_loding_status != 2) {
+                    var status = 0;
+                    if (this.data_list != null && (this.data_list[this.nav_tabs_value] || null) != null && this.data_list[this.nav_tabs_value].length > 0) {
+                        status = 3;
+                    }
+                    this.setData({
+                        data_list_loding_status: status,
+                        data_bottom_line_status: status == 3,
+                    });
+                }
+            },
+
+            // 导航事件
+            nav_tabs_event(e) {
+                this.setData({
+                    nav_tabs_value: e.currentTarget.dataset.value,
+                });
+                this.data_view_handle();
+            },
+        },
+    };
+</script>
+<style>
+    @import './user.css';
+</style>
diff --git a/pages/plugins/delivery/logistics/logistics.css b/pages/plugins/delivery/logistics/logistics.css
new file mode 100644
index 0000000..dc2b76f
--- /dev/null
+++ b/pages/plugins/delivery/logistics/logistics.css
@@ -0,0 +1,20 @@
+.map-container {
+    height: 100vh;
+}
+.team {
+    left: 20rpx;
+    bottom: calc(env(safe-area-inset-bottom) + 20rpx);
+    width: calc(100% - 40rpx);
+    background-color: rgb(255 255 255 / 0.85);
+}
+.team .base .avatar {
+    width: 80rpx;
+    height: 80rpx;
+}
+.team .tel {
+    right: 20rpx;
+    top: calc(50% - 27rpx);
+    line-height: 54rpx;
+    height: 54rpx;
+    width: 54rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/delivery/logistics/logistics.vue b/pages/plugins/delivery/logistics/logistics.vue
new file mode 100644
index 0000000..18aa740
--- /dev/null
+++ b/pages/plugins/delivery/logistics/logistics.vue
@@ -0,0 +1,169 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="data_list_loding_status == 3">
+            <view class="map-container pr">
+                <map class="wh-auto ht-auto"
+                    :enable-zoom="true"
+                    :enable-scroll="true"
+                    :show-location="true"
+                    :latitude="latitude"
+                    :longitude="longitude"
+                    :scale="scale"
+                    :markers="markers"
+                    :polyline="polyline"
+                ></map>
+                <view class="team bs-bb oh pa border-radius-main padding-main">
+                    <view class="top pr">
+                        <view class="base">
+                            <image class="avatar circle br va-m" :src="team.work_photo" mode="aspectFit"></image>
+                            <text class="cr-base text-size-sm margin-left-sm">{{team.idcard_name}}</text>
+                        </view>
+                        <view v-if="(team.user.mobile || null) != null" class="tel circle bg-base br tc cp pa" data-event="tel" :data-value="team.user.mobile" @tap="text_event">
+                            <uni-icons type="phone" size="34rpx" color="#fd8008"></uni-icons>
+                        </view>
+                    </view>
+                    <view class="br-t-dashed margin-top-sm padding-top-sm text-size-sm cr-base">
+                        <view>
+                            <text>{{$t('logistics.logistics.dxu6ql')}}</text>
+                            <text v-if="(start_delivery_time || null) != null">{{start_delivery_time}}</text>
+                            <text v-else class="cr-grey-9">{{$t('logistics.logistics.5542tq')}}</text>
+                        </view>
+                        <view class="margin-top-sm">
+                            <text>{{$t('logistics.logistics.895ug2')}}</text>
+                            <text v-if="(success_delivery_time || null) != null">{{success_delivery_time}}</text>
+                            <text v-else class="cr-grey-9">{{$t('logistics.logistics.76q0ii')}}</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    var plugins_static_url = app.globalData.get_static_url('delivery', true);
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_msg: '',
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                params: {},
+                scale: 10,
+                latitude: 39.909,
+                longitude: 116.39742,
+                markers: [],
+                polyline: [],
+                team: null,
+                start_delivery_time: null,
+                success_delivery_time: null,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        methods: {
+            // 初始化
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("logistics", "order", "delivery"),
+                    method: "POST",
+                    data: this.params,
+                    dataType: "json",
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                latitude: data.latitude || 39.909,
+                                longitude: data.longitude || 116.39742,
+                                markers: data.markers || [],
+                                polyline: data.polyline || [],
+                                scale: data.scale || 10,
+                                team: data.team || null,
+                                start_delivery_time: data.start_delivery_time || null,
+                                success_delivery_time: data.success_delivery_time || null,
+                                data_list_loding_status: 3,
+                                data_list_loding_msg: ''
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips')
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 文本事件
+            text_event(e) {
+                app.globalData.text_event_handle(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import "./logistics.css";
+</style>
\ No newline at end of file
diff --git a/pages/plugins/delivery/order-detail/order-detail.css b/pages/plugins/delivery/order-detail/order-detail.css
new file mode 100644
index 0000000..f07a58c
--- /dev/null
+++ b/pages/plugins/delivery/order-detail/order-detail.css
@@ -0,0 +1,48 @@
+/*
+* 商品信息
+*/
+.goods-base {
+    min-height: 160rpx;
+    margin-left: 180rpx;
+}
+.goods .goods-item:last-child {
+    border-bottom: 0;
+}
+.goods-image {
+    width: 160rpx;
+    height: 160rpx;
+}
+
+/*
+* 地址信息
+*/
+.address-base,
+.address-detail {
+    padding: 10rpx 0;
+}
+.address-detail .icon {
+    width: 30rpx;
+    height: 35rpx !important;
+}
+.address-detail .text {
+    width: calc(100% - 40rpx);
+}
+.address-detail .text {
+    line-height: 36rpx;
+}
+.address-alias,
+.address-map-submit {
+    padding: 0 15rpx;
+    line-height: 40rpx;
+}
+
+/**
+ * 图片列表
+ */
+.images-list .item-images {
+    width: 80rpx;
+    height: 80rpx;
+}
+.images-list .item-images:not(:last-child) {
+    margin-right: 10rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/delivery/order-detail/order-detail.vue b/pages/plugins/delivery/order-detail/order-detail.vue
new file mode 100644
index 0000000..3ae63b3
--- /dev/null
+++ b/pages/plugins/delivery/order-detail/order-detail.vue
@@ -0,0 +1,261 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="detail != null">
+            <view class="padding-horizontal-main padding-top-main">
+                <!-- 发货地址 -->
+                <view v-if="(detail.warehouse_address || null) != null" class="bg-white padding-main border-radius-main spacing-mb">
+                    <view class="br-b padding-bottom-sm fw-b text-size">{{$t('order.order.jhgfd1')}}</view>
+                    <view class="address-base oh margin-top-sm">
+                        <text v-if="(detail.warehouse_address.alias || null) != null" class="address-alias round br-main cr-main bg-white margin-right-sm">{{detail.warehouse_address.alias}}</text>
+                        <text data-event="copy" :data-value="detail.warehouse_address.name" @tap="text_event">{{detail.warehouse_address.name}}</text>
+                        <text class="fr" data-event="tel" :data-value="detail.warehouse_address.tel" @tap="text_event">{{detail.warehouse_address.tel}}</text>
+                    </view>
+                    <view class="address-detail oh margin-bottom-main">
+                        <image class="icon fl" :src="common_static_url+'map-icon.png'" mode="widthFix"></image>
+                        <view class="text fr">
+                            <text data-event="copy" :data-value="detail.warehouse_address.address_info" @tap="text_event">{{detail.warehouse_address.address_info}}</text>
+                            <text v-if="(detail.warehouse_address.lng || 0) != 0 && (detail.warehouse_address.lat || 0) != 0" class="address-map-submit cr-base br round bg-white margin-left-sm text-size-xs" @tap="address_map_event">{{$t('user-order-detail.user-order-detail.7lp6gw')}}</text>
+                        </view>
+                    </view>
+                    <view class="address-divider margin-bottom-sm"></view>
+                </view>
+                
+                <!-- 收货地址 -->
+                <view v-if="(detail.user_address || null) != null" class="bg-white padding-main border-radius-main spacing-mb">
+                    <view class="br-b padding-bottom-sm fw-b text-size">{{$t('order.order.hbvwq4')}}</view>
+                    <view class="address-base oh margin-top-sm">
+                        <text v-if="(detail.user_address.alias || null) != null" class="address-alias round br-main cr-main bg-white margin-right-sm">{{detail.user_address.alias}}</text>
+                        <text data-event="copy" :data-value="detail.user_address.name" @tap="text_event">{{detail.user_address.name}}</text>
+                        <text class="fr" data-event="tel" :data-value="detail.user_address.tel" @tap="text_event">{{detail.user_address.tel}}</text>
+                    </view>
+                    <view v-if="(detail.user_address.appoint_time || null) != null" class="cr-red margin-top-xs">{{detail.user_address.appoint_time}}</view>
+                    <view class="address-detail oh margin-bottom-main">
+                        <image class="icon fl" :src="common_static_url+'map-icon.png'" mode="widthFix"></image>
+                        <view class="text fr">
+                            <text data-event="copy" :data-value="detail.user_address.address_info" @tap="text_event">{{detail.user_address.address_info}}</text>
+                            <text v-if="(detail.user_address.lng || 0) != 0 && (detail.user_address.lat || 0) != 0" class="address-map-submit cr-base br round bg-white margin-left-sm text-size-xs" @tap="address_map_event">{{$t('user-order-detail.user-order-detail.7lp6gw')}}</text>
+                        </view>
+                    </view>
+                    <view class="address-divider margin-bottom-sm"></view>
+                </view>
+
+                <!-- 基础信息 -->
+                <view v-if="detail_list.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('order-detail.order-detail.9er1pc')}}</view>
+                    <view class="panel-content oh">
+                        <view v-for="(item, index) in detail_list" :key="index" class="item br-b-dashed oh padding-vertical-main">
+                            <view class="title fl padding-right-main cr-gray">{{item.name}}</view>
+                            <view class="content fl br-l padding-left-main">
+                                <block v-if="(item.type || null) == 'images-list'">
+                                    <view v-if="(item.value || null) != null && item.value.length > 0" class="images-list">
+                                        <block v-for="(iv, ii) in item.value" :key="ii">
+                                            <image class="item-images radius fl dis-block br padding-xs" :src="iv" mode="aspectFit" :data-ii="ii" @tap="images_list_event"></image>
+                                        </block>
+                                    </view>
+                                </block>
+                                <block v-else>
+                                    <block v-if="(item.event || null) == null">
+                                        <text>{{item.value}}</text>
+                                    </block>
+                                    <block v-else>
+                                        <view data-event="copy" :data-value="item.value" @tap="text_event">{{item.value}}</view>
+                                    </block>
+                                </block>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 商品列表 -->
+                <view v-if="detail.goods_data.length > 0" class="goods bg-white padding-main border-radius-main spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.7f8p26')}}</view>
+                    <view v-for="(item, index) in detail.goods_data" :key="index" class="goods-item br-b-dashed oh padding-main">
+                        <view :data-value="item.goods_url" @tap="url_event" class="cp">
+                            <image class="goods-image fl radius" :src="item.images" mode="aspectFill"></image>
+                            <view class="goods-base pr">
+                                <view class="multi-text">{{item.title}}</view>
+                                <view v-if="item.spec != null" class="margin-top-sm">
+                                    <block v-for="(sv, si) in item.spec" :key="si">
+                                        <text v-if="si > 0" class="cr-grey padding-left-xs padding-right-xs">;</text>
+                                        <text class="cr-gray">{{sv.value}}</text>
+                                    </block>
+                                </view>
+                                <view class="margin-top-sm">
+                                    <text class="fw-b">{{detail.currency_data.currency_symbol}}{{item.price}}</text>
+                                    <text class="margin-left-sm">x{{item.buy_number}}</text>
+                                </view>
+                                <view v-if="detail.is_can_launch_aftersale == 1 && (item.orderaftersale_btn_text || null) != null" class="orderaftersale-btn-text cr-blue pa bg-white" @tap.stop="orderaftersale_event" :data-oid="detail.id" :data-did="item.id">{{item.orderaftersale_btn_text}}</view>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="padding-top-main tr cr-base text-size">
+                        <text>{{$t('user-order-detail.user-order-detail.423rmr')}}<text class="fw-b">{{detail.buy_number_count}}</text>{{$t('user-order-detail.user-order-detail.41ty94')}}<text class="sales-price margin-right-xs">{{detail.currency_data.currency_symbol}}{{detail.total_price}}</text></text>
+                    </view>
+                </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>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    var common_static_url = app.globalData.get_static_url('common');
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                detail: null,
+                detail_list: []
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+        
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.setData({
+                    data_list_loding_status: 1
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("detail", "order", "delivery"),
+                    method: 'POST',
+                    data: {
+                        id: this.params.id
+                    },
+                    dataType: 'json',
+                    success: res => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                detail: data.data,
+                                detail_list: [
+                                    { name: this.$t('order-detail.order-detail.36op8f'), value: data.data.main_order_no || '', event: 'copy' },
+                                    { name: this.$t('order-detail.order-detail.ygvc34'), value: data.data.merchant_name || '' },
+                                    { name: this.$t('order-detail.order-detail.x3ge6c'), value: data.data.total_price || '' },
+                                    { name: this.$t('order-detail.order-detail.8n1f72'), value: data.data.buy_number_count || '' },
+                                    { name: this.$t('order-detail.order-detail.2443o1'), value: data.data.status_name || '' },
+                                    { name: this.$t('order-detail.order-detail.342sfz'), value: data.data.start_delivery_time || '' },
+                                    { name: this.$t('order-detail.order-detail.2dw4gd'), value: data.data.success_delivery_time || '' },
+                                    { name: this.$t('order-detail.order-detail.r3bg45'), value: data.data.success_delivery_msg || '' },
+                                    { name: this.$t('order-detail.order-detail.521pp4'), value: data.data.success_delivery_images || '', type: 'images-list' },
+                                    { name: this.$t('order-detail.order-detail.u745i8'), value: data.data.abnormal_delivery_time || '' },
+                                    { name: this.$t('order.order.865029'), value: data.data.reason || '' },
+                                    { name: this.$t('order-detail.order-detail.5fq8pr'), value: data.data.add_time || '' },
+                                    { name: this.$t('common.upd_time'), value: data.data.upd_time || '' },
+                                ],
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: ''
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'init')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips')
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    }
+                });
+            },
+
+            // 图片列表查看
+            images_list_event(e) {
+                var ii = e.currentTarget.dataset.ii;
+                uni.previewImage({
+                    current: this.detail.success_delivery_images[ii],
+                    urls: this.detail.success_delivery_images
+                });
+            },
+
+            // 文本事件
+            text_event(e) {
+                app.globalData.text_event_handle(e);
+            },
+
+            // 地图查看
+            address_map_event(e) {
+                if ((this.detail.user_address || null) == null) {
+                    app.globalData.showToast(this.$t('user-order-detail.user-order-detail.i876o3'));
+                    return false;
+                }
+                
+                // 打开地图
+                var data = this.detail.user_address;
+                var name = data.alias || data.name || '';
+                app.globalData.open_location(data.lng, data.lat, name, data.address_info);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        }
+    };
+</script>
+<style>
+    @import './order-detail.css';
+</style>
\ No newline at end of file
diff --git a/pages/plugins/delivery/order/order.css b/pages/plugins/delivery/order/order.css
new file mode 100644
index 0000000..1d2ebf3
--- /dev/null
+++ b/pages/plugins/delivery/order/order.css
@@ -0,0 +1,62 @@
+/*
+* 头部
+*/
+.header {
+    height: 160rpx;
+}
+.nav-base .item {
+    width: 20%;
+}
+.nav-base .item .badge-icon {
+    top: -18rpx;
+    left: calc(50% + 52rpx);
+    z-index: 1;
+}
+.nav-search .search-keywords {
+    margin-right: 80rpx;
+}
+.nav-search .map-submit {
+    top: 0;
+    right: 20rpx;
+}
+
+/**
+ * 数据列表
+ */
+.scroll-box {
+    height: calc(100vh - 160rpx);
+}
+.data-list .address-info {
+    width: calc(100% - 58rpx);
+    word-wrap: break-word;
+    word-break: break-all;
+}
+.data-list .address-info .icon-item {
+    right: 0;
+    top: -6rpx;
+    line-height: 54rpx;
+    height: 54rpx;
+    width: 54rpx;
+}
+
+/**
+ * 地图
+ */
+.map-container {
+    height: calc(100vh - 160rpx);
+}
+.map-container .map-markers-active-data {
+    background-color: rgb(255 255 255 / 0.85);
+    width: calc(100% - 40rpx);
+    left: 20rpx;
+    bottom: 20rpx;
+    line-height: 58rpx;
+    box-shadow: 0 0 20rpx rgba(50,55,58,0.2);
+}
+.map-container .map-markers-active-data .map-send-icon {
+    right: 0;
+    top: calc(50% - 22rpx);
+    line-height: 54rpx;
+    height: 54rpx;
+    width: 54rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/delivery/order/order.vue b/pages/plugins/delivery/order/order.vue
new file mode 100644
index 0000000..aa121ab
--- /dev/null
+++ b/pages/plugins/delivery/order/order.vue
@@ -0,0 +1,853 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="nav_type_list.length > 0" class="header bg-white">
+            <!-- 导航 -->
+            <view class="nav-base">
+                <block v-for="(item, index) in nav_type_list" :key="index">
+                    <view :class="'item fl tc pr ' + (nav_type_index == index ? 'cr-main' : '')" :data-index="index" @tap="nav_event">
+                        <text>{{ item.name }}</text>
+                        <view class="badge-icon pa">
+                            <component-badge :propNumber="item.count || 0"></component-badge>
+                        </view>
+                    </view>
+                </block>
+            </view>
+            <!-- 关键字搜索 -->
+            <view class="padding-horizontal-main padding-bottom-main margin-top-xs pr nav-search">
+                <view class="search-keywords">
+                    <component-search
+                        @onsearch="search_submit_event"
+                        :propIsOnEvent="true"
+                        :propIsRequired="false"
+                        :propPlaceholder="$t('order.order.725882')"
+                        propClass="br"
+                        :propIsBtn="true"
+                        :propDefaultValue="search_input_keywords_value"
+                        <!-- #ifdef MP || APP -->
+                        propIcon="icon-scan"
+                        propIconColor="#333"
+                        @onicon="search_icon_event"
+                        :propIsIconOnEvent="true"
+                        <!-- #endif -->
+                    ></component-search>
+                    <view class="map-submit pa" data-event="copy" @tap="map_show_type_event">
+                        <uni-icons :type="(show_type == 0) ? 'map' : 'list'" size="56rpx" color="#999"></uni-icons>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <!-- 列表 -->
+        <scroll-view v-if="show_type == 0" :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+            <block v-if="data_list.length > 0">
+                <view class="data-list padding-horizontal-main padding-top-main">
+                    <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                        <view class="base oh br-b padding-bottom-main">
+                            <text class="cr-base">{{ item.add_time_concise || item.add_time }}</text>
+                            <text :class="'fr ' + (item.status == 4 ? 'cr-red' : item.status == 3 ? 'cr-green' : item.status == 2 ? 'cr-main' : 'cr-grey')">{{ item.status_name }}</text>
+                        </view>
+                        <view class="content margin-top">
+                            <view class="oh margin-top-sm">
+                                <view class="single-text fl" data-event="copy" :data-value="item.main_order_no" @tap="text_event">
+                                    <text class="cr-grey">{{$t('order.order.232ygr')}}</text>
+                                    <text class="cr-base margin-left-sm">{{ item.main_order_no }}</text>
+                                </view>
+                                <view class="single-text fr" data-event="copy" :data-value="item.main_order_id" @tap="text_event">
+                                    <text class="cr-grey">{{$t('order.order.71n22h')}}</text>
+                                    <text class="cr-base margin-left-sm">{{ item.main_order_id }}</text>
+                                </view>
+                            </view>
+                            <view v-if="(item.warehouse_address || null) != null" class="margin-top">
+                                <view class="cr-grey-d tc">{{$t('order.order.jhgfd1')}}</view>
+                                <view class="cr-base margin-top-xs">
+                                    <view>
+                                        <text data-event="copy" :data-value="item.warehouse_address.name" @tap="text_event">{{item.warehouse_address.name}}</text>
+                                        <text class="margin-left-xl" data-event="copy" :data-value="item.warehouse_address.tel" @tap="text_event">{{item.warehouse_address.tel}}</text>
+                                        <text v-if="(item.merchant_name || null) != null" class="fr" data-event="copy" :data-value="item.merchant_name" @tap="text_event">{{item.merchant_name}}</text>
+                                    </view>
+                                    <view class="pr margin-top-xs">
+                                        <view class="address-info">
+                                            <text class="cr-base" data-event="copy" :data-value="item.warehouse_address.address_info" @tap="text_event">{{ item.warehouse_address.address_info }}</text>
+                                            <view v-if="(item.warehouse_address.lng || 0) != 0 && (item.warehouse_address.lat || 0) != 0" class="icon-item bg-base circle dis-inline-block tc cp pa" data-type="warehouse_address" :data-index="index" @tap.stop="address_map_event">
+                                                <uni-icons type="paperplane-filled" size="32rpx" color="#666"></uni-icons>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                            <view v-if="(item.user_address || null) != null" class="margin-top">
+                                <view class="cr-grey-d tc">{{$t('order.order.hbvwq4')}}</view>
+                                <view class="cr-base margin-top-xs">
+                                    <view>
+                                        <text data-event="copy" :data-value="item.user_address.name" @tap="text_event">{{item.user_address.name}}</text>
+                                        <text class="margin-left-xl" data-event="copy" :data-value="item.user_address.tel" @tap="text_event">{{item.user_address.tel}}</text>
+                                    </view>
+                                    <view v-if="(item.user_address.extraction_contact_name || null) != null || (item.user_address.extraction_contact_tel || null) != null" class="padding-vertical-xs">
+                                        <text v-if="(item.user_address.extraction_contact_name || null) != null" class="margin-right-xl">{{item.user_address.extraction_contact_name}}</text>
+                                        <text v-if="(item.user_address.extraction_contact_tel || null) != null">{{item.user_address.extraction_contact_tel}}</text>
+                                    </view>
+                                    <view v-if="(item.user_address.appoint_time || null) != null" class="cr-red padding-vertical-xs">{{item.user_address.appoint_time}}</view>
+                                    <view class="pr margin-top-xs">
+                                        <view class="address-info">
+                                            <text class="cr-base" data-event="copy" :data-value="item.user_address.address_info" @tap="text_event">{{ item.user_address.address_info }}</text>
+                                            <view v-if="(item.user_address.lng || 0) != 0 && (item.user_address.lat || 0) != 0" class="icon-item bg-base circle dis-inline-block tc cp pa" data-type="user_address" :data-index="index" @tap.stop="address_map_event">
+                                                <uni-icons type="paperplane-filled" size="32rpx" color="#666"></uni-icons>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                            <view class="margin-top-lg padding-top-sm">
+                                <text>{{ item.describe }}</text>
+                                <text v-if="(item.distance || null) != null" class="fr cr-grey">{{$t('extraction-address.extraction-address.42v8tv')}}{{ item.distance }}</text>
+                            </view>
+                        </view>
+                        <view class="item-operation tr br-t padding-top-main margin-top-main">
+                            <button class="round bg-white br-base cr-base" type="default" size="mini" hover-class="none" :data-value="'/pages/plugins/delivery/order-detail/order-detail?id=' + item.id" @tap="url_event">{{$t('order.order.75ie9c')}}</button>
+                            <button v-if="item.status == 1" class="round bg-white br-blue cr-blue" type="default" size="mini" hover-class="none" :data-index="index" @tap="start_delivery_event">{{$t('order.order.021438')}}</button>
+                            <button v-if="item.status == 4" class="round bg-white br-main cr-main" type="default" size="mini" hover-class="none" :data-index="index" @tap="start_delivery_event">{{$t('order.order.ip4xo5')}}</button>
+                            <block v-if="item.status == 2">
+                                <button class="round bg-white br-green cr-green" type="default" size="mini" hover-class="none" :data-index="index" @tap="popup_success_content_event">{{$t('order.order.51q275')}}</button>
+                                <button class="round bg-white br-red cr-red" type="default" size="mini" hover-class="none" :data-index="index" @tap="popup_abnormal_content_event">{{$t('order.order.fb6dge')}}</button>
+                            </block>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 结尾 -->
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            </block>
+            <block v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </block>
+        </scroll-view>
+
+        <!-- 地图 -->
+        <view v-if="show_type == 1" class="map-container pr">
+            <block v-if="markers.length > 0">
+                <map class="wh-auto ht-auto"
+                    :enable-zoom="true"
+                    :enable-scroll="true"
+                    :show-location="true"
+                    :latitude="markers[0]['latitude'] || latitude"
+                    :longitude="markers[0]['longitude'] || longitude"
+                    :scale="scale"
+                    :markers="markers"
+                    @markertap="marker_tap_event"
+                ></map>
+                <view v-if="markers_active_data.length > 0" class="map-markers-active-data pa border-radius-main padding-main bs-bb">
+                    <block v-for="(item,index) in markers_active_data" :key="index">
+                        <view :class="'pr '+(index > 0 ? 'br-t padding-top-sm margin-top-sm' : '')">
+                            <view>
+                                <text>{{$t('order.order.71n22h')}}：</text>
+                                <text class="cp" data-event="copy" :data-value="item.main_order_id" @tap="text_event">{{item.main_order_id}}</text>
+                            </view>
+                            <view>
+                                <text>{{$t('order.order.232ygr')}}：</text>
+                                <text class="cp" data-event="copy" :data-value="item.main_order_no" @tap="text_event">{{item.main_order_no}}</text>
+                            </view>
+                            <view class="single-text">
+                                <text>{{$t('order.order.ra8222')}}：</text>
+                                <text class="cp" data-event="copy" :data-value="item.user_address.address_info" @tap="text_event">{{ item.user_address.address_info }}</text>
+                            </view>
+                            <view v-if="(item.user_address.lng || 0) != 0 && (item.user_address.lat || 0) != 0" class="map-send-icon bg-base circle tc cp pa" data-type="map" :data-index="index" @tap.stop="address_map_event">
+                                <uni-icons type="paperplane-filled" size="44rpx" color="#666"></uni-icons>
+                            </view>
+                        </view>
+                    </block>
+                </view>
+            </block>
+            <block v-else>
+                <!-- 提示信息 -->
+                <component-no-data propStatus="0"></component-no-data>
+            </block>
+        </view>
+        
+        <!-- 订单完成弹窗 -->
+        <component-popup :propShow="popup_success_content_status" propPosition="bottom" @onclose="popup_success_content_close_event">
+            <view class="padding-horizontal-main padding-top-main bg-white">
+                <view class="close oh">
+                    <view class="fr" @tap.stop="popup_success_content_close_event">
+                        <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                    </view>
+                </view>
+                <form @submit="form_delivery_success_submit_event" class="form-container">
+                    <view class="form-container">
+                        <view class="form-gorup">
+                            <view class="form-gorup-title">{{$t('form.form.xy87t8')}}</view>
+                            <view class="br padding-main radius margin-top">
+                                <textarea placeholder-class="cr-grey" class="cr-base margin-0" :placeholder="$t('order.order.q4c8j0')" maxlength="200" :auto-height="true" :value="form_delivery_success_msg_value" @input="form_delivery_success_msg_event"></textarea>
+                            </view>
+                        </view>
+                        <view class="form-gorup form-container-upload oh">
+                            <view class="form-gorup-title">{{$t('order.order.46q2z7')}}<text class="form-group-tips-must">*</text><text class="form-group-tips">{{$t('order.order.o11d44')}}{{form_delivery_success_images_max_count}}{{$t('buy.buy.5iuqow')}}</text></view>
+                            <view class="form-upload-data oh">
+                                <block v-if="form_delivery_success_images_list.length > 0">
+                                    <view v-for="(item, index) in form_delivery_success_images_list" :key="index" class="item fl">
+                                        <text class="delete-icon" @tap="upload_delete_event" :data-index="index">x</text>
+                                        <image :src="item" @tap="upload_show_event" :data-index="index" mode="aspectFill"></image>
+                                    </view>
+                                </block>
+                                <image v-if="(form_delivery_success_images_list || null) == null || form_delivery_success_images_list.length < form_delivery_success_images_max_count" class="item fl upload-icon" :src="common_static_url + 'upload-icon.png'" mode="aspectFill" @tap="file_upload_event"></image>
+                            </view>
+                        </view>
+                        <view class="form-gorup form-gorup-submit bottom-line-exclude">
+                            <button class="bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none">{{$t('order.order.9cvj96')}}</button>
+                        </view>
+                    </view>
+                </form>
+            </view>
+        </component-popup>
+
+        <!-- 订单异常弹窗 -->
+        <component-popup :propShow="popup_abnormal_content_status" propPosition="bottom" @onclose="popup_abnormal_content_close_event">
+            <view class="padding-horizontal-main padding-top-main bg-white">
+                <view class="close oh">
+                    <view class="fr" @tap.stop="popup_abnormal_content_close_event">
+                        <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                    </view>
+                </view>
+                <form @submit="form_delivery_abnormal_submit_event" class="form-container">
+                    <view class="form-container">
+                        <view class="form-gorup">
+                            <view class="form-gorup-title">{{$t('order.order.865029')}}<text class="form-group-tips-must">*</text></view>
+                            <view class="br padding-main radius margin-top">
+                                <textarea placeholder-class="cr-grey" class="cr-base margin-0" :placeholder="$t('order.order.g23kyj')" maxlength="200" :auto-height="true" :value="form_delivery_abnormal_msg_value" @input="form_delivery_abnormal_msg_event"></textarea>
+                            </view>
+                        </view>
+                        <view class="form-gorup form-gorup-submit bottom-line-exclude">
+                            <button class="bg-red br-red cr-white round text-size" type="default" form-type="submit" hover-class="none">{{$t('order.order.eyir7g')}}</button>
+                        </view>
+                    </view>
+                </form>
+            </view>
+        </component-popup>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+    import componentBadge from "@/components/badge/badge";
+    import componentPopup from "@/components/popup/popup";
+    import componentSearch from '@/components/search/search';
+
+    var common_static_url = app.globalData.get_static_url("common");
+    var plugins_static_url = app.globalData.get_static_url('delivery', true);
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                plugins_static_url: plugins_static_url,
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                nav_type_list: [],
+                nav_type_index: 0,
+                latitude: 0,
+                longitude: 0,
+                search_input_keywords_value: "",
+                popup_abnormal_content_status: false,
+                popup_abnormal_data_index: null,
+                form_delivery_abnormal_msg_value: "",
+                popup_success_content_status: false,
+                popup_success_data_index: null,
+                form_delivery_success_msg_value: "",
+                form_delivery_success_images_list: [],
+                form_delivery_success_images_max_count: 30,
+                editor_path_type: "",
+                show_type: 0,
+                scale: 10,
+                markers: [],
+                markers_active_data: []
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentBadge,
+            componentPopup,
+            componentSearch
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+            this.init();
+
+            // 位置实时监听
+            this.start_location_update();
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        methods: {
+            // 初始化
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    // 位置权限、回调并获取数据
+                    app.globalData.get_location_check("scope.userLocation", this, "location_back_handle");
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 位置实时监听
+            start_location_update(e = null) {
+                if (e == null) {
+                    app.globalData.start_location_update(0, this, "start_location_update");
+                } else {
+                    if ((e.status || 0) == 1) {
+                        // 更新当前页面的位置
+                        this.setData({
+                            latitude: e.lat,
+                            longitude: e.lng,
+                        });
+                        // 位置上报
+                        uni.request({
+                            url: app.globalData.get_request_url("locationreport", "user", "delivery"),
+                            method: "POST",
+                            data: {
+                                lat: e.lat,
+                                lng: e.lng,
+                            },
+                            dataType: "json",
+                        });
+                    } else {
+                        console.log("error", e);
+                    }
+                }
+            },
+
+            // 位置权限校验回调
+            location_back_handle(status = 0) {
+                var self = this;
+                if (status == 1) {
+                    uni.getLocation({
+                        type: "wgs84",
+                        success: function (res) {
+                            self.setData({
+                                longitude: res.longitude,
+                                latitude: res.latitude,
+                            });
+                            // 获取数据
+                            self.get_data_list();
+                        },
+                    });
+                } else {
+                    if (app.globalData.data.is_distribution_map_force_location == 1) {
+                        app.globalData.url_open('/pages/common/open-setting-location/open-setting-location?is_check_success_back=1');
+                    } else {
+                        // 获取数据
+                        self.get_data_list();
+                    }
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 参数
+                var type = (this.nav_type_list[this.nav_type_index] || null) == null ? -1 : this.nav_type_list[this.nav_type_index]["value"];
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("index", "order", "delivery"),
+                    method: "POST",
+                    data: {
+                        page: this.data_page,
+                        type: type,
+                        keywords: this.search_input_keywords_value || "",
+                        lat: this.latitude,
+                        lng: this.longitude,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        if (res.data.code == 0) {
+                            // 数据列表
+                            var data = res.data.data;
+                            if (this.data_page <= 1) {
+                                var temp_data_list = data.data || [];
+                            } else {
+                                var temp_data_list = this.data_list || [];
+                                var temp_data = data.data;
+                                for (var i in temp_data) {
+                                    temp_data_list.push(temp_data[i]);
+                                }
+                            }
+
+                            // 地图标记
+                            var temp_markers = [];
+                            if(temp_data_list.length > 0) {
+                                temp_data_list.forEach((item, index) => {
+                                    if((item.user_address || null) != null && (item.user_address.lat || 0) != 0 && (item.user_address.lng || 0) != 0) {
+                                        temp_markers.push({
+                                            id: index,
+                                            width: 30,
+                                            height: 30,
+                                            latitude: item.user_address.lat,
+                                            longitude: item.user_address.lng,
+                                            iconPath: this.plugins_static_url+'order.png'
+                                        });
+                                    }
+                                });
+                            }
+                            this.setData({
+                                editor_path_type: data.editor_path_type || "",
+                                nav_type_list: data.nav_type_list || [],
+                                markers: temp_markers,
+                                data_list: temp_data_list,
+                                data_total: data.total,
+                                data_page_total: data.page_total,
+                                data_list_loding_status: temp_data_list.length > 0 ? 3 : 0,
+                                data_page: this.data_page + 1,
+                                data_is_loading: 0,
+                            });
+
+                            // 是否还有数据
+                            this.setData({
+                                data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_type_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 文本事件
+            text_event(e) {
+                app.globalData.text_event_handle(e);
+            },
+
+            // 打开url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 搜索关键字事件
+            search_input_keywords_event(e) {
+                this.setData({
+                    search_input_keywords_value: e.detail.value,
+                });
+            },
+
+            // 搜索确认事件
+            search_submit_event(e) {
+                this.setData({
+                    search_input_keywords_value: e,
+                    data_page: 1,
+                });
+                this.get_data_list(1);
+            },
+
+            // icon事件
+            search_icon_event(e) {
+                var self = this;
+                uni.scanCode({
+                    success: function (res) {
+                        self.setData({
+                            search_input_keywords_value: res.result,
+                            data_page: 1
+                        });
+                        self.get_data_list(1);
+                    },
+                });
+            },
+
+            // 地图查看
+            address_map_event(e) {
+                var index = e.currentTarget.dataset.index;
+                var type = e.currentTarget.dataset.type;
+                if(type == 'map') {
+                    this.address_map_handle(this.markers_active_data[index]['user_address']);
+                } else {
+                    var temp_data = this.data_list;
+                    if ((temp_data[index] || null) == null || (temp_data[index][type] || null) == null) {
+                        app.globalData.showToast(this.$t('user-order-detail.user-order-detail.i876o3'));
+                        return false;
+                    }
+                    this.address_map_handle(temp_data[index][type]);
+                }
+            },
+
+            // 地址打开地图
+            address_map_handle(ads) {
+                var name = ads.alias || ads.name || "";
+                app.globalData.open_location(ads.lng, ads.lat, name, ads.address_info);
+            },
+            
+            // 订单完成开启弹层
+            popup_success_content_event(e) {
+                this.setData({
+                    popup_success_content_status: true,
+                    popup_success_data_index: e.currentTarget.dataset.index,
+                    form_delivery_success_msg_value: "",
+                    form_delivery_success_images_list: []
+                });
+            },
+            
+            // 订单完成弹层关闭
+            popup_success_content_close_event(e) {
+                this.setData({
+                    popup_success_content_status: false,
+                });
+            },
+
+            // 订单完成说明输入事件
+            form_delivery_success_msg_event(e) {
+                this.setData({
+                    form_delivery_success_msg_value: e.detail.value
+                });
+            },
+
+            // 上传图片预览
+            upload_show_event(e) {
+                uni.previewImage({
+                    current: this.form_delivery_success_images_list[e.currentTarget.dataset.index],
+                    urls: this.form_delivery_success_images_list,
+                });
+            },
+            
+            // 图片删除
+            upload_delete_event(e) {
+                var self = this;
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('order.order.psi67g'),
+                    success(res) {
+                        if (res.confirm) {
+                            var list = self.form_delivery_success_images_list;
+                            list.splice(e.currentTarget.dataset.index, 1);
+                            self.setData({
+                                form_delivery_success_images_list: list,
+                            });
+                        }
+                    },
+                });
+            },
+            
+            // 文件上传
+            file_upload_event(e) {
+                var self = this;
+                uni.chooseImage({
+                    count: this.form_delivery_success_images_max_count,
+                    success(res) {
+                        var success = 0;
+                        var fail = 0;
+                        var length = res.tempFilePaths.length;
+                        var count = 0;
+                        self.upload_one_by_one(res.tempFilePaths, success, fail, count, length);
+                    },
+                });
+            },
+            
+            // 采用递归的方式上传多张
+            upload_one_by_one(img_paths, success, fail, count, length) {
+                var self = this;
+                if (self.form_delivery_success_images_list.length < this.form_delivery_success_images_max_count) {
+                    uni.uploadFile({
+                        url: app.globalData.get_request_url("index", "ueditor"),
+                        filePath: img_paths[count],
+                        name: "upfile",
+                        formData: {
+                            action: "uploadimage",
+                            path_type: self.editor_path_type,
+                        },
+                        success: function (res) {
+                            success++;
+                            if (res.statusCode == 200) {
+                                var data = typeof res.data == "object" ? res.data : JSON.parse(res.data);
+                                if (data.code == 0 && (data.data.url || null) != null) {
+                                    var list = self.form_delivery_success_images_list;
+                                    list.push(data.data.url);
+                                    self.setData({
+                                        form_delivery_success_images_list: list,
+                                    });
+                                } else {
+                                    app.globalData.showToast(data.msg);
+                                }
+                            }
+                        },
+                        fail: function (e) {
+                            fail++;
+                        },
+                        complete: function (e) {
+                            count++;
+            
+                            // 下一张
+                            if (count >= length) {
+                                // 上传完毕，作一下提示
+                                //app.showToast('上传成功' + success +'张', 'success');
+                            } else {
+                                // 递归调用，上传下一张
+                                self.upload_one_by_one(img_paths, success, fail, count, length);
+                            }
+                        },
+                    });
+                }
+            },
+
+            // 订单异常开启弹层
+            popup_abnormal_content_event(e) {
+                this.setData({
+                    popup_abnormal_content_status: true,
+                    popup_abnormal_data_index: e.currentTarget.dataset.index,
+                    form_delivery_abnormal_msg_value: ""
+                });
+            },
+
+            // 订单异常弹层关闭
+            popup_abnormal_content_close_event(e) {
+                this.setData({
+                    popup_abnormal_content_status: false,
+                });
+            },
+            
+            // 订单异常原因输入事件
+            form_delivery_abnormal_msg_event(e) {
+                this.setData({
+                    form_delivery_abnormal_msg_value: e.detail.value
+                });
+            },
+
+            // 开始配送
+            start_delivery_event(e) {
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('order.order.s5cpq5'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('common.not_yet'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            this.order_status_handle({
+                                index: e.currentTarget.dataset.index,
+                                new_status: 2,
+                                status_name: this.$t('order.order.13j20t'),
+                                action: "startdelivery",
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 完成配送表单提交
+            form_delivery_success_submit_event(e) {
+                if(this.form_delivery_success_images_list.length == 0) {
+                    app.globalData.showToast(this.$t('order.order.7ltibl'));
+                    return false;
+                }
+                this.order_status_handle({
+                    index: this.popup_success_data_index,
+                    new_status: 3,
+                    status_name: this.$t('order.order.c69064'),
+                    action: "successdelivery",
+                    msg: this.form_delivery_success_msg_value || '',
+                    images: this.form_delivery_success_images_list
+                });
+            },
+
+            // 异常表单提交
+            form_delivery_abnormal_submit_event(e) {
+                var msg = this.form_delivery_abnormal_msg_value || null;
+                if (msg == null) {
+                    app.globalData.showToast(this.$t('order.order.hun5n3'));
+                } else {
+                    this.order_status_handle({
+                        index: this.popup_abnormal_data_index,
+                        new_status: 4,
+                        status_name: this.$t('order.order.fb6dge'),
+                        action: "abnormaldelivery",
+                        msg: msg,
+                    });
+                }
+            },
+
+            // 订单状态处理
+            order_status_handle(params) {
+                var temp_data = this.data_list;
+                uni.showLoading({
+                    title: this.$t('common.processing_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url(params.action, "order", "delivery"),
+                    method: "POST",
+                    data: {
+                        id: temp_data[params.index]["id"],
+                        msg: params.msg || "",
+                        images: params.images || ""
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            var temp_nav = this.nav_type_list;
+                            for (var i in temp_nav) {
+                                if (temp_nav[i]["value"] == temp_data[params.index]["status"] && (temp_nav[i]["count"] || 0) != 0) {
+                                    temp_nav[i]["count"] = parseInt(temp_nav[i]["count"]) - 1;
+                                }
+                                if (temp_nav[i]["value"] == params.new_status) {
+                                    temp_nav[i]["count"] = parseInt(temp_nav[i]["count"] || 0) + 1;
+                                }
+                            }
+                            temp_data[params.index]["status"] = params.new_status;
+                            temp_data[params.index]["status_name"] = params.status_name;
+                            this.setData({
+                                data_list: temp_data,
+                                nav_type_list: temp_nav,
+                                popup_success_content_status: false,
+                                popup_abnormal_content_status: false
+                            });
+                            app.globalData.showToast(res.data.msg, "success");
+                        } else {
+                            if (app.globalData.is_login_check(res.data, this, "order_status_handle", params)) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 展示类型
+            map_show_type_event(e) {
+                this.setData({
+                    show_type: this.show_type == 0 ? 1 : 0
+                });
+            },
+
+            // 点击标记点事件
+            marker_tap_event(e) {
+                // 点中数据id
+                var index = e.detail.markerId;
+                // 标记数据
+                var temp_markers = this.markers;
+                for(var i in temp_markers) {
+                    if(temp_markers[i]['id'] == index) {
+                        temp_markers[i]['iconPath'] = this.plugins_static_url+'order-active.png';
+                    } else {
+                        temp_markers[i]['iconPath'] = this.plugins_static_url+'order.png';
+                    }
+                }
+                // 订单数据、先匹配实际点击的订单
+                var temp = null;
+                var temp_data_list = this.data_list;
+                for(var i in temp_data_list) {
+                    if(i == index) {
+                        temp = temp_data_list[i];
+                        break;
+                    }
+                }
+                // 再匹配相同坐标的订单
+                var markers_active_data = [];
+                if(temp != null) {
+                    for(var i in temp_data_list) {
+                        if((temp_data_list[i]['user_address'] || null) != null && (temp_data_list[i]['user_address']['lng'] || 0) != 0 && (temp_data_list[i]['user_address']['lat'] || 0) != 0 && temp.user_address.lng == temp_data_list[i]['user_address']['lng'] && temp.user_address.lat == temp_data_list[i]['user_address']['lat']) {
+                            markers_active_data.push(temp_data_list[i]);
+                        }
+                    }
+                }
+                this.setData({
+                    markers: temp_markers,
+                    markers_active_data: markers_active_data,
+                });
+            },
+        },
+    };
+</script>
+<style>
+    @import "./order.css";
+</style>
\ No newline at end of file
diff --git a/pages/plugins/distribution/extraction-apply/extraction-apply.css b/pages/plugins/distribution/extraction-apply/extraction-apply.css
new file mode 100644
index 0000000..2639e93
--- /dev/null
+++ b/pages/plugins/distribution/extraction-apply/extraction-apply.css
@@ -0,0 +1,16 @@
+/*
+* 三级联动
+*/
+.select-address {
+    box-sizing: border-box;
+    height: 70rpx;
+    line-height: 70rpx;
+    padding: 0 10rpx;
+}
+.select-address .section {
+    width: 33.33%;
+    box-sizing: border-box;
+}
+.select-address .section:not(:first-child) {
+    padding: 0 5rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/extraction-apply/extraction-apply.vue b/pages/plugins/distribution/extraction-apply/extraction-apply.vue
new file mode 100644
index 0000000..8940865
--- /dev/null
+++ b/pages/plugins/distribution/extraction-apply/extraction-apply.vue
@@ -0,0 +1,605 @@
+<template>
+    <view :class="theme_view">
+        <view class="page-bottom-fixed">
+            <form @submit="form_submit" class="form-container">
+                <view class="padding-main oh border-radius-main">
+                    <view class="form-gorup bg-white form-container-upload oh">
+                        <view class="form-gorup-title">{{$t('extraction-apply.extraction-apply.u439pg')}}<text class="form-group-tips">{{$t('extraction-apply.extraction-apply.bflosr')}}</text></view>
+                        <view class="form-upload-data oh">
+                            <block v-if="(extraction_data.logo || null) != null">
+                                <view class="item fl">
+                                    <text class="delete-icon" @tap="upload_delete_event">x</text>
+                                    <image :src="extraction_data.logo" @tap="upload_show_event" mode="aspectFill"></image>
+                                </view>
+                            </block>
+                            <image class="item fl upload-icon" :src="common_static_url + 'upload-icon.png'" mode="aspectFill" @tap="file_upload_event"></image>
+                        </view>
+                    </view>
+
+                    <view class="form-gorup bg-white">
+                        <view class="form-gorup-title">{{$t('extraction-apply.extraction-apply.9t81k8')}}</view>
+                        <input type="text" name="alias" :value="extraction_data.alias || ''" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('extraction-apply.extraction-apply.wt1w0m')" />
+                    </view>
+
+                    <view class="form-gorup bg-white">
+                        <view class="form-gorup-title">{{$t('user-detail.user-detail.k5867n')}}<text class="form-group-tips-must">*</text></view>
+                        <input type="text" name="name" :value="extraction_data.name || ''" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('extraction-apply.extraction-apply.73efnt')" />
+                    </view>
+
+                    <view class="form-gorup bg-white">
+                        <view class="form-gorup-title">{{$t('user-detail.user-detail.gfe703')}}<text class="form-group-tips-must">*</text></view>
+                        <input type="text" name="tel" :value="extraction_data.tel || ''" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('extraction-apply.extraction-apply.qixk24')" />
+                    </view>
+
+                    <view class="form-gorup bg-white">
+                        <view class="form-gorup-title">{{$t('extraction-apply.extraction-apply.cy87k6')}}<text class="form-group-tips-must">*</text></view>
+                        <view class="select-address oh">
+                            <view class="section fl">
+                                <picker name="province" @change="select_province_event" :value="province_value" :range="province_list" range-key="name">
+                                    <view :class="'name ' + (province_value == null ? 'cr-grey' : 'cr-base')">{{ (province_list[province_value] || null) == null ? default_province : province_list[province_value]['name'] }}</view>
+                                </picker>
+                            </view>
+                            <view class="section fl">
+                                <picker v-if="(province_id || null) != null" name="city" @change="select_city_event" :value="city_value" :range="city_list" range-key="name">
+                                    <view :class="'name ' + (city_value == null ? 'cr-grey' : 'cr-base')">{{ (city_list[city_value] || null) == null ? default_city : city_list[city_value]['name'] }}</view>
+                                </picker>
+                                <text v-else class="cr-grey" @tap="region_select_error_event" :data-value="$t('extraction-apply.extraction-apply.liqbru')">{{$t('extraction-apply.extraction-apply.liqbru')}}</text>
+                            </view>
+                            <view class="section fl">
+                                <picker v-if="(city_id || null) != null" name="county" @change="select_county_event" :value="county_value" :range="county_list" range-key="name">
+                                    <view :class="'name ' + (county_value == null ? 'cr-grey' : 'cr-base')">{{ (county_list[county_value] || null) == null ? default_county : county_list[county_value]['name'] }}</view>
+                                </picker>
+                                <text v-else class="cr-grey" @tap="region_select_error_event" :data-value="$t('extraction-apply.extraction-apply.r4q86m')">{{$t('extraction-apply.extraction-apply.r4q86m')}}</text>
+                            </view>
+                        </view>
+                    </view>
+
+                    <view class="form-gorup bg-white">
+                        <view class="form-gorup-title">{{$t('personal.personal.6m33c4')}}<text class="form-group-tips-must">*</text></view>
+                        <input type="text" name="address" :value="extraction_data.address || ''" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('extraction-apply.extraction-apply.gxo73a')" />
+                    </view>
+
+                    <view class="form-gorup bg-white">
+                        <view class="form-gorup-title">{{$t('extraction-apply.extraction-apply.47v7m0')}}<text class="form-group-tips-must">*</text></view>
+                        <view @tap="choose_location_event" class="form-gorup-text">
+                            <view v-if="(user_location.status || 0) == 1" class="cr-base">{{ user_location.lng }}, {{ user_location.lat }}</view>
+                            <view v-else class="cr-grey">{{$t('extraction-apply.extraction-apply.8831v6')}}</view>
+                        </view>
+                    </view>
+
+                    <view v-if="(extraction_data || null) != null && (extraction_data.status || 0) == 1" class="cr-red margin-top-sm spacing-mb">{{$t('extraction-apply.extraction-apply.5y2yzu')}}</view>
+                    <view class="bottom-fixed" :style="bottom_fixed_style">
+                        <view class="bottom-line-exclude">
+                            <button class="item bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :disabled="form_submit_disabled_status">{{$t('form.form.4yd066')}}</button>
+                        </view>
+                    </view>
+                </view>
+            </form>
+        </view>
+
+        <!-- 位置选择 -->
+        <component-choice-location ref="choice_location" :propIsShowAddressChoice="false" @onBack="user_back_choice_location"></component-choice-location>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentChoiceLocation from '@/components/choice-location/choice-location';
+    var common_static_url = app.globalData.get_static_url('common');
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                params: {},
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                bottom_fixed_style: '',
+                extraction_data: {},
+                province_list: [],
+                city_list: [],
+                county_list: [],
+                province_id: null,
+                city_id: null,
+                county_id: null,
+                editor_path_type: '',
+                default_province: this.$t('extraction-apply.extraction-apply.s3h5o3'),
+                default_city: this.$t('extraction-apply.extraction-apply.4s4s15'),
+                default_county: this.$t('extraction-apply.extraction-apply.fk4gw5'),
+                province_value: null,
+                city_value: null,
+                county_value: null,
+                user_location: {},
+                form_submit_disabled_status: false,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentChoiceLocation
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params || {},
+            });
+
+            // 清除位置缓存信息
+            app.globalData.choice_user_location_remove();
+
+            // 初始数据
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 用户位置初始化
+            this.user_location_init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_province_list();
+                    this.applyinfo_init();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 2,
+                        data_list_loding_msg: this.$t('extraction-apply.extraction-apply.m3xdif'),
+                    });
+                }
+            },
+
+            // 自提点信息
+            applyinfo_init() {
+                var self = this;
+                uni.request({
+                    url: app.globalData.get_request_url('applyinfo', 'extraction', 'distribution'),
+                    method: 'POST',
+                    data: {is_lang: 0},
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var extraction_data = data.extraction_data || null;
+                            self.setData({
+                                extraction_data: extraction_data || {},
+                                editor_path_type: data.editor_path_type || '',
+                            });
+
+                            // 数据设置
+                            if (extraction_data != null) {
+                                self.setData({
+                                    province_id: extraction_data.province || null,
+                                    city_id: extraction_data.city || null,
+                                    county_id: extraction_data.county || null,
+                                });
+
+                                // 地理位置
+                                var lng = extraction_data.lng || 0;
+                                var lat = extraction_data.lat || 0;
+                                if (lng != 0 && lat != 0) {
+                                    self.setData({
+                                        user_location: {
+                                            lng: lng,
+                                            lat: lat,
+                                            address: extraction_data.address || '',
+                                        },
+                                    });
+                                }
+                            }
+
+                            // 获取城市、区县
+                            self.get_city_list();
+                            self.get_county_list();
+
+                            // 半秒后初始化数据
+                            setTimeout(function () {
+                                self.init_region_value();
+                            }, 500);
+                        } else {
+                            if (app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('extraction-apply.extraction-apply.h8f437'));
+                    },
+                });
+            },
+
+            // 地区数据初始化
+            init_region_value() {
+                this.setData({
+                    province_value: this.get_region_value('province_list', 'province_id'),
+                    city_value: this.get_region_value('city_list', 'city_id'),
+                    county_value: this.get_region_value('county_list', 'county_id'),
+                });
+            },
+
+            // 地区初始化匹配索引
+            get_region_value(list, id) {
+                var data = this[list];
+                var data_id = this[id];
+                var value = null;
+                data.forEach((d, i) => {
+                    if (d.id == data_id) {
+                        value = i;
+                        return false;
+                    }
+                });
+                return value;
+            },
+
+            // 获取省份
+            get_province_list() {
+                var self = this;
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'region'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            self.setData({
+                                province_list: data,
+                            });
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('extraction-apply.extraction-apply.fo7y6c'));
+                    },
+                });
+            },
+
+            // 获取市
+            get_city_list() {
+                var self = this;
+
+                if (self.province_id) {
+                    uni.request({
+                        url: app.globalData.get_request_url('index', 'region'),
+                        method: 'POST',
+                        data: {
+                            pid: self.province_id,
+                        },
+                        dataType: 'json',
+                        success: (res) => {
+                            if (res.data.code == 0) {
+                                var data = res.data.data;
+                                self.setData({
+                                    city_list: data,
+                                });
+                            } else {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        },
+                        fail: () => {
+                            app.globalData.showToast(this.$t('extraction-apply.extraction-apply.b6qg7b'));
+                        },
+                    });
+                }
+            },
+
+            // 获取区/县
+            get_county_list() {
+                var self = this;
+
+                if (self.city_id) {
+                    // 加载loding
+                    uni.request({
+                        url: app.globalData.get_request_url('index', 'region'),
+                        method: 'POST',
+                        data: {
+                            pid: self.city_id,
+                        },
+                        dataType: 'json',
+                        success: (res) => {
+                            if (res.data.code == 0) {
+                                var data = res.data.data;
+                                self.setData({
+                                    county_list: data,
+                                });
+                            } else {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        },
+                        fail: () => {
+                            app.globalData.showToast(this.$t('extraction-apply.extraction-apply.5s5734'));
+                        },
+                    });
+                }
+            },
+
+            // 省份事件
+            select_province_event(e) {
+                var index = e.detail.value || 0;
+                if (index >= 0) {
+                    var data = this.province_list[index];
+                    this.setData({
+                        province_value: index,
+                        province_id: data.id,
+                        city_value: null,
+                        county_value: null,
+                        city_id: null,
+                        county_id: null,
+                    });
+                    this.get_city_list();
+                }
+            },
+
+            // 市事件
+            select_city_event(e) {
+                var index = e.detail.value || 0;
+                if (index >= 0) {
+                    var data = this.city_list[index];
+                    this.setData({
+                        city_value: index,
+                        city_id: data.id,
+                        county_value: null,
+                        county_id: null,
+                    });
+                    this.get_county_list();
+                }
+            },
+
+            // 区/县事件
+            select_county_event(e) {
+                var index = e.detail.value || 0;
+                if (index >= 0) {
+                    var data = this.county_list[index];
+                    this.setData({
+                        county_value: index,
+                        county_id: data.id,
+                    });
+                }
+            },
+
+            // 省市区未按照顺序选择提示
+            region_select_error_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value != null) {
+                    app.globalData.showToast(value);
+                }
+            },
+
+            // 选择地理位置
+            choose_location_event(e) {
+                if ((this.$refs.choice_location || null) != null) {
+                    this.$refs.choice_location.choose_user_location();
+                }
+            },
+
+            // 选择用户地理位置回调
+            user_back_choice_location(e) {
+                this.setData({
+                    user_location: e
+                });
+            },
+
+            // 地址信息初始化
+            user_location_init() {
+                this.setData({
+                    user_location: app.globalData.choice_user_location_init()
+                });
+            },
+
+            // 数据提交
+            form_submit(e) {
+                var self = this;
+
+                // 表单数据
+                var form_data = e.detail.value;
+
+                // 数据校验
+                var validation = [
+                    { fields: 'name', msg: this.$t('extraction-apply.extraction-apply.q15b4n') },
+                    { fields: 'tel', msg: this.$t('extraction-apply.extraction-apply.3or25c') },
+                    { fields: 'province', msg: this.$t('extraction-apply.extraction-apply.m99d2g') },
+                    { fields: 'city', msg: this.$t('extraction-apply.extraction-apply.03587o') },
+                    { fields: 'county', msg: this.$t('extraction-apply.extraction-apply.pt8436') },
+                    { fields: 'address', msg: this.$t('extraction-apply.extraction-apply.v1g617') },
+                    { fields: 'lng', msg: this.$t('extraction-apply.extraction-apply.8831v6') },
+                    { fields: 'lat', msg: this.$t('extraction-apply.extraction-apply.8831v6') },
+                ];
+
+                // logo
+                form_data['logo'] = (this.extraction_data || null) != null ? this.extraction_data.logo || '' : '';
+
+                // 地区
+                form_data['province'] = self.province_id;
+                form_data['city'] = self.city_id;
+                form_data['county'] = self.county_id;
+
+                // 地理位置
+                var lng = 0;
+                var lat = 0;
+                if ((self.user_location || null) != null) {
+                    lng = self.user_location.lng || 0;
+                    lat = self.user_location.lat || 0;
+                }
+                if ((self.extraction_data || null) != null) {
+                    if ((lng || null) == null) {
+                        lng = self.extraction_data.lng || 0;
+                    }
+                    if ((lat || null) == null) {
+                        lat = self.extraction_data.lat || 0;
+                    }
+                }
+                form_data['lng'] = lng;
+                form_data['lat'] = lat;
+
+                // 验证提交表单
+                if (app.globalData.fields_check(form_data, validation)) {
+                    if ((self.extraction_data || null) != null && (self.extraction_data.status || 0) == 1) {
+                        uni.showModal({
+                            title: this.$t('common.warm_tips'),
+                            content: this.$t('extraction-apply.extraction-apply.rm14pu'),
+                            confirmText: this.$t('common.confirm'),
+                            cancelText: this.$t('common.not_yet'),
+                            success: (result) => {
+                                if (result.confirm) {
+                                    self.request_data_save(form_data);
+                                }
+                            },
+                        });
+                    } else {
+                        self.request_data_save(form_data);
+                    }
+                }
+            },
+
+            // 数据保存
+            request_data_save(data) {
+                var self = this;
+                self.setData({
+                    form_submit_disabled_status: true,
+                });
+                uni.showLoading({
+                    title: this.$t('common.processing_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('applysave', 'extraction', 'distribution'),
+                    method: 'POST',
+                    data: data,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            app.globalData.showToast(res.data.msg, 'success');
+                            setTimeout(function () {
+                                uni.navigateBack();
+                            }, 1000);
+                        } else {
+                            self.setData({
+                                form_submit_disabled_status: false,
+                            });
+                            if (app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            } else {
+                                app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                            }
+                        }
+                    },
+                    fail: () => {
+                        self.setData({
+                            form_submit_disabled_status: false,
+                        });
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 上传图片预览
+            upload_show_event(e) {
+                uni.previewImage({
+                    current: this.extraction_data.logo,
+                    urls: [this.extraction_data.logo],
+                });
+            },
+
+            // 图片删除
+            upload_delete_event(e) {
+                var self = this;
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('order.order.psi67g'),
+                    success(res) {
+                        if (res.confirm) {
+                            var temp_data = self.extraction_data || {};
+                            temp_data['logo'] = '';
+                            self.setData({
+                                extraction_data: temp_data,
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 文件上传
+            file_upload_event(e) {
+                var self = this;
+                uni.chooseImage({
+                    count: 1,
+                    success(res) {
+                        var success = 0;
+                        var fail = 0;
+                        var length = res.tempFilePaths.length;
+                        var count = 0;
+                        self.upload_one_by_one(res.tempFilePaths, success, fail, count, length);
+                    },
+                });
+            },
+
+            // 采用递归的方式上传多张
+            upload_one_by_one(img_paths, success, fail, count, length) {
+                var self = this;
+                uni.uploadFile({
+                    url: app.globalData.get_request_url('index', 'ueditor'),
+                    filePath: img_paths[count],
+                    name: 'upfile',
+                    formData: {
+                        action: 'uploadimage',
+                        path_type: self.editor_path_type,
+                    },
+                    success: function (res) {
+                        success++;
+                        if (res.statusCode == 200) {
+                            var data = typeof res.data == 'object' ? res.data : JSON.parse(res.data);
+                            if (data.code == 0 && (data.data.url || null) != null) {
+                                var temp_data = self.extraction_data || {};
+                                temp_data['logo'] = data.data.url;
+                                self.setData({
+                                    extraction_data: temp_data,
+                                });
+                            } else {
+                                app.globalData.showToast(data.msg);
+                            }
+                        }
+                    },
+                    fail: function (e) {
+                        fail++;
+                    },
+                    complete: function (e) {
+                        count++;
+
+                        // 下一张
+                        if (count >= length) {
+                            // 上传完毕，作一下提示
+                            //app.showToast('上传成功' + success +'张', 'success');
+                        } else {
+                            // 递归调用，上传下一张
+                            self.upload_one_by_one(img_paths, success, fail, count, length);
+                        }
+                    },
+                });
+            },
+        },
+    };
+</script>
+<style>
+    @import './extraction-apply.css';
+</style>
diff --git a/pages/plugins/distribution/extraction-order/extraction-order.css b/pages/plugins/distribution/extraction-order/extraction-order.css
new file mode 100644
index 0000000..025fa04
--- /dev/null
+++ b/pages/plugins/distribution/extraction-order/extraction-order.css
@@ -0,0 +1,23 @@
+/*
+* 导航
+*/
+.nav-base .item {
+    width: 33.33%;
+}
+
+/*
+* 搜索
+*/
+.search-drag {
+    width: 35px;
+    height: 35px;
+    line-height: 48px;
+    background: hsla(0, 0%, 0%, 0.01);
+    margin-top: calc(100vh - 260rpx);
+    margin-left: calc(50% - 17px);
+    box-shadow: 0px 3rpx 16rpx rgba(0, 0, 0, 0.2);
+    padding: 5px;
+    /* #ifdef H5 */
+    line-height: 26px;
+    /* #endif */
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/extraction-order/extraction-order.vue b/pages/plugins/distribution/extraction-order/extraction-order.vue
new file mode 100644
index 0000000..698d593
--- /dev/null
+++ b/pages/plugins/distribution/extraction-order/extraction-order.vue
@@ -0,0 +1,414 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav-base bg-white">
+            <block v-for="(item, index) in nav_status_list" :key="index">
+                <view :class="'item fl tc ' + (nav_status_index == index ? 'cr-main' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+            </block>
+        </view>
+
+        <movable-area class="wh-auto ht-auto">
+            <!-- 列表 -->
+            <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="60">
+                <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                    <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                        <view class="base oh br-b padding-bottom-main">
+                            <text class="cr-base">{{ item.add_time }}</text>
+                            <text class="cr-main fr">{{ item.status_name }}</text>
+                        </view>
+                        <view class="content margin-top">
+                            <block v-for="(fv, fi) in content_list" :key="fi">
+                                <view class="single-text margin-top-xs">
+                                    <text class="cr-grey margin-right-xl">{{ fv.name }}</text>
+                                    <text class="cr-base">{{ item[fv.field] }}</text>
+                                    <text v-if="(fv.unit || null) != null" class="cr-grey">{{ fv.unit }}</text>
+                                </view>
+                            </block>
+                        </view>
+                        <view v-if="item.status == 0" class="item-operation tr br-t-dashed padding-top-main margin-top-main">
+                            <button class="round bg-white br cr-base" type="default" size="mini" hover-class="none" :data-index="index" :data-oid="item.order_id" :data-uid="item.order_user_id" @tap="list_submit_take_event">{{$t('extraction-order.extraction-order.2y7lq1')}}</button>
+                        </view>
+                    </view>
+                </view>
+                <view v-else>
+                    <!-- 提示信息 -->
+                    <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+                </view>
+
+                <!-- 结尾 -->
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            </scroll-view>
+
+            <!-- 拖拽按钮 -->
+            <movable-view class="search-drag tc circle" direction="all" @tap="drag_event">
+                <icon type="search" size="20"></icon>
+            </movable-view>
+        </movable-area>
+
+        <!-- 取货 popup -->
+        <component-popup :propShow="is_show_take_popup" propPosition="bottom" @onclose="take_popup_event_close">
+            <view class="form-container bg-base padding-horizontal-main padding-top-main padding-bottom-xs">
+                <view class="form-gorup tc bg-white margin-top-lg">
+                    <view class="form-gorup-title">{{$t('extraction-order.extraction-order.3m038g')}}</view>
+                    <input type="number" :value="extraction_code" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('extraction-order.extraction-order.suo4oz')" maxlength="4" @input="extraction_code_input_event" />
+                </view>
+                <view class="form-gorup form-gorup-submit">
+                    <button class="bg-main br-main cr-white round text-size" type="default" hover-class="none" :disabled="form_submit_disabled_status" @tap="form_submit_take_event">{{$t('common.confirm')}}</button>
+                </view>
+            </view>
+        </component-popup>
+
+        <!-- 搜索 popup -->
+        <component-popup :propShow="is_show_search_popup" propPosition="bottom" @onclose="search_popup_event_close">
+            <view class="form-container bg-base padding-horizontal-main padding-top-main padding-bottom-xs">
+                <view class="form-gorup tc bg-white margin-top-lg">
+                    <view class="form-gorup-title">{{$t('extraction-order.extraction-order.xb4044')}}</view>
+                    <input type="number" :value="search_keywords_value" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('extraction-order.extraction-order.kuqvlv')" @input="search_input_keywords_event" />
+                </view>
+                <view class="form-gorup form-gorup-submit">
+                    <button class="bg-main-pair br-main-pair cr-white round text-size" type="default" hover-class="none" :disabled="form_submit_disabled_status" @tap="search_submit_event">{{$t('common.search')}}</button>
+                </view>
+            </view>
+        </component-popup>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentPopup from "@/components/popup/popup";
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                nav_status_list: [
+                    { name: this.$t('common.all'), value: "-1" },
+                    { name: this.$t('extraction.extraction.53h4fj'), value: "0" },
+                    { name: this.$t('extraction.extraction.wq25fk'), value: "1" },
+                ],
+                nav_status_index: 0,
+                is_show_take_popup: false,
+                extraction_value: null,
+                extraction_code: "",
+                form_submit_disabled_status: false,
+                is_show_search_popup: false,
+                search_keywords_value: "",
+                content_list: [
+                    { name: this.$t('order-detail.order-detail.36op8f'), field: "order_no" },
+                    { name: this.$t('user-order-detail.user-order-detail.516tlr'), field: "pay_price" },
+                ],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentPopup,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 是否指定状态
+            var nav_status_index = 0;
+            if (params.status != undefined) {
+                for (var i in this.nav_status_list) {
+                    if (this.nav_status_list[i]["value"] == params.status) {
+                        nav_status_index = i;
+                        break;
+                    }
+                }
+            }
+            this.setData({
+                params: params,
+                nav_status_index: nav_status_index,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 参数
+                var status = (this.nav_status_list[this.nav_status_index] || null) == null ? -1 : this.nav_status_list[this.nav_status_index]["value"];
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("order", "extraction", "distribution"),
+                    method: "POST",
+                    data: {
+                        page: this.data_page,
+                        status: status || 0,
+                        keywords: this.search_keywords_value || "",
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_status_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 取件码弹层-开启
+            list_submit_take_event(e) {
+                this.setData({
+                    is_show_take_popup: true,
+                    extraction_code: "",
+                    extraction_value: {
+                        index: e.currentTarget.dataset.index,
+                        oid: e.currentTarget.dataset.oid,
+                        uid: e.currentTarget.dataset.uid,
+                    },
+                });
+            },
+
+            // 取件码弹层-关闭
+            take_popup_event_close() {
+                this.setData({
+                    is_show_take_popup: false,
+                });
+            },
+
+            // 取件码输入事件
+            extraction_code_input_event(e) {
+                this.setData({
+                    extraction_code: e.detail.value || "",
+                });
+            },
+
+            // 取件提交
+            form_submit_take_event(e) {
+                // 参数
+                if ((this.extraction_code || null) == null) {
+                    app.globalData.showToast(this.$t('extraction-order.extraction-order.znufs8'));
+                    return false;
+                }
+                if ((this.extraction_value || null) == null) {
+                    app.globalData.showToast(this.$t('extraction-order.extraction-order.hbj4y7'));
+                    return false;
+                }
+
+                // 提交表单
+                var data = {
+                    id: this.extraction_value.oid,
+                    user_id: this.extraction_value.uid,
+                    extraction_code: this.extraction_code,
+                };
+                this.setData({
+                    form_submit_disabled_status: true,
+                });
+                uni.showLoading({
+                    title: this.$t('common.processing_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("take", "extraction", "distribution"),
+                    method: "POST",
+                    data: data,
+                    dataType: "json",
+                    success: (res) => {
+                        this.setData({
+                            form_submit_disabled_status: false,
+                        });
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            var temp_data_list = this.data_list;
+                            var index = this.extraction_value.index;
+                            temp_data_list[index]["status"] = 1;
+                            temp_data_list[index]["status_name"] = this.$t('extraction.extraction.wq25fk');
+                            this.setData({
+                                is_show_take_popup: false,
+                                data_list: temp_data_list,
+                            });
+                            app.globalData.showToast(res.data.msg, "success");
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        this.setData({
+                            form_submit_disabled_status: false,
+                        });
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 搜索弹层-开启
+            drag_event(e) {
+                this.setData({
+                    is_show_search_popup: true,
+                });
+            },
+
+            // 搜索弹层-关闭
+            search_popup_event_close() {
+                this.setData({
+                    is_show_search_popup: false,
+                });
+            },
+
+            // 搜索关键字输入事件
+            search_input_keywords_event(e) {
+                this.setData({
+                    search_keywords_value: e.detail.value || "",
+                });
+            },
+
+            // 搜索确认事件
+            search_submit_event(e) {
+                this.setData({
+                    is_show_search_popup: false,
+                    data_page: 1,
+                });
+                this.get_data_list(1);
+            },
+        },
+    };
+</script>
+<style>
+    @import "./extraction-order.css";
+</style>
diff --git a/pages/plugins/distribution/extraction-switch/extraction-switch.css b/pages/plugins/distribution/extraction-switch/extraction-switch.css
new file mode 100644
index 0000000..b7c8b34
--- /dev/null
+++ b/pages/plugins/distribution/extraction-switch/extraction-switch.css
@@ -0,0 +1,15 @@
+.address-logo {
+    width: 140rpx;
+    height: 140rpx !important;
+}
+.address .item-icon {
+    width: 30rpx;
+    height: 35rpx !important;
+}
+.address-alias {
+    padding: 0 10rpx;
+}
+.address .text {
+    line-height: 44rpx;
+    width: calc(100% - 40rpx);
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/extraction-switch/extraction-switch.vue b/pages/plugins/distribution/extraction-switch/extraction-switch.vue
new file mode 100644
index 0000000..05c90c7
--- /dev/null
+++ b/pages/plugins/distribution/extraction-switch/extraction-switch.vue
@@ -0,0 +1,299 @@
+<template>
+    <view :class="theme_view">
+        <view class="page">
+            <view v-if="data_list.length > 0" class="data-list padding-main">
+                <view v-for="(item, index) in data_list" :key="index" class="item bg-white padding-main border-radius-main spacing-mb">
+                    <view @tap="address_conent_event" :data-index="index" class="oh">
+                        <view v-if="(item.logo || null) != null" class="fl oh margin-right-lg">
+                            <image class="dis-block address-logo radius" :src="item.logo" mode="widthFix"></image>
+                        </view>
+                        <view class="oh">
+                            <view class="base oh padding-bottom-main padding-top-xs">
+                                <text v-if="(item.alias || null) != null" class="address-alias br-main cr-main round margin-right-sm">{{ item.alias }}</text>
+                                <text>{{ item.name }}</text>
+                                <text class="fr">{{ item.tel }}</text>
+                            </view>
+                            <view class="address oh padding-top-sm">
+                                <image class="item-icon fl margin-top-xs" :src="common_static_url + 'map-icon.png'" mode="widthFix"></image>
+                                <view class="text fr"> {{ item.province_name || "" }}{{ item.city_name || "" }}{{ item.county_name || "" }}{{ item.address || "" }} </view>
+                            </view>
+                        </view>
+                    </view>
+                    <view v-if="((item.distance_value || null) != null && (item.distance_unit || null) != null) || ((item.lng || 0) != 0 && (item.lat || 0) != 0)" class="br-t oh padding-top-main margin-top-main">
+                        <view v-if="(item.distance_value || null) != null && (item.distance_unit || null) != null" class="fl margin-top-lg">
+                            <text class="cr-grey">{{$t('extraction-switch.extraction-switch.w94x36')}}</text>
+                            <text class="cr-base">{{ item.distance_value }}</text>
+                            <text class="cr-grey">{{ item.distance_unit }}</text>
+                        </view>
+                        <view class="item-operation fr oh">
+                            <button v-if="(item.is_default || 0) == 0" class="round bg-white cr-green br-green" type="default" size="mini" @tap="address_switch_event" :data-index="index" hover-class="none">{{$t('buy.buy.inyxpx')}}</button>
+                            <button v-if="(item.lng || 0) != 0 && (item.lat || 0) != 0" class="round bg-white cr-base br" type="default" size="mini" @tap="address_map_event" :data-index="index" hover-class="none">{{$t('buy.buy.o7722q')}}</button>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </view>
+
+        <!-- 位置选择 -->
+        <component-choice-location ref="choice_location" :propIsShowAddressChoice="false" @onBack="user_back_choice_location"></component-choice-location>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+    import componentChoiceLocation from '@/components/choice-location/choice-location';
+    var common_static_url = app.globalData.get_static_url("common");
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_list: [],
+                params: null,
+                user_location: null,
+                is_first: 1,
+                home_extraction_address_position: 0,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentChoiceLocation
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+                home_extraction_address_position: app.globalData.get_config("config.home_extraction_address_position", 0),
+            });
+
+            // 清除位置缓存信息
+            app.globalData.choice_user_location_remove();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 是否需要选择地理位置
+            if (this.home_extraction_address_position == 1) {
+                // 用户位置初始化
+                this.user_location_init();
+            } else {
+                this.init();
+            }
+            this.setData({
+                is_first: 0,
+            });
+
+            // 是否获取位置
+            if (this.home_extraction_address_position == 1) {
+                if((this.user_location || null) == null || this.user_location.status != 1) {
+                    this.$refs.choice_location.choose_user_location();
+                }
+            }
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data_list();
+        },
+
+        methods: {
+            // 初始化
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 选择用户地理位置回调
+            user_back_choice_location(e) {
+                this.setData({
+                    user_location: e
+                });
+                this.init();
+            },
+
+            // 地址信息初始化
+            user_location_init() {
+                this.setData({
+                    user_location: app.globalData.choice_user_location_init()
+                });
+            },
+
+            // 获取数据列表
+            get_data_list() {
+                // 加载loding
+                uni.showLoading({
+                    title: this.$t('common.loading_in_text'),
+                });
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+
+                // 获取数据
+                var data = {};
+
+                // 是否有坐标
+                if ((this.user_location || null) != null) {
+                    data["lng"] = this.user_location.lng;
+                    data["lat"] = this.user_location.lat;
+                }
+
+                // 请求接口
+                uni.request({
+                    url: app.globalData.get_request_url("switchinfo", "extraction", "distribution"),
+                    method: "POST",
+                    data: data,
+                    dataType: "json",
+                    success: (res) => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            if (data.extraction_address.length > 0) {
+                                this.setData({
+                                    data_list: data.extraction_address,
+                                    data_list_loding_status: 3,
+                                    data_bottom_line_status: true,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 地图查看
+            address_map_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var data = this.data_list[index] || null;
+                if (data == null) {
+                    app.globalData.showToast(this.$t('user-order-detail.user-order-detail.i876o3'));
+                    return false;
+                }
+
+                // 打开地图
+                var name = data.alias || data.name || "";
+                var address = (data.province_name || "") + (data.city_name || "") + (data.county_name || "") + (data.address || "");
+                app.globalData.open_location(data.lng, data.lat, name, address);
+            },
+
+            // 地址内容事件
+            address_conent_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var is_back = this.params.is_back || 0;
+                if (is_back == 1) {
+                    uni.setStorage({
+                        key: app.globalData.data.cache_buy_user_address_select_key,
+                        data: this.data_list[index],
+                    });
+                    uni.navigateBack();
+                }
+            },
+
+            // 切换选择事件
+            address_switch_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var temp_data = this.data_list;
+                if ((temp_data[index] || null) == null) {
+                    app.globalData.showToast(this.$t('extraction-switch.extraction-switch.613b58'));
+                    return false;
+                }
+
+                // 请求切换
+                uni.showLoading({
+                    title: this.$t('common.processing_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("switchsave", "extraction", "distribution"),
+                    method: "POST",
+                    data: {
+                        id: temp_data[index]["id"],
+                        value: temp_data[index]["id_old"] || 0,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            app.globalData.showToast(res.data.msg, "success");
+                            var temp_data = this.data_list;
+                            for (var i in temp_data) {
+                                temp_data[i]["is_default"] = i == index ? 1 : 0;
+                            }
+                            this.setData({
+                                data_list: temp_data,
+                            });
+                        } else {
+                            if (app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            } else {
+                                app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+        },
+    };
+</script>
+<style>
+    @import "./extraction-switch.css";
+</style>
diff --git a/pages/plugins/distribution/extraction/extraction.css b/pages/plugins/distribution/extraction/extraction.css
new file mode 100644
index 0000000..981bb82
--- /dev/null
+++ b/pages/plugins/distribution/extraction/extraction.css
@@ -0,0 +1,7 @@
+.alias {
+    padding: 2rpx 10rpx;
+}
+.statistics .item {
+    width: 50%;
+    box-sizing: border-box;
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/extraction/extraction.vue b/pages/plugins/distribution/extraction/extraction.vue
new file mode 100644
index 0000000..afb8316
--- /dev/null
+++ b/pages/plugins/distribution/extraction/extraction.vue
@@ -0,0 +1,241 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="data_base != null">
+            <view class="padding-main">
+                <!-- 未申请 -->
+                <view v-if="extraction == null">
+                    <view v-if="(data_base.self_extraction_apply_desc || null) != null && data_base.self_extraction_apply_desc.length > 0" class="notice-content-blue spacing-mb">
+                        <view v-for="(item, index) in data_base.self_extraction_apply_desc" :key="index" class="item">
+                            {{ item }}
+                        </view>
+                    </view>
+                    <view class="margin-top-xxxl">
+                        <button data-value="/pages/plugins/distribution/extraction-apply/extraction-apply" @tap="url_event" class="bg-main br-main cr-white round wh-auto" type="default" size="mini" hover-class="none">{{$t('extraction.extraction.suna53')}}</button>
+                    </view>
+                </view>
+
+                <!-- 已存在申请信息 -->
+                <view v-else class="apply-already">
+                    <!-- status 状态（0待审核, 1已通过, 2已拒绝 -->
+                    <!-- 审核中 -->
+                    <view v-if="extraction.status == 0">
+                        <view class="padding-main border-radius-main bg-white">
+                            <view class="cr-red tc text-size-lg">{{$t('extraction.extraction.j0o47u')}}</view>
+                        </view>
+                        <view class="margin-top-xxxl">
+                            <button data-value="/pages/plugins/distribution/extraction-apply/extraction-apply" @tap="url_event" class="bg-green br-green cr-white round wh-auto" type="default" size="mini" hover-class="none">{{$t('common.edit')}}</button>
+                        </view>
+                    </view>
+
+                    <!-- 审核通过 -->
+                    <view v-else-if="extraction.status == 1 || extraction.status == 3" class="valid">
+                        <view class="padding-main border-radius-main bg-white">
+                            <!-- 导航 -->
+                            <view class="padding-bottom-main br-b">
+                                <text class="fw-b">{{$t('extraction.extraction.60601g')}}</text>
+                                <view data-value="/pages/plugins/distribution/extraction-apply/extraction-apply" @tap="url_event" class="fr cr-blue cp">{{$t('extraction.extraction.48rp75')}}</view>
+                            </view>
+                            <!-- 地址信息 -->
+                            <view class="margin-top-lg" @tap="address_map_event">
+                                <text v-if="(extraction.alias || null) != null" class="alias br-main cr-main bg-white round margin-right-sm">{{ extraction.alias }}</text>
+                                <text class="cr-base">{{ extraction.province_name }}{{ extraction.city_name }}{{ extraction.county_name }}{{ extraction.address }}</text>
+                            </view>
+                        </view>
+                        <view v-if="extraction.status == 1" class="spacing-mt">
+                            <view class="padding-main border-radius-main bg-white">
+                                <!-- 导航 -->
+                                <view class="padding-bottom-main br-b">
+                                    <text class="fw-b">{{$t('extraction.extraction.641gp7')}}</text>
+                                    <view data-value="/pages/plugins/distribution/extraction-order/extraction-order" @tap="url_event" class="fr cr-blue cp">{{$t('extraction.extraction.wcv68q')}}</view>
+                                </view>
+                                <!-- 自提地点统计 -->
+                                <view class="statistics oh padding-top-main">
+                                    <view class="item fl tc padding-main" data-value="0" @tap="order_event">
+                                        <view class="title cr-base">{{$t('extraction.extraction.53h4fj')}}</view>
+                                        <view class="single-text cr-red fw-b margin-top-sm">{{ statistical.order_wait || 0 }}</view>
+                                    </view>
+                                    <view class="item fl tc padding-main" data-value="1" @tap="order_event">
+                                        <view class="title cr-base">{{$t('extraction.extraction.wq25fk')}}</view>
+                                        <view class="single-text cr-green fw-b margin-top-sm">{{ statistical.order_already || 0 }}</view>
+                                    </view>
+                                </view>
+                            </view>
+                            <!-- 通知 -->
+                            <view v-if="(data_base || null) != null && (data_base.self_extraction_common_notice || null) != null && data_base.self_extraction_common_notice.length > 0" class="spacing-mt">
+                                <view class="notice-content">
+                                    <view v-for="(item, index) in data_base.self_extraction_common_notice" :key="index" class="item">
+                                        {{ item }}
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                        <!-- 已解约 -->
+                        <view v-else class="spacing-mt">
+                            <view class="notice-content-blue">{{$t('extraction.extraction.864dtt')}}</view>
+                        </view>
+                    </view>
+                    <!-- 审核失败 -->
+                    <view v-else="extraction.status == 2">
+                        <view class="padding-main border-radius-main bg-white spacing-mb">
+                            <view class="cr-red tc text-size-lg">{{$t('extraction.extraction.11825x')}}</view>
+                            <view v-if="(extraction.fail_reason || null) != null" class="margin-top-lg">
+                                <text class="fw-b">{{$t('extraction.extraction.w6hg74')}}</text>
+                                <text class="cr-grey">{{ extraction.fail_reason }}</text>
+                            </view>
+                        </view>
+                        <view class="margin-top-xxxl">
+                            <button data-value="/pages/plugins/distribution/extraction-apply/extraction-apply" @tap="url_event" class="bg-green br-green cr-white round wh-auto" type="default" size="mini" hover-class="none">{{$t('common.edit')}}</button>
+                        </view>
+                    </view>
+                </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>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                data_base: null,
+                extraction: null,
+                statistical: null,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url("index", "extraction", "distribution"),
+                    method: "POST",
+                    data: {},
+                    dataType: "json",
+                    success: (res) => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_base: data.base || null,
+                                extraction: data.extraction || null,
+                                statistical: data.statistical || null,
+                                data_list_loding_msg: "",
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: true,
+                            });
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 地图查看
+            address_map_event(e) {
+                if ((this.extraction || null) == null) {
+                    return false;
+                }
+                var data = this.extraction;
+
+                // 打开地图
+                var name = data.alias || data.name || "";
+                var address = (data.province_name || "") + (data.city_name || "") + (data.county_name || "") + (data.address || "");
+                app.globalData.open_location(data.lng, data.lat, name, address);
+            },
+
+            // 进入取货订单管理
+            order_event(e) {
+                var value = e.currentTarget.dataset.value || 0;
+                app.globalData.url_open('/pages/plugins/distribution/extraction-order/extraction-order?status=' + value);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import "./extraction.css";
+</style>
diff --git a/pages/plugins/distribution/introduce/introduce.css b/pages/plugins/distribution/introduce/introduce.css
new file mode 100644
index 0000000..bba33c0
--- /dev/null
+++ b/pages/plugins/distribution/introduce/introduce.css
@@ -0,0 +1,4 @@
+.panel-item .level-icon {
+    width: 50rpx;
+    height: 50rpx !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/introduce/introduce.vue b/pages/plugins/distribution/introduce/introduce.vue
new file mode 100644
index 0000000..c2732a2
--- /dev/null
+++ b/pages/plugins/distribution/introduce/introduce.vue
@@ -0,0 +1,177 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="data_base != null">
+            <view class="padding-horizontal-main padding-top-main">
+                <!-- 等级信息 -->
+                <view v-if="level_list.length > 0" class="panel-item spacing-mb">
+                    <view v-for="(item, index) in level_list" :key="index" class="padding-main border-radius-main bg-white spacing-mb">
+                        <view class="br-b padding-bottom-main fw-b text-size">{{ item.name }}</view>
+                        <view class="panel-content oh padding-top-main">
+                            <view class="item br-b oh padding-vertical-main">
+                                <view class="title fl padding-right-main cr-grey">{{$t('introduce.introduce.017d67')}}</view>
+                                <view class="content fl br-l padding-left-main">
+                                    <image :src="item.images_url" class="dis-block fl level-icon" mode="widthFix"></image>
+                                </view>
+                            </view>
+                            <view class="item br-b oh padding-vertical-main">
+                                <view class="title fl padding-right-main cr-grey">{{$t('introduce.introduce.el4ib2')}}</view>
+                                <view class="content fl br-l padding-left-main">
+                                    <view>{{$t('introduce.introduce.syf66q')}}{{ item.level_rate_one }}%</view>
+                                    <view v-if="data_base.level == undefined || data_base.level > 0">{{$t('introduce.introduce.q4t9kl')}}{{ item.level_rate_two }}%</view>
+                                    <view v-if="data_base.level == undefined || data_base.level > 1">{{$t('introduce.introduce.e5os6e')}}{{ item.level_rate_three }}%</view>
+                                </view>
+                            </view>
+                            <view class="item br-b oh padding-vertical-main">
+                                <view class="title fl padding-right-main cr-grey">{{$t('introduce.introduce.d7kle4')}}</view>
+                                <view class="content fl br-l padding-left-main">
+                                    <block v-if="(item.rules_msg_list || null) != null">
+                                        <view>{{ item.rules_msg_list.name }}</view>
+                                        <view class="padding-left-xxl">
+                                            <block v-if="(item.rules_msg_list.data || null) != null && item.rules_msg_list.data.length > 0">
+                                                <block v-for="(rv, ri) in item.rules_msg_list.data" :key="ri">
+                                                    <view>
+                                                        <text>{{ rv.name }}</text>
+                                                        <text class="fr fw-b">{{ rv.value }}</text>
+                                                    </view>
+                                                </block>
+                                            </block>
+                                            <block v-else>
+                                                <view class="cr-grey">{{$t('introduce.introduce.5t5vzi')}}</view>
+                                            </block>
+                                        </view>
+                                    </block>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 等级介绍 -->
+                <view v-if="(data_base.user_center_level_desc || null) != null && data_base.user_center_level_desc.length > 0" class="spacing-mb">
+                    <view class="notice-content-blue">
+                        <view v-for="(item, index) in data_base.user_center_level_desc" :key="index" class="item">
+                            {{ item }}
+                        </view>
+                    </view>
+                </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>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                data_bottom_line_status: false,
+                data_base: null,
+                level_list: [],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("index", "introduce", "distribution"),
+                    method: "POST",
+                    data: {
+                        id: this.params.id,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var data_base = data.base || null;
+                            var level_list = (data.level_list || null) != null && data.level_list.length > 0 ? data.level_list : [];
+                            this.setData({
+                                data_base: data_base,
+                                level_list: level_list,
+                                data_list_loding_status: data_base == null || level_list.length <= 0 ? 0 : 3,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: "",
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "init")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+        },
+    };
+</script>
+<style>
+    @import "./introduce.css";
+</style>
diff --git a/pages/plugins/distribution/map/map.css b/pages/plugins/distribution/map/map.css
new file mode 100644
index 0000000..0c92be6
--- /dev/null
+++ b/pages/plugins/distribution/map/map.css
@@ -0,0 +1,38 @@
+.map-container {
+    height: 60vh;
+}
+.map-container .map-center-icon {
+    top: calc(50% - 30rpx);
+    left: calc(50% - 30rpx);
+    width: 60rpx;
+    height: 60rpx;
+}
+
+.user-container {
+    height: 40vh;
+    padding-bottom: calc(env(safe-area-inset-bottom) - 20rpx);
+}
+.user-container .item.active {
+    background: #f2f2f2;
+}
+.user-container .item .avatar {
+    width: 140rpx;
+    height: 140rpx;
+}
+.user-container .item .base {
+    width: calc(100% - 160rpx);
+    height: 140rpx;
+}
+.user-container .item .base-top .view-name {
+    width: calc(100% - 200rpx);
+}
+.user-container .item .base-bottom .address {
+    width: calc(100% - 110rpx);
+}
+.user-container .item .base-top-icon .dis-inline-block:not(:last-child) {
+    margin-right: 30rpx;
+}
+.user-container .item .order-submit {
+    padding: 0rpx 20rpx !important;
+    line-height: 40rpx !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/map/map.vue b/pages/plugins/distribution/map/map.vue
new file mode 100644
index 0000000..d1e8a34
--- /dev/null
+++ b/pages/plugins/distribution/map/map.vue
@@ -0,0 +1,313 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="data_list_loding_status == 3">
+            <view class="map-container pr">
+                <map class="wh-auto ht-auto"
+                    :enable-zoom="true"
+                    :enable-scroll="true"
+                    :show-location="true"
+                    :latitude="latitude"
+                    :longitude="longitude"
+                    :scale="scale"
+                    :markers="markers"
+                    @regionchange="region_change_event"
+                    @markertap="marker_tap_event"
+                ></map>
+                <image v-if="map_center_icon_status == 1" class="map-center-icon pa" :src="map_location_icon" mode="aspectFit"></image>
+            </view>
+            <scroll-view :scroll-y="true" :scroll-top="scroll_top" :scroll-with-animation="true" class="bg-white bs-bb user-container">
+                <block v-if="(user || null) != null && user.length > 0">
+                    <block v-for="(item, index) in user" :key="index">
+                        <view :class="'item padding-main oh pr br-b '+(item.active || '')" :data-index="index" @tap="user_event">
+                            <image class="circle br dis-block fl avatar" :src="item.avatar" mode="aspectFit"></image>
+                            <view class="base fr">
+                                <view class="base-top oh br-b-dashed padding-bottom-xs">
+                                    <view class="single-text cr-base fl view-name">{{item.user_name_view}}</view>
+                                    <view class="fr base-top-icon">
+                                        <view v-if="(item.username || null) != null" class="dis-inline-block va-m" data-event="copy" :data-value="item.username" @tap.stop="text_event">
+                                            <uni-icons type="person" size="34rpx" color="#999"></uni-icons>
+                                        </view>
+                                        <view v-if="(item.mobile || null) != null" class="dis-inline-block va-m" data-event="tel" :data-value="item.mobile" @tap.stop="text_event">
+                                            <uni-icons type="phone" size="34rpx" color="#999"></uni-icons>
+                                        </view>
+                                        <view v-if="(item.email || null) != null" class="dis-inline-block va-m" data-event="copy" :data-value="item.email" @tap.stop="text_event">
+                                            <uni-icons type="email" size="34rpx" color="#999"></uni-icons>
+                                        </view>
+                                    </view>
+                                </view>
+                                <view class="base-bottom cr-grey text-size-xs margin-top-sm oh">
+                                    <text class="single-text fl address">{{item.address}}</text>
+                                    <view class="fr">
+                                        <view class="dis-inline-block va-m" data-event="copy" :data-value="item.address" @tap.stop="text_event">
+                                            <uni-icons type="chatboxes" size="34rpx" color="#999"></uni-icons>
+                                        </view>
+                                        <view class="dis-inline-block va-m margin-left-xxl" data-event="copy" :data-value="item.address" :data-lng="item.lng" :data-lat="item.lat" @tap.stop="map_route_event">
+                                            <uni-icons type="paperplane" size="34rpx" color="#999"></uni-icons>
+                                        </view>
+                                    </view>
+                                </view>
+                                <view class="text-size-xs margin-top-sm">
+                                    <text class="cr-grey">{{$t('map.map.ivy154')}}</text>
+                                    <text class="cr-base fw-b margin-left-sm">{{item.order_count}}</text>
+                                    <button type="default" size="mini" class="br-main cr-main bg-white text-size-xs round fr order-submit" :data-value="item.id" @tap="user_order_event">{{$t('map.map.557z8x')}}</button>
+                                </view>
+                            </view>
+                        </view>
+                    </block>
+                </block>
+                <block v-else>
+                    <component-no-data propStatus="0"></component-no-data>
+                </block>
+            </scroll-view>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    var plugins_static_url = app.globalData.get_static_url('distribution', true);
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                params: null,
+                data_list: [],
+                map_location_icon: plugins_static_url+'app/map/location-icon.png',
+                user: [],
+                scale: 10,
+                latitude: 39.909,
+                longitude: 116.39742,
+                markers: [],
+                map_center_icon_status: 1,
+                markers_active_index: null,
+                scroll_top: 0
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params
+            });
+
+            // 获取数据
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        methods: {
+            // 获取数据
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    // 位置权限、回调并获取数据
+                    app.globalData.get_location_check('scope.userLocation', this, 'location_back_handle');
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                // 参数
+                uni.request({
+                    url: app.globalData.get_request_url("map", "order", "distribution"),
+                    method: 'POST',
+                    data: {
+                        lng: this.longitude,
+                        lat: this.latitude
+                    },
+                    dataType: 'json',
+                    success: res => {
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var user = data.user || [];
+                            var temp_markers = [];
+                            if(user.length > 0) {
+                                user.forEach((item, index) => {
+                                    temp_markers.push({
+                                        id: index,
+                                        width: 25,
+                                        height: 25,
+                                        latitude: item.lat,
+                                        longitude: item.lng,
+                                        iconPath: plugins_static_url+'app/map/markers-icon.png'
+                                    });
+                                });
+                            }
+                            this.setData({
+                                user: user,
+                                markers: temp_markers,
+                                markers_active_index: null,
+                                scale: data.scale || 10,
+                                data_list_loding_status: 3
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 3,
+                                data_list_loding_msg: res.data.msg
+                            });
+                        }
+                    },
+                    fail: () => {
+                        this.setData({
+                            data_list_loding_status: 3,
+                            data_list_loding_msg: this.$t('common.internet_error_tips')
+                        });
+                    }
+                });
+            },
+
+            // 文本事件
+            text_event(e) {
+                app.globalData.text_event_handle(e);
+            },
+
+            // 地址导航
+            map_route_event(e) {
+                app.globalData.open_location(e.currentTarget.dataset.lng, e.currentTarget.dataset.lat, '', e.currentTarget.dataset.value);
+            },
+
+            // 位置权限校验回调
+            location_back_handle(status = 0) {
+                var self = this;
+                if(status == 1) {
+                    uni.getLocation({
+                    	type: 'wgs84',
+                    	success: function (res) {
+                            self.setData({
+                                longitude: res.longitude,
+                                latitude: res.latitude,
+                            });
+                            // 获取数据
+                            self.get_data();
+                    	}
+                    });
+                } else {
+                    if(app.globalData.data.is_distribution_map_force_location == 1) {
+                        app.globalData.url_open('/pages/common/open-setting-location/open-setting-location?is_check_success_back=1');
+                    } else {
+                        // 获取数据
+                        self.get_data();
+                    }                 
+                }
+            },
+
+            // 视野改变事件
+            region_change_event(e) {
+                // 仅拖动及手势有效
+                if(e.causedBy == 'drag' || e.causedBy == 'gesture') {
+                    // 1. 开始显示中心图标
+                    // 2. 结束重新拉取数据
+                    if(e.type == 'end') {
+                        this.setData({
+                            latitude: e.detail.centerLocation.latitude,
+                            longitude: e.detail.centerLocation.longitude
+                        });
+                        // 获取数据
+                        this.get_data();
+                    } else {
+                        this.setData({
+                            map_center_icon_status: 1,
+                        });
+                    }
+                }
+            },
+
+            // 点击标记点事件
+            marker_tap_event(e) {
+                // 索引值
+                var index = e.detail.markerId;
+                // 选中处理
+                this.user_markers_active_handle(index);
+                // 列表滑动到用户位置
+                this.setData({
+                    scroll_top: (index*182)+'rpx'
+                });
+            },
+
+            // 用户点击事件
+            user_event(e) {
+                // 索引值
+                var index = e.currentTarget.dataset.index || 0;
+                // 选中处理
+                this.user_markers_active_handle(index);
+                // 设置地图中心位置为当前用户位置
+                var temp = this.user[index];
+                this.setData({
+                    latitude: temp['lat'],
+                    longitude: temp['lng']
+                });
+            },
+
+            // 用户和覆盖物选中处理
+            user_markers_active_handle(index) {
+                // 覆盖物
+                var temp_markers = this.markers;
+                for(var i in temp_markers) {
+                    if(i == index) {
+                        temp_markers[i]['iconPath'] = plugins_static_url+'app/map/markers-active-icon.png';
+                    } else {
+                        temp_markers[i]['iconPath'] = plugins_static_url+'app/map/markers-icon.png';
+                    }
+                }
+                // 用户信息
+                var temp_user = this.user;
+                for(var i in temp_user) {
+                    if(i == index) {
+                        temp_user[i]['active'] = 'active';
+                    } else {
+                        temp_user[i]['active'] = '';
+                    }
+                }
+                // 设置数据
+                this.setData({
+                    markers_active_index: index,
+                    markers: temp_markers,
+                    user: temp_user,
+                    map_center_icon_status: 0
+                });
+            },
+
+            // 用户订单事件
+            user_order_event(e) {
+                var value = e.currentTarget.dataset.value;
+                app.globalData.url_open('/pages/plugins/distribution/order/order?uid='+value);
+            }
+        }
+    };
+</script>
+<style>
+    @import './map.css';
+</style>
\ No newline at end of file
diff --git a/pages/plugins/distribution/order-detail/order-detail.css b/pages/plugins/distribution/order-detail/order-detail.css
new file mode 100644
index 0000000..b8ac8ac
--- /dev/null
+++ b/pages/plugins/distribution/order-detail/order-detail.css
@@ -0,0 +1,45 @@
+/**
+ * 头像
+ */
+.avatar {
+    width: 45rpx;
+    height: 45rpx;
+}
+
+/*
+* 商品信息
+*/
+.goods-base {
+    min-height: 160rpx;
+    margin-left: 180rpx;
+}
+.goods .goods-item:last-child {
+    border-bottom: 0;
+}
+.goods-image {
+    width: 160rpx;
+    height: 160rpx;
+}
+
+/*
+* 地址信息
+*/
+.address-base,
+.address-detail {
+    padding: 10rpx 0;
+}
+.address-detail .icon {
+    width: 30rpx;
+    height: 35rpx !important;
+}
+.address-detail .text {
+    width: calc(100% - 40rpx);
+}
+.address-detail .text {
+    line-height: 36rpx;
+}
+.address-alias,
+.address-map-submit {
+    padding: 0 15rpx;
+    line-height: 40rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/order-detail/order-detail.vue b/pages/plugins/distribution/order-detail/order-detail.vue
new file mode 100644
index 0000000..f0468c7
--- /dev/null
+++ b/pages/plugins/distribution/order-detail/order-detail.vue
@@ -0,0 +1,219 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="detail != null">
+            <view class="padding-horizontal-main padding-top-main">
+                <!-- 地址 -->
+                <view v-if="(detail.address_data || null) != null" class="goods bg-white padding-main border-radius-main spacing-mb">
+                    <view class="address-base oh">
+                        <text v-if="(detail.address_data.alias || null) != null" class="address-alias round br-main cr-main bg-white margin-right-sm">{{ detail.address_data.alias }}</text>
+                        <text data-event="copy" :data-value="detail.address_data.name" @tap="text_event">{{ detail.address_data.name }}</text>
+                        <text class="fr" data-event="tel" :data-value="detail.address_data.tel" @tap="text_event">{{ detail.address_data.tel }}</text>
+                    </view>
+                    <view class="address-detail oh margin-bottom-main">
+                        <image class="icon fl" :src="common_static_url + 'map-icon.png'" mode="widthFix"></image>
+                        <view class="text fr">
+                            <text data-event="copy" :data-value="detail.address_data.province_name + detail.address_data.city_name + detail.address_data.county_name + detail.address_data.address" @tap="text_event"
+                                >{{ detail.address_data.province_name }}{{ detail.address_data.city_name }}{{ detail.address_data.county_name }}{{ detail.address_data.address }}</text
+                            >
+                        </view>
+                    </view>
+                    <view class="address-divider spacing-mb"></view>
+                </view>
+
+                <!-- 基础信息 -->
+                <view v-if="detail_list.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('order-detail.order-detail.9er1pc')}}</view>
+                    <view class="panel-content oh">
+                        <view class="item br-b oh padding-vertical-main">
+                            <view class="title fl padding-right-main cr-grey">{{$t('order-detail.order-detail.pyw6xg')}}</view>
+                            <view class="content fl br-l padding-left-main">
+                                <image :src="detail.avatar" class="avatar dis-block circle fl" mode="widthFix" @tap="avatar_event" :data-value="detail.avatar"></image>
+                            </view>
+                        </view>
+                        <view v-for="(item, index) in detail_list" :key="index" class="item br-b-dashed oh padding-vertical-main">
+                            <view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
+                            <view class="content fl br-l padding-left-main">{{ item.value }}</view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 商品列表 -->
+                <view v-if="detail.items.length > 0" class="goods bg-white padding-main border-radius-main spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.7f8p26')}}</view>
+                    <view v-for="(item, index) in detail.items" :key="index" class="goods-item br-b-dashed oh padding-main">
+                        <view :data-value="item.goods_url" @tap="url_event" class="cp">
+                            <image class="goods-image fl radius" :src="item.images" mode="aspectFill"></image>
+                            <view class="goods-base pr">
+                                <view class="multi-text">{{ item.title }}</view>
+                                <view v-if="item.spec != null" class="margin-top-sm">
+                                    <block v-for="(sv, si) in item.spec" :key="si">
+                                        <text v-if="si > 0" class="cr-grey padding-left-xs padding-right-xs">;</text>
+                                        <text class="cr-grey">{{ sv.value }}</text>
+                                    </block>
+                                </view>
+                                <view class="margin-top-sm">
+                                    <text class="fw-b">{{ detail.currency_data.currency_symbol }}{{ item.price }}</text>
+                                    <text class="margin-left-sm">x{{ item.buy_number }}</text>
+                                </view>
+                                <view v-if="detail.is_can_launch_aftersale == 1 && (item.orderaftersale_btn_text || null) != null" class="orderaftersale-btn-text cr-blue pa bg-white" @tap.stop="orderaftersale_event" :data-oid="detail.id" :data-did="item.id">{{ item.orderaftersale_btn_text }}</view>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="padding-top-main tr cr-base text-size">
+                        <text>{{$t('user-order-detail.user-order-detail.423rmr')}}<text class="fw-b">{{ detail.buy_number_count }}</text>{{$t('user-order-detail.user-order-detail.41ty94')}}<text class="sales-price margin-right-xs">{{ detail.currency_data.currency_symbol }}{{ detail.total_price }}</text></text>
+                    </view>
+                </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>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    var common_static_url = app.globalData.get_static_url("common");
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                data_bottom_line_status: false,
+                detail: null,
+                detail_list: [],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("detail", "order", "distribution"),
+                    method: "POST",
+                    data: {
+                        id: this.params.id,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                detail: data.data,
+                                detail_list: [
+                                    { name: this.$t('order-detail.order-detail.2d766e'), value: data.data.user_name_view || "" },
+                                    { name: this.$t('order-detail.order-detail.36op8f'), value: data.data.order_no || "" },
+                                    { name: this.$t('order-detail.order-detail.x3ge6c'), value: data.data.total_price || "" },
+                                    { name: this.$t('order-detail.order-detail.v52n5r'), value: data.data.refund_price || "" },
+                                    { name: this.$t('user-order-detail.user-order-detail.yxwu8n'), value: data.data.order_status_name || "" },
+                                    { name: this.$t('user-order-detail.user-order-detail.23qj7m'), value: data.data.order_pay_status_name || "" },
+                                    { name: this.$t('order.order.330m76'), value: data.data.order_client_type_name || "" },
+                                    { name: this.$t('order-detail.order-detail.8n1f72'), value: data.data.buy_number_count || "" },
+                                    { name: this.$t('order-detail.order-detail.w78rgm'), value: data.data.add_time || "" },
+                                ],
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: "",
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "init")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 头像查看
+            avatar_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value != null) {
+                    uni.previewImage({
+                        current: value,
+                        urls: [value],
+                    });
+                } else {
+                    app.globalData.showToast(this.$t('order.order.p3scy0'));
+                }
+            },
+
+            // 文本事件
+            text_event(e) {
+                app.globalData.text_event_handle(e);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import "./order-detail.css";
+</style>
diff --git a/pages/plugins/distribution/order/order.css b/pages/plugins/distribution/order/order.css
new file mode 100644
index 0000000..017c31a
--- /dev/null
+++ b/pages/plugins/distribution/order/order.css
@@ -0,0 +1,14 @@
+/*
+* 导航
+*/
+.nav-base .item {
+    width: 16.66%;
+}
+
+/*
+* 列表
+*/
+.data-list .item .base .avatar {
+    width: 40rpx;
+    height: 40rpx !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/order/order.vue b/pages/plugins/distribution/order/order.vue
new file mode 100644
index 0000000..d811c20
--- /dev/null
+++ b/pages/plugins/distribution/order/order.vue
@@ -0,0 +1,280 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav-base bg-white">
+            <view v-for="(item, index) in nav_status_list" :key="index">
+                <view :class="'item fl tc ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+            </view>
+        </view>
+
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                    <view class="base oh br-b padding-bottom-main">
+                        <image class="avatar dis-block fl circle" :src="item.avatar" mode="widthFix" @tap="avatar_event" :data-value="item.avatar"></image>
+                        <text class="cr-base margin-left-sm">{{ item.user_name_view || "" }}</text>
+                        <text class="cr-base fr">{{ item.order_status_name }}</text>
+                    </view>
+                    <view :data-value="'/pages/plugins/distribution/order-detail/order-detail?id=' + item.id" @tap="url_event" class="content margin-top cp">
+                        <view v-for="(fv, fi) in content_list" :key="fi">
+                            <view class="single-text margin-top-xs">
+                                <text class="cr-grey margin-right-xl">{{ fv.name }}</text>
+                                <text class="cr-base">{{ item[fv.field] }}</text>
+                                <text v-if="(fv.unit || null) != null" class="cr-grey">{{ fv.unit }}</text>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                nav_status_list: [
+                    { name: this.$t('common.all'), value: "-1" },
+                    { name: this.$t('order.order.pjb15r'), value: "1" },
+                    { name: this.$t('order.order.s8g966'), value: "2" },
+                    { name: this.$t('order.order.q820hx'), value: "3" },
+                    { name: this.$t('order.order.15lr5l'), value: "4" },
+                    { name: this.$t('detail.detail.32171c'), value: "5,6" },
+                ],
+                nav_status_index: 0,
+                content_list: [
+                    { name: this.$t('order-detail.order-detail.36op8f'), field: "order_no" },
+                    { name: this.$t('order-detail.order-detail.x3ge6c'), field: "total_price" },
+                    { name: this.$t('user-order-detail.user-order-detail.23qj7m'), field: "order_pay_status_name" },
+                    { name: this.$t('order.order.330m76'), field: "order_client_type_name" },
+                    { name: this.$t('order-detail.order-detail.9153qn'), field: "add_time" },
+                ],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 是否指定状态
+            var nav_status_index = 0;
+            if ((params.status || null) != null) {
+                for (var i in this.nav_status_list) {
+                    if (this.nav_status_list[i]["value"] == params.status) {
+                        nav_status_index = i;
+                        break;
+                    }
+                }
+            }
+            this.setData({
+                params: params,
+                nav_status_index: nav_status_index,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 参数
+                var order_status = (this.nav_status_list[this.nav_status_index] || null) == null ? -1 : this.nav_status_list[this.nav_status_index]["value"];
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("index", "order", "distribution"),
+                    method: "POST",
+                    data: {
+                        page: this.data_page,
+                        status: order_status,
+                        uid: this.params.uid || 0,
+                        is_more: 1,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_status_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 头像查看
+            avatar_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value != null) {
+                    uni.previewImage({
+                        current: value,
+                        urls: [value],
+                    });
+                } else {
+                    app.globalData.showToast(this.$t('order.order.p3scy0'));
+                }
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import "./order.css";
+</style>
diff --git a/pages/plugins/distribution/poster/poster.css b/pages/plugins/distribution/poster/poster.css
new file mode 100644
index 0000000..2353c39
--- /dev/null
+++ b/pages/plugins/distribution/poster/poster.css
@@ -0,0 +1,10 @@
+.share .title {
+    border-style: solid;
+    border-width: 0 0 0 3px;
+}
+.submit-double .item {
+    width: 48%;
+}
+.submit-double .item button {
+    width: 46%;
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/poster/poster.vue b/pages/plugins/distribution/poster/poster.vue
new file mode 100644
index 0000000..985dfb8
--- /dev/null
+++ b/pages/plugins/distribution/poster/poster.vue
@@ -0,0 +1,225 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="user_share_poster != null || user_share_qrode != null || user_share_url != null" class="padding-main">
+            <!-- 海报 -->
+            <view v-if="user_share_poster != null" class="share qrcode padding-main border-radius-main bg-white spacing-mb">
+                <view class="title border-color-main padding-left-lg text-size fw-b">{{$t('poster.poster.rbdj4b')}}</view>
+                <view class="cr-grey br-b padding-vertical-main">{{$t('poster.poster.m54q3e')}}</view>
+                <view class="margin-top-lg">
+                    <image :src="user_share_poster" class="wh-auto dis-block radius" mode="widthFix"></image>
+                </view>
+                <view class="submit-double oh margin-top-lg">
+                    <button class="fl item bg-white cr-green br-green round" type="default" hover-class="none" size="mini" :data-value="user_share_poster" @tap="images_show_event">{{$t('poster.poster.b5i123')}}</button>
+                    <view class="fr item">
+                        <button class="bg-white cr-main br-main round" type="default" hover-class="none" size="mini" @tap="poster_refresh_event">{{$t('poster.poster.hk8c9p')}}</button>
+                        <button class="fr bg-white cr-base br-base round" type="default" hover-class="none" size="mini" @tap="share_event">{{$t('common.share')}}</button>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 二维码 -->
+            <view v-if="user_share_qrode != null" class="share qrcode padding-main border-radius-main bg-white spacing-mb">
+                <view class="title border-color-main padding-left-lg text-size fw-b">{{$t('poster.poster.9y4bwq')}}</view>
+                <view class="cr-grey br-b padding-vertical-main">{{$t('poster.poster.h212v8')}}</view>
+                <view class="margin-top-lg">
+                    <image :src="user_share_qrode" class="wh-auto dis-block radius" mode="widthFix"></image>
+                </view>
+                <view class="margin-top-lg">
+                    <button class="dis-block wh-auto bg-white cr-green br-green round" type="default" size="mini" hover-class="none" @tap="images_show_event" :data-value="user_share_qrode">{{$t('poster.poster.j3qv45')}}</button>
+                </view>
+            </view>
+
+            <!-- 链接 -->
+            <view v-if="user_share_url != null" class="share url padding-main border-radius-main bg-white spacing-mb">
+                <view class="title border-color-main padding-left-lg text-size fw-b">{{$t('poster.poster.r534xd')}}</view>
+                <view class="cr-grey br-b padding-vertical-main">{{$t('poster.poster.vn36y7')}}</view>
+                <view class="cr-main text-size margin-top-lg">{{ user_share_url }}</view>
+                <view class="margin-top-lg">
+                    <button class="dis-block wh-auto bg-white cr-green br-green round" type="default" size="mini" hover-class="none" @tap="url_event" :data-value="user_share_url">{{$t('poster.poster.673605')}}</button>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+
+            <!-- 分享弹窗 -->
+            <component-share-popup ref="share"></component-share-popup>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+    import componentSharePopup from "@/components/share-popup/share-popup";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: this.$t('common.loading_in_text'),
+                data_bottom_line_status: false,
+                user_share_poster: null,
+                user_share_qrode: null,
+                user_share_url: null,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentSharePopup
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 加载数据
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("index", "poster", "distribution"),
+                    method: "POST",
+                    data: {},
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                user_share_poster: data.user_share_poster || null,
+                                user_share_qrode: data.user_share_qrode || null,
+                                user_share_url: data.user_share_url || null,
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: "",
+                            });
+
+                            // 是否全部没数据
+                            if (this.user_share_poster == null && this.user_share_qrode == null && this.user_share_url == null) {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_bottom_line_status: false,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "init")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 刷新海报
+            poster_refresh_event(e) {
+                uni.showLoading({
+                    title: this.$t('common.processing_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("refresh", "poster", "distribution"),
+                    method: "POST",
+                    data: {},
+                    dataType: "json",
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            this.setData({
+                                user_share_poster: res.data.data,
+                            });
+                            app.globalData.showToast(res.data.msg, "success");
+                        } else {
+                            if (app.globalData.is_login_check(res.data, self, "init")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 图片查看事件
+            images_show_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value != null) {
+                    uni.previewImage({
+                        current: value,
+                        urls: [value],
+                    });
+                } else {
+                    app.globalData.showToast(this.$t('poster.poster.eu3j21'));
+                }
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.text_copy_event(e);
+            },
+
+            // 分享事件
+            share_event(e) {
+                if ((this.$refs.share || null) != null) {
+                    this.$refs.share.init({
+                        type: 2,
+                        images: this.user_share_poster || this.user_share_qrode
+                    });
+                }
+            }
+        },
+    };
+</script>
+<style>
+    @import "./poster.css";
+</style>
diff --git a/pages/plugins/distribution/profit-detail/profit-detail.vue b/pages/plugins/distribution/profit-detail/profit-detail.vue
new file mode 100644
index 0000000..9c72e03
--- /dev/null
+++ b/pages/plugins/distribution/profit-detail/profit-detail.vue
@@ -0,0 +1,140 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="detail != null">
+            <view class="padding-horizontal-main padding-top-main">
+                <view v-if="detail_list.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="panel-content oh">
+                        <view v-for="(item, index) in detail_list" :key="index" class="item br-b-dashed oh padding-vertical-main">
+                            <view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
+                            <view class="content fl br-l padding-left-main">{{ item.value }}</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                data_bottom_line_status: false,
+                detail: null,
+                detail_list: [],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("detail", "profit", "distribution"),
+                    method: "POST",
+                    data: {
+                        id: this.params.id,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                detail: data.data,
+                                detail_list: [
+                                    { name: this.$t('order-detail.order-detail.x3ge6c'), value: data.data.total_price || "" },
+                                    { name: this.$t('order-detail.order-detail.v52n5r'), value: data.data.refund_price || "" },
+                                    { name: this.$t('profit.profit.utg512'), value: data.data.profit_price || "" },
+                                    { name: this.$t('profit.profit.6a7t71'), value: data.data.level_name || "" },
+                                    { name: this.$t('profit-detail.profit-detail.kn8yye'), value: data.data.status_name || "" },
+                                    { name: this.$t('user-order-detail.user-order-detail.yxwu8n'), value: data.data.order_status_name || "" },
+                                    { name: this.$t('profit-detail.profit-detail.x28rw5'), value: data.data.order_pay_status_name || "" },
+                                    { name: this.$t('order.order.330m76'), value: data.data.order_client_type_name || "" },
+                                    { name: this.$t('common.add_time'), value: data.data.add_time || "" },
+                                    { name: this.$t('common.upd_time'), value: data.data.upd_time || "" },
+                                ],
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: "",
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "init")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+        },
+    };
+</script>
+<style></style>
diff --git a/pages/plugins/distribution/profit/profit.css b/pages/plugins/distribution/profit/profit.css
new file mode 100644
index 0000000..170b1f8
--- /dev/null
+++ b/pages/plugins/distribution/profit/profit.css
@@ -0,0 +1,6 @@
+/*
+* 导航
+*/
+.nav-base .item {
+    width: 20%;
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/profit/profit.vue b/pages/plugins/distribution/profit/profit.vue
new file mode 100644
index 0000000..0b5a3d2
--- /dev/null
+++ b/pages/plugins/distribution/profit/profit.vue
@@ -0,0 +1,262 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav-base bg-white">
+            <view v-for="(item, index) in nav_status_list" :key="index">
+                <view :class="'item fl tc ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+            </view>
+        </view>
+
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                    <view class="base oh br-b padding-bottom-main">
+                        <text class="cr-base">{{ item.add_time }}</text>
+                        <text class="fr cr-main">{{ item.status_name }}</text>
+                    </view>
+                    <view :data-value="'/pages/plugins/distribution/profit-detail/profit-detail?id=' + item.id" @tap="url_event" class="content margin-top cp">
+                        <view v-for="(fv, fi) in content_list" :key="fi">
+                            <view class="single-text margin-top-xs">
+                                <text class="cr-grey margin-right-xl">{{ fv.name }}</text>
+                                <text class="cr-base">{{ item[fv.field] }}</text>
+                                <text v-if="(fv.unit || null) != null" class="cr-grey">{{ fv.unit }}</text>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                nav_status_list: [
+                    { name: this.$t('common.all'), value: "-1" },
+                    { name: this.$t('profit.profit.3c7zmg'), value: "0" },
+                    { name: this.$t('profit.profit.67o785'), value: "1" },
+                    { name: this.$t('profit.profit.l5knxu'), value: "2" },
+                    { name: this.$t('detail.detail.32171c'), value: "3" },
+                ],
+                nav_status_index: 0,
+                content_list: [
+                    { name: this.$t('order-detail.order-detail.x3ge6c'), field: "total_price" },
+                    { name: this.$t('order-detail.order-detail.v52n5r'), field: "refund_price" },
+                    { name: this.$t('profit.profit.utg512'), field: "profit_price" },
+                    { name: this.$t('profit.profit.6a7t71'), field: "level_name" },
+                ],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 是否指定状态
+            var nav_status_index = 0;
+            if ((params.status || null) != null) {
+                for (var i in this.nav_status_list) {
+                    if (this.nav_status_list[i]["value"] == params.status) {
+                        nav_status_index = i;
+                        break;
+                    }
+                }
+            }
+            this.setData({
+                params: params,
+                nav_status_index: nav_status_index,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 获取数据
+                var status = (this.nav_status_list[this.nav_status_index] || null) == null ? -1 : this.nav_status_list[this.nav_status_index]["value"];
+                uni.request({
+                    url: app.globalData.get_request_url("index", "profit", "distribution"),
+                    method: "POST",
+                    data: {
+                        page: this.data_page,
+                        status: status,
+                        is_more: 1,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_status_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import "./profit.css";
+</style>
diff --git a/pages/plugins/distribution/promotion-order/promotion-order.css b/pages/plugins/distribution/promotion-order/promotion-order.css
new file mode 100644
index 0000000..2624fbd
--- /dev/null
+++ b/pages/plugins/distribution/promotion-order/promotion-order.css
@@ -0,0 +1,14 @@
+/*
+* 导航
+*/
+.nav-base .item {
+    width: 33.33%;
+}
+
+/*
+* 列表
+*/
+.data-list .item .base .avatar {
+    width: 40rpx;
+    height: 40rpx !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/promotion-order/promotion-order.vue b/pages/plugins/distribution/promotion-order/promotion-order.vue
new file mode 100644
index 0000000..0f0da66
--- /dev/null
+++ b/pages/plugins/distribution/promotion-order/promotion-order.vue
@@ -0,0 +1,276 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav-base bg-white">
+            <view v-for="(item, index) in nav_type_list" :key="index">
+                <view :class="'item fl tc ' + (nav_type_index == index ? 'cr-main nav-active-line' : 'cr-grey')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+            </view>
+        </view>
+
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                    <view class="base oh br-b padding-bottom-main">
+                        <image class="avatar dis-block fl circle" :src="item.avatar" mode="widthFix" @tap="avatar_event" :data-value="item.avatar"></image>
+                        <text class="cr-base margin-left-sm">{{ item.user_name_view || "" }}</text>
+                        <text class="cr-base fr">{{ item.order_status_name }}</text>
+                    </view>
+                    <view :data-value="'/pages/plugins/distribution/order-detail/order-detail?id=' + item.id" @tap="url_event" class="content margin-top cp">
+                        <view v-for="(fv, fi) in content_list" :key="fi">
+                            <view class="single-text margin-top-xs">
+                                <text class="cr-grey margin-right-xl">{{ fv.name }}</text>
+                                <text class="cr-base">{{ item[fv.field] }}</text>
+                                <text v-if="(fv.unit || null) != null" class="cr-grey">{{ fv.unit }}</text>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                nav_type_list: [
+                    { name: this.$t('promotion-order.promotion-order.6rs63v'), value: 0 },
+                    { name: this.$t('promotion-order.promotion-order.iwa646'), value: 1 },
+                    { name: this.$t('promotion-order.promotion-order.2p5215'), value: 2 },
+                ],
+                nav_type_index: 0,
+                content_list: [
+                    { name: this.$t('order-detail.order-detail.36op8f'), field: "order_no" },
+                    { name: this.$t('order-detail.order-detail.x3ge6c'), field: "total_price" },
+                    { name: this.$t('user-order-detail.user-order-detail.23qj7m'), field: "order_pay_status_name" },
+                    { name: this.$t('order.order.330m76'), field: "order_client_type_name" },
+                    { name: this.$t('order-detail.order-detail.9153qn'), field: "add_time" },
+                ],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 是否指定状态
+            var nav_type_index = 0;
+            if (params.type != undefined) {
+                for (var i in this.nav_type_list) {
+                    if (this.nav_type_list[i]["value"] == params.type) {
+                        nav_type_index = i;
+                        break;
+                    }
+                }
+            }
+            this.setData({
+                params: params,
+                nav_type_index: nav_type_index,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 请求参数
+                var type = (this.nav_type_list[this.nav_type_index] || null) == null ? -1 : this.nav_type_list[this.nav_type_index]["value"];
+                var data = this.params;
+                data['page'] = this.data_page;
+                data['type'] = type;
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("index", "promotionorder", "distribution"),
+                    method: "POST",
+                    data: data,
+                    dataType: "json",
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_type_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 头像查看
+            avatar_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value != null) {
+                    uni.previewImage({
+                        current: value,
+                        urls: [value],
+                    });
+                } else {
+                    app.globalData.showToast(this.$t('order.order.p3scy0'));
+                }
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import "./promotion-order.css";
+</style>
diff --git a/pages/plugins/distribution/promotion-user/promotion-user.css b/pages/plugins/distribution/promotion-user/promotion-user.css
new file mode 100644
index 0000000..7002fcc
--- /dev/null
+++ b/pages/plugins/distribution/promotion-user/promotion-user.css
@@ -0,0 +1,17 @@
+/*
+* 列表
+*/
+.data-list .item .base .avatar {
+    width: 40rpx;
+    height: 40rpx !important;
+}
+
+/* 
+ * 隐藏滚动条
+ */
+ scroll-view ::-webkit-scrollbar {
+    display: none;
+    width: 0;
+    height: 0;
+    color: transparent;
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/promotion-user/promotion-user.vue b/pages/plugins/distribution/promotion-user/promotion-user.vue
new file mode 100644
index 0000000..08c78e9
--- /dev/null
+++ b/pages/plugins/distribution/promotion-user/promotion-user.vue
@@ -0,0 +1,310 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav-base bg-white scroll-view-horizontal padding-horizontal-main">
+            <scroll-view :scroll-x="true" :show-scrollbar="false" :scroll-with-animation="true" :scroll-into-view="'one-nav-item-' + nav_type_index" class="top-nav-scroll">
+                <block v-for="(item, index) in nav_type_list" :key="index">
+                    <view :class="'item dis-inline-block margin-right-lg ' + (nav_type_index == index ? 'cr-main nav-active-line' : 'cr-grey')" :id="'one-nav-item-' + index" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+                </block>
+            </scroll-view>
+        </view>
+
+        <!-- 数据列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                    <view class="base oh br-b padding-bottom-main">
+                        <image class="avatar dis-block fl circle" :src="item.avatar" mode="widthFix" @tap="avatar_event" :data-value="item.avatar"></image>
+                        <text class="cr-base margin-left-sm">{{ item.user_name_view || "" }}</text>
+                        <text class="cr-base fr">{{ item.add_time }}</text>
+                    </view>
+                    <view class="content margin-top">
+                        <block v-for="(fv, fi) in content_list" :key="fi">
+                            <view class="single-text margin-top-xs">
+                                <text class="cr-grey margin-right-xl">{{ fv.name }}</text>
+                                <text class="cr-base" :data-event="fv.event" :data-value="item[fv.field]" @tap="text_event">{{ item[fv.field] || fv.default }}</text>
+                                <text v-if="(fv.unit || null) != null" class="cr-grey">{{ fv.unit }}</text>
+                            </view>
+                        </block>
+                    </view>
+                    <view class="item-operation tr br-t padding-top-main margin-top-main">
+                        <button v-if="(item.email || null) != null" class="round bg-white br cr-base" type="default" size="mini" hover-class="none" @tap="text_event" data-event="copy" :data-value="item.email">{{$t('login.login.p54kf1')}}</button>
+                        <button v-if="(item.mobile || null) != null" class="round bg-white br cr-base" type="default" size="mini" hover-class="none" @tap="text_event" data-event="tel" :data-value="item.mobile">{{$t('promotion-user.promotion-user.62c8m1')}}</button>
+                        <button class="round bg-white br cr-base" type="default" size="mini" hover-class="none" @tap="user_order_event" :data-value="item.id">{{$t('promotion-user.promotion-user.i2rf31')}}</button>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                nav_type_list: [
+                    { name: this.$t('promotion-user.promotion-user.o6qi74'), value: 0 },
+                    { name: this.$t('promotion-user.promotion-user.kx7595'), value: 1 },
+                    { name: this.$t('promotion-user.promotion-user.2ey5t1'), value: 2 },
+                    { name: this.$t('promotion-user.promotion-user.852zib'), value: 3 },
+                    { name: this.$t('promotion-user.promotion-user.h8mx3e'), value: 4 },
+                    { name: this.$t('promotion-user.promotion-user.fvbq25'), value: 5 },
+                ],
+                // 导航下标
+                nav_type_index: 0,
+                content_list: [
+                    { name: this.$t('promotion-user.promotion-user.2g7enc'), field: "order_count", unit: "", default: 0 },
+                    { name: this.$t('promotion-user.promotion-user.32bf15'), field: "order_total", unit: "", default: 0 },
+                    { name: this.$t('promotion-user.promotion-user.76748p'), field: "order_last_time", default: "" },
+                    { name: this.$t('promotion-user.promotion-user.u43380'), field: "find_order_count", unit: "", default: 0 },
+                    { name: this.$t('promotion-user.promotion-user.8n4tr3'), field: "find_order_total", unit: "", default: 0 },
+                    { name: this.$t('promotion-user.promotion-user.1gc3ny'), field: "find_order_last_time", default: "" },
+                    { name: this.$t('promotion-user.promotion-user.3l1187'), field: "referrer_count", unit: "", default: 0 },
+                ],
+                nav_search_buy_type_list: [
+                    { value: -1, name: this.$t('common.all') },
+                    { value: 0, name: this.$t('promotion-user.promotion-user.g5332w') },
+                    { value: 1, name: this.$t('promotion-user.promotion-user.8i641g') },
+                ],
+                nav_search_value: {
+                    team_search_user_time_start: "",
+                    team_search_user_time_end: "",
+                    team_search_user_time_reverse: [],
+                    team_search_order_time_start: "",
+                    team_search_order_time_end: "",
+                    team_search_order_time_reverse: [],
+                    team_search_buy_type: [],
+                },
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 是否指定状态
+            var nav_type_index = 0;
+            if (params.type != undefined) {
+                for (var i in this.nav_type_list) {
+                    if (this.nav_type_list[i]["value"] == params.type) {
+                        nav_type_index = i;
+                        break;
+                    }
+                }
+            }
+            this.setData({
+                params: params,
+                nav_type_index: nav_type_index,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 请求参数
+                var type = (this.nav_type_list[this.nav_type_index] || null) == null ? 0 : this.nav_type_list[this.nav_type_index]["value"];
+                var data = this.params;
+                data['page'] = this.data_page;
+                data['type'] = type;
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("index", "promotionuser", "distribution"),
+                    method: "POST",
+                    data: data,
+                    dataType: "json",
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 头像查看
+            avatar_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value != null) {
+                    uni.previewImage({
+                        current: value,
+                        urls: [value],
+                    });
+                } else {
+                    app.globalData.showToast(this.$t('order.order.p3scy0'));
+                }
+            },
+
+            // 用户订单事件
+            user_order_event(e) {
+                var value = e.currentTarget.dataset.value;
+                app.globalData.url_open('/pages/plugins/distribution/order/order?uid=' + value);
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_type_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 文本事件
+            text_event(e) {
+                app.globalData.text_event_handle(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import "./promotion-user.css";
+</style>
diff --git a/pages/plugins/distribution/recommend-detail/recommend-detail.css b/pages/plugins/distribution/recommend-detail/recommend-detail.css
new file mode 100644
index 0000000..20143bf
--- /dev/null
+++ b/pages/plugins/distribution/recommend-detail/recommend-detail.css
@@ -0,0 +1,66 @@
+/**
+* 基础
+*/
+.base-container .icon {
+    width: 50rpx;
+    height: 50rpx;
+}
+.base-container .title {
+    width: calc(100% - 240rpx);
+}
+.base-container .share-submit {
+    line-height: 50rpx;
+    height: 50rpx;
+}
+
+/**
+* 商品列表
+*/
+.data-list .item .goods-img {
+    width:170rpx;
+    height: 170rpx !important;
+}
+.data-list .item .right-base {
+    width: calc(100% - 190rpx);
+}
+.data-list .item .spec-text {
+    width: calc(100% - 240rpx);
+}
+
+/**
+ * 数量操作
+ */
+.data-list .item .number-content {
+    right: 20rpx;
+    bottom: 20rpx;
+    border: 1px solid #f0f0f0;
+}
+.data-list .item .number-content .number-submit {
+    width: 60rpx;
+    font-weight: bold;
+}
+.data-list .item .number-content input {
+    width: 50px;
+    border-width: 0 1px 0 1px;
+    border-style: solid;
+    border-color: #f0f0f0;
+}
+.data-list .item .number-content .number-submit,
+.data-list .item .number-content input {
+    padding: 0;
+    height: 50rpx;
+    line-height: 50rpx;
+}
+
+/**
+ * 导航
+ */
+.nav-button {
+    box-shadow: 0 -2px 6px #e2e2e2;
+}
+.nav-button .left-price {
+    width: calc(100% - 270rpx);
+}
+.nav-button .right-button {
+    width: 250rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/recommend-detail/recommend-detail.vue b/pages/plugins/distribution/recommend-detail/recommend-detail.vue
new file mode 100644
index 0000000..2abaa27
--- /dev/null
+++ b/pages/plugins/distribution/recommend-detail/recommend-detail.vue
@@ -0,0 +1,381 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data || null) != null" class="page-bottom-fixed">
+            <view class="padding-horizontal-main padding-top-main">
+                <!-- 基础信息 -->
+                <view class="base-container oh spacing-mb">
+                    <image v-if="(data.icon || null) != null" class="dis-inline-block round br va-m margin-right-sm icon" :src="data.icon" mode="aspectFit"></image>
+                    <view class="text-size cr-base fw dis-inline-block va-m title">{{ data.title }}</view>
+                    <button class="round bg-white br-green cr-green fr share-submit" type="default" size="mini" hover-class="none" @tap="share_event" :data-index="index">
+                        <view class="dis-inline-block va-m">
+                            <uni-icons type="redo" size="34rpx" color="#1AAD19"></uni-icons>
+                        </view>
+                        <text class="va-m">{{$t('common.share')}}</text>
+                    </button>
+                </view>
+
+                <view v-if="(data.detail_list || null) != null && data.detail_list.length > 0">
+                    <!-- 商品 -->
+                    <view class="data-list oh">
+                        <view v-for="(item, index) in data.detail_list" :key="index" :class="'item padding-main border-radius-main bg-white oh pr spacing-mb ' + (item.goods.is_error == 0 ? '' : 'br-red')">
+                            <image class="goods-img dis-block border-radius-main fl" :src="item.goods.images" mode="aspectFit" :data-value="item.goods.goods_url" @tap="url_event"></image>
+                            <view class="right-base fr">
+                                <label v-if="item.goods.is_error == 0" class="fr" :data-index="index" @tap="goods_choice_event">
+                                    <radio :checked="item.checked == undefined || item.checked == true" style="transform: scale(0.9)" />
+                                </label>
+                                <view class="single-text padding-right">{{ item.goods.title }}</view>
+                                <view class="single-text margin-top-lg">
+                                    <text class="sales-price">{{ currency_symbol }}{{ item.goods.price }}</text>
+                                    <text v-if="item.goods.original_price != 0" class="original-price margin-left-sm">{{ currency_symbol }}{{ item.goods.original_price }}</text>
+                                    <text class="cr-grey text-size-xs fr">{{ item.goods.inventory }}{{ item.goods.inventory_unit }}</text>
+                                </view>
+                                <view class="margin-top-sm">
+                                    <view v-if="item.goods.is_error == 0">
+                                        <view v-if="(item.spec_text_view || null) != null" class="cr-grey text-size-xs spec-text">{{ item.spec_text_view }}</view>
+                                        <view class="number-content tc oh round pa">
+                                            <view class="number-submit tc cr-grey fl va-m" data-type="0" :data-index="index" @tap="goods_buy_number_event">-</view>
+                                            <input class="tc cr-grey bg-white fl va-m radius-0" type="number" :value="item.stock || item.goods.buy_min_number || 1" :data-index="index" @blur="goods_buy_number_blur" />
+                                            <view class="number-submit tc cr-grey fl va-m" data-type="1" :data-index="index" @tap="goods_buy_number_event">+</view>
+                                        </view>
+                                    </view>
+                                    <view v-else class="cr-red text-size-xs tr margin-top-xxl">{{ item.goods.error_msg }}</view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+
+                    <!-- 导航 -->
+                    <view class="nav-button bg-white pf pa-w bottom-0 left-0 right-0 wh-auto">
+                        <view class="padding-main">
+                            <view class="oh">
+                                <view class="left-price fl">
+                                    <view class="sales-price single-text margin-top-sm">{{ currency_symbol }}{{ data.total_price }}</view>
+                                </view>
+                                <view class="right-button fr tr">
+                                    <button type="default" size="mini" class="bg-main br-main cr-white round dis-block text-size-sm" @tap="buy_event">{{$t('detail.detail.27pmj3')}}</button>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <view v-else>
+                    <!-- 提示信息 -->
+                    <component-no-data propStatus="0" :propMsg="$t('detail.detail.5knxg6')"></component-no-data>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+
+            <!-- 分享弹窗 -->
+            <component-share-popup ref="share"></component-share-popup>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import base64 from '@/common/js/lib/base64.js';
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentSharePopup from '@/components/share-popup/share-popup';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                currency_symbol: app.globalData.currency_symbol(),
+                params: null,
+                user: null,
+                data_base: null,
+                data: null,
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentSharePopup,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 初始化配置
+            this.init_config();
+
+            // 获取数据
+            this.get_data();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        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');
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('detail', 'recommend', 'distribution'),
+                    method: 'POST',
+                    data: {
+                        id: this.params.id || 0,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data: data || null,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: (data || null) != null,
+                            });
+
+                            if ((this.data || null) != null) {
+                                // 基础自定义分享
+                                this.setData({
+                                    share_info: {
+                                        title: this.data.seo_title || this.data.title,
+                                        desc: this.data.seo_desc || this.data.describe,
+                                        path: '/pages/plugins/distribution/recommend-detail/recommend-detail',
+                                        query: 'id=' + this.data.id,
+                                        img: this.data.icon || '',
+                                    },
+                                });
+
+                                // 标题
+                                if ((this.data.title || null) != null) {
+                                    uni.setNavigationBarTitle({
+                                        title: this.data.title,
+                                    });
+                                }
+                            }
+                        } 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: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 商品选择事件
+            goods_choice_event(e) {
+                // 选择处理
+                var index = e.currentTarget.dataset.index || 0;
+                var temp_data = this.data;
+                var detail_list = temp_data.detail_list;
+                detail_list[index]['checked'] = detail_list[index]['checked'] == undefined || detail_list[index]['checked'] == true ? false : true;
+                temp_data['detail_list'] = detail_list;
+                this.setData({ data: temp_data });
+
+                // 导航总数处理
+                this.nav_total_handle();
+            },
+
+            // 导航总数处理
+            nav_total_handle() {
+                var temp_data = this.data;
+                var detail_list = temp_data.detail_list;
+                var total_price = 0;
+                for (var i in detail_list) {
+                    if ((detail_list[i]['checked'] == undefined || detail_list[i]['checked'] == true) && detail_list[i]['goods']['is_error'] == 0) {
+                        var stock = parseInt(detail_list[i]['stock'] || detail_list[i]['goods']['buy_min_number'] || 1);
+                        total_price += parseFloat(detail_list[i]['goods']['price'] || 0) * stock;
+                    }
+                }
+                temp_data['total_price'] = app.globalData.price_two_decimal(total_price);
+                this.setData({ data: temp_data });
+            },
+
+            // 立即购买
+            buy_event(e) {
+                // 是否需要选择商品
+                var type = parseInt(this.data.type || 0);
+                var goods_data = [];
+                var temp_goods = this.data.detail_list;
+                for (var i in temp_goods) {
+                    if (temp_goods[i]['goods']['is_error'] == 0 && (temp_goods[i]['checked'] == undefined || temp_goods[i]['checked'] == true)) {
+                        goods_data.push({
+                            goods_id: temp_goods[i]['goods']['id'],
+                            stock: temp_goods[i]['stock'] || temp_goods[i]['goods']['buy_min_number'] || 1,
+                            spec: temp_goods[i]['spec'] || '',
+                        });
+                    }
+                }
+                var buy_min_number = 1;
+                if (goods_data.length < buy_min_number) {
+                    app.globalData.showToast(this.$t('detail.detail.jsj3u8') + buy_min_number + this.$t('detail.detail.jksm81'));
+                    return false;
+                }
+
+                // 进入订单确认页面
+                var data = {
+                    buy_type: 'goods',
+                    goods_data: encodeURIComponent(base64.encode(JSON.stringify(goods_data))),
+                };
+                app.globalData.url_open('/pages/buy/buy?data=' + encodeURIComponent(base64.encode(JSON.stringify(data))));
+            },
+
+            // 数量输入事件
+            goods_buy_number_blur(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var temp_data = this.data;
+                var detail_list = temp_data.detail_list;
+                var item = detail_list[index];
+                var goods = item['goods'];
+                var number = parseInt(e.detail.value) || 1;
+                if (isNaN(number)) {
+                    number = goods['buy_min_number'] || 1;
+                }
+                this.goods_stock_handle(index, temp_data, detail_list, item, goods, number);
+            },
+
+            // 数量操作事件
+            goods_buy_number_event(e) {
+                var type = parseInt(e.currentTarget.dataset.type || 0);
+                var index = e.currentTarget.dataset.index || 0;
+                var temp_data = this.data;
+                var detail_list = temp_data.detail_list;
+                var item = detail_list[index];
+                var goods = item['goods'];
+                var temp_stock = parseInt(item['stock'] || goods['buy_min_number'] || 1);
+                var number = type == 0 ? temp_stock - 1 : temp_stock + 1;
+                this.goods_stock_handle(index, temp_data, detail_list, item, goods, number);
+            },
+
+            // 数量处理方法
+            goods_stock_handle(index, temp_data, detail_list, item, goods, number) {
+                var buy_min_number = parseInt(goods.buy_min_number || 1);
+                var buy_max_number = parseInt(goods.buy_max_number || 0);
+                var inventory = parseInt(goods.inventory || 0);
+                var inventory_unit = goods.inventory_unit;
+
+                // 最小起购数量
+                if (buy_min_number > 0 && number < buy_min_number) {
+                    number = buy_min_number;
+                    app.globalData.showToast(this.$t('recommend-detail.recommend-detail.265vyu') + buy_min_number + inventory_unit);
+                }
+
+                // 最大购买数量
+                if (buy_max_number > 0 && number > buy_max_number) {
+                    number = buy_max_number;
+                    app.globalData.showToast(this.$t('goods-category.goods-category.z1eh3v') + buy_max_number + inventory_unit);
+                }
+
+                // 是否超过库存数量
+                if (number > inventory) {
+                    number = inventory;
+                    app.globalData.showToast(this.$t('recommend-detail.recommend-detail.2sis3v') + inventory + inventory_unit);
+                }
+
+                // 获取数据
+                var data = this.params;
+                data['id'] = goods.id;
+                data['spec'] = item.spec || '';
+                data['stock'] = number;
+                uni.request({
+                    url: app.globalData.get_request_url('stock', 'goods'),
+                    method: 'POST',
+                    data: data,
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            // 基础数据
+                            detail_list[index]['stock'] = number;
+                            detail_list[index]['goods']['price'] = res.data.data.spec_base.price;
+                            detail_list[index]['goods']['original_price'] = res.data.data.spec_base.original_price;
+                            detail_list[index]['goods']['inventory'] = res.data.data.spec_base.inventory;
+                            temp_data['detail_list'] = detail_list;
+                            this.setData({
+                                data: temp_data,
+                            });
+
+                            // 导航总数处理
+                            this.nav_total_handle();
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 分享开启弹层
+            share_event(e) {
+                if ((this.$refs.share || null) != null) {
+                    this.$refs.share.init({
+                        share_info: this.share_info
+                    });
+                }
+            },
+        },
+    };
+</script>
+<style>
+    @import './recommend-detail.css';
+</style>
diff --git a/pages/plugins/distribution/recommend-form/recommend-form.css b/pages/plugins/distribution/recommend-form/recommend-form.css
new file mode 100644
index 0000000..140cce3
--- /dev/null
+++ b/pages/plugins/distribution/recommend-form/recommend-form.css
@@ -0,0 +1,36 @@
+/**
+ * 商品列表
+ */
+.view-goods-list image {
+    width: 130rpx;
+    height: 130rpx;
+}
+.view-goods-list .base {
+    width: calc(100% - 150rpx);
+}
+.view-goods-list .operate-submit {
+    right: 0;
+    bottom: 0;
+}
+
+/**
+ * 商品选择弹窗
+ */
+.popup-goods-choice-container .nav-search {
+    height: 90rpx;
+}
+.popup-goods-choice-container .nav-search .item {
+    width: calc(50% - 140rpx);
+    height: 60rpx;
+    line-height: 60rpx;
+}
+.popup-goods-choice-container .nav-search input.item,
+.popup-goods-choice-container .nav-search button {
+    height: 64rpx;
+    line-height: 64rpx;
+}
+.popup-goods-choice-container .view-goods-list {
+    height: 80vh;
+    overflow-y: scroll;
+    overflow-x: hidden;
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/recommend-form/recommend-form.vue b/pages/plugins/distribution/recommend-form/recommend-form.vue
new file mode 100644
index 0000000..5513497
--- /dev/null
+++ b/pages/plugins/distribution/recommend-form/recommend-form.vue
@@ -0,0 +1,582 @@
+<template>
+    <view :class="theme_view">
+        <view class="page-bottom-fixed">
+            <block v-if="data_list_loding_status == 3">
+                <form @submit="form_submit" class="form-container">
+                    <view class="padding-main oh">
+                        <view class="form-gorup bg-white form-container-upload oh">
+                            <view class="form-gorup-title">{{$t('recommend-form.recommend-form.57zrl5')}}<text class="form-group-tips">{{$t('recommend-form.recommend-form.3vk50b')}}</text></view>
+                            <view class="form-upload-data oh">
+                                <block v-if="(recommend_data.icon || null) != null">
+                                    <view class="item fl">
+                                        <text class="delete-icon" @tap="upload_delete_event">x</text>
+                                        <image :src="recommend_data.icon" @tap="upload_show_event" mode="aspectFill"></image>
+                                    </view>
+                                </block>
+                                <image class="item fl upload-icon" :src="common_static_url + 'upload-icon.png'" mode="aspectFill" @tap="file_upload_event"></image>
+                            </view>
+                        </view>
+
+                        <view class="form-gorup bg-white">
+                            <view class="form-gorup-title">{{$t('user-detail.user-detail.uy6lrz')}}<text class="form-group-tips-must">*</text></view>
+                            <input type="text" name="title" :value="recommend_data.title || ''" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('recommend-form.recommend-form.q4qr64')" />
+                        </view>
+
+                        <view class="form-gorup bg-white">
+                            <view class="form-gorup-title">{{$t('form.form.xy87t8')}}</view>
+                            <input type="text" name="describe" :value="recommend_data.describe || ''" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('recommend-form.recommend-form.29au77')" />
+                        </view>
+
+                        <view class="form-gorup anonymous">
+                            <view class="form-gorup-title">{{$t('form.form.043a10')}}</view>
+                            <switch name="is_enable" style="transform: scale(0.9)" class="margin-top-sm" :checked="recommend_data.is_enable == 1"></switch>
+                        </view>
+
+                        <view class="form-gorup bg-white">
+                            <view class="form-gorup-title">{{$t('recommend-form.recommend-form.5ws7m3')}}<text class="form-group-tips-must">*</text></view>
+                            <view v-if="(recommend_data.detail_list || null) != null && recommend_data.detail_list.length > 0" class="margin-top-lg view-goods-list">
+                                <block v-for="(item, index) in recommend_data.detail_list" :key="index">
+                                    <view v-if="(item.goods || null) != null" :class="'item oh pr ' + (index > 0 ? 'br-t-dashed padding-top-lg margin-top-lg' : '')">
+                                        <view :data-value="item.goods.goods_url" @tap="url_event" class="cp br dis-block fl radius oh">
+                                            <image :src="item.goods.images" mode="aspectFill" class="dis-block"></image>
+                                        </view>
+                                        <view class="base fr">
+                                            <view class="cr-base single-text">{{ item.goods.title }}</view>
+                                            <view class="margin-top-xs">
+                                                <text class="sales-price">{{ currency_symbol }}{{ item.goods.price }}</text>
+                                                <text class="fr cr-grey">{{ item.goods.inventory }}{{ item.goods.inventory_unit }}</text>
+                                            </view>
+                                            <view v-if="(item.spec_text_view || null) != null" class="cr-grey margin-top-xs text-size-xs">{{ item.spec_text_view }}</view>
+                                            <text class="br-red cr-red text-size-xs padding-horizontal-main padding-top-xs padding-bottom-xs round pa cp operate-submit" :data-index="index" @tap="goods_remove_event">{{$t('recommend-form.recommend-form.q536vp')}}</text>
+                                        </view>
+                                    </view>
+                                </block>
+                            </view>
+                            <view class="margin-top-sm padding-vertical-main">
+                                <text class="br-dashed-grey cr-base text-size-sm padding-horizontal-main padding-top-xs padding-bottom-xs round cp" @tap="goods_add_event">{{$t('recommend-form.recommend-form.27goz3')}}</text>
+                            </view>
+                        </view>
+
+                        <view class="bottom-fixed" :style="bottom_fixed_style">
+                            <view class="bottom-line-exclude">
+                                <button class="item bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :disabled="form_submit_disabled_status">{{$t('form.form.4yd066')}}</button>
+                            </view>
+                        </view>
+                    </view>
+                </form>
+
+                <!-- 商品选择弹窗 -->
+                <component-popup :propShow="popup_goods_choice_status" propPosition="bottom" @onclose="popup_goods_choice_close_event">
+                    <view class="padding-top-main bg-white">
+                        <view class="padding-horizontal-main">
+                            <view class="close oh">
+                                <view class="fr" @tap.stop="popup_goods_choice_close_event">
+                                    <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                                </view>
+                            </view>
+                        </view>
+                        <view class="popup-goods-choice-container">
+                            <view class="nav-search oh br-b margin-top-sm padding-horizontal-main">
+                                <picker class="item br round fl padding-horizontal-main" @change="popup_goods_category_event" :value="popup_goods_cetagory_index" :range="goods_category_list" range-key="name">
+                                    <view :class="'picker ' + (popup_goods_cetagory_index == 0 ? 'cr-grey' : 'cr-base') + ' arrow-bottom'">
+                                        {{ popup_goods_cetagory_index == 0 ? $t('recommend-form.recommend-form.203itn') : goods_category_list[popup_goods_cetagory_index]['name'] }}
+                                    </view>
+                                </picker>
+                                <input type="search" :value="popup_keywords_value" placeholder-class="cr-grey" class="cr-base item br round fl padding-horizontal-main margin-left-main" :placeholder="$t('recommend-form.recommend-form.h5v45f')" @input="popup_keywords_value_event" @confirm="popup_goods_search_event" />
+                                <button type="default" size="mini" class="bg-main br-main cr-white text-size-xs round fr" @tap="popup_goods_search_event">{{$t('common.search')}}</button>
+                            </view>
+                            <view class="view-goods-list padding-horizontal-main">
+                                <block v-if="popup_search_goods_list.length > 0">
+                                    <block v-for="(item, index) in popup_search_goods_list" :key="index">
+                                        <view :class="'item oh pr margin-top-lg ' + (index > 0 ? 'br-t-dashed padding-top-lg' : '')">
+                                            <view :data-value="item.goods_url" @tap="url_event" class="cp br dis-block fl radius oh">
+                                                <image :src="item.images" mode="aspectFill" class="dis-block"></image>
+                                            </view>
+                                            <view class="base fr">
+                                                <view class="cr-base single-text">{{ item.title }}</view>
+                                                <view class="margin-top-xs sales-price">{{ currency_symbol }}{{ item.price }}</view>
+                                                <view class="cr-grey margin-top-xs text-size-xs">{{ item.inventory }}{{ item.inventory_unit }}</view>
+                                                <text class="br-green cr-green text-size-xs padding-horizontal-main padding-top-xs padding-bottom-xs round pa cp operate-submit" :data-index="index" @tap="popup_goods_choice_event">{{$t('buy.buy.inyxpx')}}</text>
+                                            </view>
+                                        </view>
+                                    </block>
+                                    <view class="tc br-t-dashed padding-vertical-main margin-top-main cr-grey text-size-xs">{{$t('recommend-form.recommend-form.6rlju7')}}{{ popup_search_goods_list.length }}{{$t('goods-search.goods-search.t9nikq')}}</view>
+                                </block>
+                                <block v-else>
+                                    <component-no-data :propStatus="search_data_list_loding_status" :propMsg="search_data_list_loding_msg"></component-no-data>
+                                </block>
+                            </view>
+                        </view>
+                    </view>
+                </component-popup>
+
+                <!-- 规格选择 -->
+                <component-goods-spec-choice ref="goods_spec_choice" v-on:specConfirmEvent="spec_confirm_event" propIndex="101"></component-goods-spec-choice>
+            </block>
+            <block v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </block>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import base64 from '@/common/js/lib/base64.js';
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentPopup from '@/components/popup/popup';
+    import componentGoodsSpecChoice from '@/components/goods-spec-choice/goods-spec-choice';
+    var common_static_url = app.globalData.get_static_url('common');
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                bottom_fixed_style: '',
+                params: {},
+                recommend_data: {},
+                form_submit_disabled_status: false,
+                currency_symbol: app.globalData.currency_symbol(),
+                // 商品选择弹窗
+                popup_goods_choice_status: false,
+                goods_category_list: [],
+                popup_goods_cetagory_index: 0,
+                popup_keywords_value: '',
+                popup_search_goods_list: [],
+                search_data_list_loding_status: 1,
+                search_data_list_loding_msg: this.$t('recommend-form.recommend-form.20m5gj'),
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentPopup,
+            componentGoodsSpecChoice,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            // 初始数据
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                } else {
+                    uni.stopPullDownRefresh();
+                    this.setData({
+                        data_list_loding_status: 2,
+                        data_list_loding_msg: this.$t('extraction-apply.extraction-apply.m3xdif'),
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('savedata', 'recommend', 'distribution'),
+                    method: 'POST',
+                    data: {...this.params, ...{lang_can_key: 'goods_category_list'}},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            // 如果存在分类则在最前面增加全部分类选项
+                            var goods_category_list = data.goods_category_list || [];
+                            if (goods_category_list.length > 0) {
+                                goods_category_list.unshift({ id: null, name: this.$t('recommend-form.recommend-form.7gc30l') });
+                            }
+                            this.setData({
+                                data_list_loding_status: 3,
+                                recommend_data: data.data || {},
+                                goods_category_list: goods_category_list,
+                                editor_path_type: data.editor_path_type || '',
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 0,
+                            data_list_loding_msg: this.$t('extraction-apply.extraction-apply.h8f437'),
+                        });
+                    },
+                });
+            },
+
+            // 数据提交
+            form_submit(e) {
+                // 表单数据
+                var form_data = e.detail.value;
+
+                // 基础数据
+                if ((this.recommend_data || null) != null) {
+                    form_data['id'] = this.recommend_data.id || '';
+                    form_data['icon'] = this.recommend_data.icon || '';
+
+                    // 关联商品
+                    if ((this.recommend_data.detail_list || null) != null && this.recommend_data.detail_list.length > 0) {
+                        var goods_data = [];
+                        this.recommend_data.detail_list.forEach((item, index) => {
+                            goods_data.push({
+                                goods_id: item.goods_id,
+                                spec: item.spec || '',
+                            });
+                        });
+                        if (goods_data.length > 0) {
+                            form_data['goods_data'] = encodeURIComponent(base64.encode(JSON.stringify(goods_data)));
+                        }
+                    }
+                }
+
+                // 校验参数并提交
+                var validation = [
+                    { fields: 'title', msg: this.$t('recommend-form.recommend-form.yd3833') },
+                    { fields: 'goods_data', msg: this.$t('recommend-form.recommend-form.31k41l') },
+                ];
+                if (app.globalData.fields_check(form_data, validation)) {
+                    this.setData({
+                        form_submit_disabled_status: true,
+                    });
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('save', 'recommend', 'distribution'),
+                        method: 'POST',
+                        data: form_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                                setTimeout(function () {
+                                    uni.$emit('refresh');
+                                    uni.navigateBack();
+                                }, 1000);
+                            } else {
+                                this.setData({
+                                    form_submit_disabled_status: false,
+                                });
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            this.setData({
+                                form_submit_disabled_status: false,
+                            });
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 上传图片预览
+            upload_show_event(e) {
+                uni.previewImage({
+                    current: this.recommend_data.icon,
+                    urls: [this.recommend_data.icon],
+                });
+            },
+
+            // 图片删除
+            upload_delete_event(e) {
+                var self = this;
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('order.order.psi67g'),
+                    success(res) {
+                        if (res.confirm) {
+                            var temp_data = self.recommend_data || {};
+                            temp_data['icon'] = '';
+                            self.setData({
+                                recommend_data: temp_data,
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 文件上传
+            file_upload_event(e) {
+                var self = this;
+                uni.chooseImage({
+                    count: 1,
+                    success(res) {
+                        var success = 0;
+                        var fail = 0;
+                        var length = res.tempFilePaths.length;
+                        var count = 0;
+                        self.upload_one_by_one(res.tempFilePaths, success, fail, count, length);
+                    },
+                });
+            },
+
+            // 采用递归的方式上传多张
+            upload_one_by_one(img_paths, success, fail, count, length) {
+                var self = this;
+                uni.uploadFile({
+                    url: app.globalData.get_request_url('index', 'ueditor'),
+                    filePath: img_paths[count],
+                    name: 'upfile',
+                    formData: {
+                        action: 'uploadimage',
+                        path_type: self.editor_path_type,
+                    },
+                    success: function (res) {
+                        success++;
+                        if (res.statusCode == 200) {
+                            var data = typeof res.data == 'object' ? res.data : JSON.parse(res.data);
+                            if (data.code == 0 && (data.data.url || null) != null) {
+                                var temp_data = self.recommend_data || {};
+                                temp_data['icon'] = data.data.url;
+                                self.setData({
+                                    recommend_data: temp_data,
+                                });
+                            } else {
+                                app.globalData.showToast(data.msg);
+                            }
+                        }
+                    },
+                    fail: function (e) {
+                        fail++;
+                    },
+                    complete: function (e) {
+                        count++;
+
+                        // 下一张
+                        if (count >= length) {
+                            // 上传完毕，作一下提示
+                            //app.showToast('上传成功' + success +'张', 'success');
+                        } else {
+                            // 递归调用，上传下一张
+                            self.upload_one_by_one(img_paths, success, fail, count, length);
+                        }
+                    },
+                });
+            },
+
+            // 商品移除
+            goods_remove_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var temp_data = this.recommend_data;
+                temp_data.detail_list.splice(index, 1);
+                this.setData({
+                    recommend_data: temp_data,
+                });
+            },
+
+            // 商品选择开启弹层
+            goods_add_event(e) {
+                this.setData({
+                    popup_goods_choice_status: true,
+                });
+                // 没有商品列表则调用商品搜索方法
+                if (this.popup_search_goods_list.length == 0) {
+                    this.popup_goods_search_event();
+                }
+            },
+
+            // 商品选择关闭弹层
+            popup_goods_choice_close_event(e) {
+                this.setData({
+                    popup_goods_choice_status: false,
+                });
+            },
+
+            // 商品分类选择事件
+            popup_goods_category_event(e) {
+                this.setData({
+                    popup_goods_cetagory_index: parseInt(e.detail.value || 0),
+                });
+            },
+
+            // 商品关键字名称输入事件
+            popup_keywords_value_event(e) {
+                this.setData({
+                    popup_keywords_value: e.detail.value,
+                });
+            },
+
+            // 商品搜索事件
+            popup_goods_search_event() {
+                var data = {
+                    keywords: this.popup_keywords_value,
+                };
+                if (this.popup_goods_cetagory_index > 0) {
+                    data['category_id'] = this.goods_category_list[this.popup_goods_cetagory_index]['id'];
+                }
+
+                uni.showLoading({
+                    title: this.$t('common.processing_in_text'),
+                });
+                this.setData({
+                    search_data_list_loding_status: 1,
+                    search_data_list_loding_msg: this.$t('recommend-form.recommend-form.e5k407'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('goodssearch', 'recommend', 'distribution'),
+                    method: 'POST',
+                    data: data,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            var list = res.data.data || [];
+                            this.setData({
+                                popup_search_goods_list: list,
+                                search_data_list_loding_status: list.length > 0 ? 3 : 0,
+                                search_data_list_loding_msg: list.length > 0 ? '' : this.$t('detail.detail.5knxg6'),
+                            });
+                        } else {
+                            this.setData({
+                                search_data_list_loding_status: 0,
+                                search_data_list_loding_msg: res.data.msg,
+                            });
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        this.setData({
+                            search_data_list_loding_status: 2,
+                            search_data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+
+            // 弹窗商品选择
+            popup_goods_choice_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var goods = this.popup_search_goods_list[index];
+                var temp_data = this.recommend_data;
+                // 是否多规格
+                if (parseInt(goods.is_exist_many_spec || 0) == 1) {
+                    if ((this.$refs.goods_spec_choice || null) != null) {
+                        this.$refs.goods_spec_choice.init(goods.id, goods['specifications']['choose'], goods.buy_min_number, index);
+                    }
+                } else {
+                    var status = true;
+                    if ((temp_data.detail_list || null) == null) {
+                        temp_data.detail_list = [];
+                    }
+                    if (temp_data.detail_list.length > 0) {
+                        for (var i in temp_data.detail_list) {
+                            if (temp_data.detail_list[i]['goods_id'] == goods['id']) {
+                                status = false;
+                                break;
+                            }
+                        }
+                    }
+                    // 追加到关联商品中
+                    if (status) {
+                        temp_data.detail_list.push({
+                            goods: goods,
+                            goods_id: goods['id'],
+                            spec: '',
+                            spec_text_view: '',
+                        });
+                        this.setData({
+                            recommend_data: temp_data,
+                        });
+                        app.globalData.showToast(this.$t('recommend-form.recommend-form.145ci4'), 'success');
+                    } else {
+                        app.globalData.showToast(this.$t('recommend-form.recommend-form.ocg49p'));
+                    }
+                }
+            },
+
+            // 规格确认回调事件
+            spec_confirm_event(value) {
+                var goods = this.popup_search_goods_list[value.out_value];
+                var temp_data = this.recommend_data;
+                var spec_str = JSON.stringify(value.spec);
+                // 数据判断处理
+                var status = true;
+                if ((temp_data.detail_list || null) == null) {
+                    temp_data.detail_list = [];
+                }
+                if (temp_data.detail_list.length > 0) {
+                    for (var i in temp_data.detail_list) {
+                        if (temp_data.detail_list[i]['goods_id'] == goods['id'] && temp_data.detail_list[i]['spec'] == spec_str) {
+                            status = false;
+                            break;
+                        }
+                    }
+                }
+
+                // 追加到关联商品中
+                if (status) {
+                    temp_data.detail_list.push({
+                        goods: goods,
+                        goods_id: goods['id'],
+                        spec: spec_str,
+                        spec_text_view: value.spec
+                            .map((v) => {
+                                return v.value;
+                            })
+                            .join(' / '),
+                    });
+                    this.setData({
+                        recommend_data: temp_data,
+                    });
+                    app.globalData.showToast(this.$t('recommend-form.recommend-form.145ci4'), 'success');
+                } else {
+                    app.globalData.showToast(this.$t('recommend-form.recommend-form.ocg49p'));
+                }
+            },
+        },
+
+        // url事件
+        url_event(e) {
+            app.globalData.url_event(e);
+        }
+    };
+</script>
+<style>
+    @import './recommend-form.css';
+</style>
diff --git a/pages/plugins/distribution/recommend-list/recommend-list.vue b/pages/plugins/distribution/recommend-list/recommend-list.vue
new file mode 100644
index 0000000..108e18a
--- /dev/null
+++ b/pages/plugins/distribution/recommend-list/recommend-list.vue
@@ -0,0 +1,309 @@
+<template>
+    <view :class="theme_view">
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                    <view class="base oh br-b padding-bottom-main">
+                        <text class="cr-base">{{ item.add_time }}</text>
+                        <text :class="'fr ' + (item.is_enable == 1 ? 'cr-green' : 'cr-grey')">{{ item.is_enable_text }}</text>
+                    </view>
+                    <view :data-value="'/pages/plugins/distribution/recommend-detail/recommend-detail?id=' + item.id" @tap="url_event" class="content margin-top cp">
+                        <view v-for="(fv, fi) in content_list" :key="fi">
+                            <view class="single-text margin-top-xs">
+                                <text class="cr-grey margin-right-xl">{{ fv.name }}</text>
+                                <text class="cr-base">{{ item[fv.field] }}</text>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="item-operation tr br-t padding-top-main margin-top-main">
+                        <button class="round bg-white br-green cr-green" type="default" size="mini" hover-class="none" @tap="popup_share_event" :data-index="index">{{$t('common.share')}}</button>
+                        <button :data-value="'/pages/plugins/distribution/recommend-form/recommend-form?id=' + item.id" @tap="url_event" class="round bg-white br-main cr-main margin-left-lg" type="default" size="mini" hover-class="none">{{$t('common.edit')}}</button>
+                        <button class="round bg-white br-red cr-red margin-left-lg" type="default" size="mini" hover-class="none" @tap="delete_event" :data-index="index">{{$t('common.del')}}</button>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 新增入口 -->
+        <view data-value="/pages/plugins/distribution/recommend-form/recommend-form" @tap="url_event" class="buttom-right-submit bg-main cr-white round tc cp">+</view>
+
+        <!-- 分享弹窗 -->
+        <component-share-popup ref="share"></component-share-popup>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+    import componentSharePopup from "@/components/share-popup/share-popup";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                content_list: [
+                    { name: this.$t('user-detail.user-detail.uy6lrz'), field: "title" },
+                    { name: this.$t('form.form.xy87t8'), field: "describe" },
+                    { name: this.$t('recommend-list.recommend-list.x74z3o'), field: "goods_count" },
+                    { name: this.$t('recommend-list.recommend-list.78n1ly'), field: "access_count" },
+                ],
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentSharePopup,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+
+            // 初始数据
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 先解绑自定义事件
+            uni.$off('refresh');
+            // 监听自定义事件并进行页面刷新操作
+            uni.$on('refresh', (data) => {
+                // 重新请求数据
+                this.init();
+            });
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    // 获取数据
+                    this.setData({
+                        data_page: 1,
+                    });
+                    this.get_data_list(1);
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 参数
+                uni.request({
+                    url: app.globalData.get_request_url("index", "recommend", "distribution"),
+                    method: "POST",
+                    data: {
+                        page: this.data_page,
+                        is_more: 1,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 分享开启弹层
+            popup_share_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var data = this.data_list[index] || null;
+                if (data == null) {
+                    app.globalData.showToast(this.$t('extraction-switch.extraction-switch.613b58'));
+                    return false;
+                }
+                this.setData({
+                    share_info: {
+                        title: data.seo_title || data.title,
+                        kds: data.seo_keywords || data.describe,
+                        desc: data.seo_desc || data.describe,
+                        path: "/pages/plugins/distribution/recommend-detail/recommend-detail",
+                        query: "id=" + data.id,
+                        img: data.icon || "",
+                    },
+                });
+                // 分享菜单处理
+                app.globalData.page_share_handle(this.share_info);
+
+                // 调取分享弹窗
+                if ((this.$refs.share || null) != null) {
+                    this.$refs.share.init({
+                        share_info: this.share_info
+                    });
+                }
+            },
+
+            // 删除数据
+            delete_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var temp_data = this.data_list;
+                var data = temp_data[index] || null;
+                if (data == null) {
+                    app.globalData.showToast(this.$t('extraction-switch.extraction-switch.613b58'));
+                    return false;
+                }
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('recommend-list.recommend-list.54d418'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('recommend-list.recommend-list.w9460o'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text'),
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url("delete", "recommend", "distribution"),
+                                method: "POST",
+                                data: { ids: data.id },
+                                dataType: "json",
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        temp_data.splice(index, 1);
+                                        this.setData({
+                                            data_list: temp_data,
+                                        });
+                                        app.globalData.showToast(res.data.msg, "success");
+                                    } else {
+                                        app.globalData.showToast(res.data.msg);
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/plugins/distribution/team/team.css b/pages/plugins/distribution/team/team.css
new file mode 100644
index 0000000..cb4783c
--- /dev/null
+++ b/pages/plugins/distribution/team/team.css
@@ -0,0 +1,32 @@
+/**
+ * 搜索导航
+ */
+.nav-search .multiple-picker {
+    width: calc(100% - 240rpx);
+}
+.nav-search .multiple-picker .item {
+    width: calc(50% - 24rpx);
+}
+.nav-search .multiple-picker .uni-date .uni-date__x-input {
+    font-size: 24rpx;
+    height: 55rpx;
+    line-height: 55rpx;
+}
+.nav-search .search-submit-list {
+    right: 20rpx;
+    bottom: 15rpx;
+}
+.nav-search .search-submit-list button {
+    line-height: 42rpx !important;
+}
+
+/*
+* 列表
+*/
+.scroll-box {
+    height: calc(100vh - 228rpx);
+}
+.data-list .item .base .avatar {
+    width: 40rpx;
+    height: 40rpx !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/team/team.vue b/pages/plugins/distribution/team/team.vue
new file mode 100644
index 0000000..cc63177
--- /dev/null
+++ b/pages/plugins/distribution/team/team.vue
@@ -0,0 +1,376 @@
+<template>
+    <view :class="theme_view">
+        <!-- 搜索条件 -->
+        <view class="form-container nav-search bg-white br-b oh padding-horizontal-main padding-bottom-main text-size-xs cr-base pr">
+            <view class="margin-top oh">
+                <view class="fl margin-top">{{$t('team.team.784249')}}</view>
+                <view class="multiple-picker fl tc">
+                    <view class="item br dis-inline-block pr radius tl fl">
+                        <uni-datetime-picker v-model="nav_search_value.team_search_user_time_start" :border="false" :showFirstIcon="false" :hide-second="true" type="datetime" :placeholder="$t('team.team.pcaom3')" placeholder-class="cr-grey" />
+                    </view>
+                    <view class="dis-inline-block cr-grey-white margin-top-sm">-</view>
+                    <view class="item br dis-inline-block pr radius tl fr">
+                        <uni-datetime-picker v-model="nav_search_value.team_search_user_time_end" :border="false" :showFirstIcon="false" :hide-second="true" type="datetime" :placeholder="$t('team.team.iee9bp')" placeholder-class="cr-grey" />
+                    </view>
+                </view>
+                <checkbox-group class="dis-inline-block fr margin-top-xs" data-value="team_search_user_time_reverse" @change="search_cholce_event">
+                    <label> <checkbox value="1" :checked="nav_search_value.team_search_user_time_reverse.indexOf('1') != -1" style="transform: scale(0.7)" />{{$t('team.team.i040fg')}}</label>
+                </checkbox-group>
+            </view>
+            <view class="margin-top oh">
+                <view class="fl margin-top">{{$t('team.team.2ny6k1')}}</view>
+                <view class="multiple-picker fl tc">
+                    <view class="item br dis-inline-block pr radius tl fl">
+                        <uni-datetime-picker v-model="nav_search_value.team_search_order_time_start" :border="false" :showFirstIcon="false" :hide-second="true" type="datetime" :placeholder="$t('team.team.pcaom3')" placeholder-class="cr-grey" />
+                    </view>
+                    <view class="dis-inline-block cr-grey-white margin-top-sm">-</view>
+                    <view class="item br dis-inline-block pr radius tl fr">
+                        <uni-datetime-picker v-model="nav_search_value.team_search_order_time_end" :border="false" :showFirstIcon="false" :hide-second="true" type="datetime" :placeholder="$t('team.team.iee9bp')" placeholder-class="cr-grey" />
+                    </view>
+                </view>
+                <checkbox-group class="dis-inline-block fr margin-top-xs" data-value="team_search_order_time_reverse" @change="search_cholce_event">
+                    <label> <checkbox value="1" :checked="nav_search_value.team_search_order_time_reverse.indexOf('1') != -1" style="transform: scale(0.7)" />{{$t('team.team.i040fg')}}</label>
+                </checkbox-group>
+            </view>
+            <view class="margin-top oh">
+                <view class="fl">{{$t('team.team.2i4k79')}}</view>
+                <checkbox-group data-value="team_search_buy_type" @change="search_cholce_event">
+                    <label> <checkbox value="0" :checked="nav_search_value.team_search_buy_type.indexOf('0') != -1" style="transform: scale(0.7)" />{{$t('promotion-user.promotion-user.g5332w')}}</label>
+                    <label class="margin-left-xxl"> <checkbox value="1" :checked="nav_search_value.team_search_buy_type.indexOf('1') != -1" style="transform: scale(0.7)" />{{$t('promotion-user.promotion-user.8i641g')}}</label>
+                </checkbox-group>
+            </view>
+            <view class="search-submit-list pa">
+                <button type="default" size="mini" class="bg-grey br-grey cr-base text-size-xs round margin-right-main" @tap="search_reset_event">{{$t('team.team.3l538c')}}</button>
+                <button type="default" size="mini" class="bg-main br-main cr-white text-size-xs round" @tap="search_submit_event">{{$t('common.search')}}</button>
+            </view>
+        </view>
+
+        <!-- 数据列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                    <view class="base oh br-b padding-bottom-main">
+                        <image class="avatar dis-block fl circle" :src="item.avatar" mode="widthFix" @tap="avatar_event" :data-value="item.avatar"></image>
+                        <text class="cr-base margin-left-sm">{{ item.user_name_view || "" }}</text>
+                        <text class="cr-base fr">{{ item.add_time }}</text>
+                    </view>
+                    <view class="content margin-top">
+                        <block v-for="(fv, fi) in content_list" :key="fi">
+                            <view class="single-text margin-top-xs">
+                                <text class="cr-grey margin-right-xl">{{ fv.name }}</text>
+                                <text class="cr-base" :data-event="fv.event" :data-value="item[fv.field]" @tap="text_event">{{ item[fv.field] || fv.default }}</text>
+                                <text v-if="(fv.unit || null) != null" class="cr-grey">{{ fv.unit }}</text>
+                            </view>
+                        </block>
+                    </view>
+                    <view class="item-operation tr br-t padding-top-main margin-top-main">
+                        <button v-if="(item.email || null) != null" class="round bg-white br cr-base" type="default" size="mini" hover-class="none" @tap="text_event" data-event="copy" :data-value="item.email">{{$t('login.login.p54kf1')}}</button>
+                        <button v-if="(item.mobile || null) != null" class="round bg-white br cr-base" type="default" size="mini" hover-class="none" @tap="text_event" data-event="tel" :data-value="item.mobile">{{$t('promotion-user.promotion-user.62c8m1')}}</button>
+                        <button class="round bg-white br cr-base" type="default" size="mini" hover-class="none" @tap="user_order_event" :data-value="item.id">{{$t('promotion-user.promotion-user.i2rf31')}}</button>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                content_list: [
+                    { name: this.$t('promotion-user.promotion-user.2g7enc'), field: "order_count", unit: "", default: 0 },
+                    { name: this.$t('promotion-user.promotion-user.32bf15'), field: "order_total", unit: "", default: 0 },
+                    { name: this.$t('promotion-user.promotion-user.76748p'), field: "order_last_time", default: "" },
+                    { name: this.$t('promotion-user.promotion-user.u43380'), field: "find_order_count", unit: "", default: 0 },
+                    { name: this.$t('promotion-user.promotion-user.8n4tr3'), field: "find_order_total", unit: "", default: 0 },
+                    { name: this.$t('promotion-user.promotion-user.1gc3ny'), field: "find_order_last_time", default: "" },
+                    { name: this.$t('promotion-user.promotion-user.3l1187'), field: "referrer_count", unit: "", default: 0 },
+                ],
+                nav_search_buy_type_list: [
+                    { value: -1, name: this.$t('common.all') },
+                    { value: 0, name: this.$t('promotion-user.promotion-user.g5332w') },
+                    { value: 1, name: this.$t('promotion-user.promotion-user.8i641g') },
+                ],
+                nav_search_value: {
+                    team_search_user_time_start: "",
+                    team_search_user_time_end: "",
+                    team_search_user_time_reverse: [],
+                    team_search_order_time_start: "",
+                    team_search_order_time_end: "",
+                    team_search_order_time_reverse: [],
+                    team_search_buy_type: [],
+                },
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+
+            // 初始数据
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 请求参数
+                var data = {
+                    page: this.data_page,
+                };
+
+                // 搜索注册时间
+                if ((this.nav_search_value.team_search_user_time_start || null) != null) {
+                    data["team_search_user_time_start"] = this.nav_search_value.team_search_user_time_start;
+                }
+                if ((this.nav_search_value.team_search_user_time_end || null) != null) {
+                    data["team_search_user_time_end"] = this.nav_search_value.team_search_user_time_end;
+                }
+                // 用户反向
+                if (this.nav_search_value.team_search_user_time_reverse.length > 0) {
+                    data["team_search_user_time_reverse"] = 1;
+                }
+
+                // 搜索下单时间
+                if ((this.nav_search_value.team_search_order_time_start || null) != null) {
+                    data["team_search_order_time_start"] = this.nav_search_value.team_search_order_time_start;
+                }
+                if ((this.nav_search_value.team_search_order_time_end || null) != null) {
+                    data["team_search_order_time_end"] = this.nav_search_value.team_search_order_time_end;
+                }
+                // 订单反向
+                if (this.nav_search_value.team_search_order_time_reverse.length > 0) {
+                    data["team_search_order_time_reverse"] = 1;
+                }
+
+                // 搜索是否下单
+                if (this.nav_search_value.team_search_buy_type.length > 0) {
+                    data["team_search_buy_type"] = this.nav_search_value.team_search_buy_type.join(",");
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("index", "team", "distribution"),
+                    method: "POST",
+                    data: data,
+                    dataType: "json",
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 头像查看
+            avatar_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value != null) {
+                    uni.previewImage({
+                        current: value,
+                        urls: [value],
+                    });
+                } else {
+                    app.globalData.showToast(this.$t('order.order.p3scy0'));
+                }
+            },
+
+            // 用户订单事件
+            user_order_event(e) {
+                var value = e.currentTarget.dataset.value;
+                app.globalData.url_open('/pages/plugins/distribution/order/order?uid=' + value);
+            },
+
+            // 搜索条件事件
+            search_cholce_event(e) {
+                var value = e.currentTarget.dataset.value;
+                var temp_data = this.nav_search_value;
+                temp_data[value] = e.detail.value;
+                this.setData({
+                    nav_search_value: temp_data,
+                });
+            },
+
+            // 搜索重置事件
+            search_reset_event(e) {
+                var temp_data = this.nav_search_value;
+                var arr_field = ["team_search_buy_type", "team_search_order_time_reverse", "team_search_user_time_reverse"];
+                for (var i in temp_data) {
+                    temp_data[i] = arr_field.indexOf(i) == -1 ? "" : [];
+                }
+                this.setData({
+                    nav_search_value: temp_data,
+                    data_page: 1,
+                });
+                this.get_data_list(1);
+            },
+
+            // 搜索确认事件
+            search_submit_event(e) {
+                this.setData({
+                    data_page: 1,
+                });
+                this.get_data_list(1);
+            },
+
+            // 文本事件
+            text_event(e) {
+                app.globalData.text_event_handle(e);
+            },
+        },
+    };
+</script>
+<style>
+    @import "./team.css";
+</style>
diff --git a/pages/plugins/distribution/user/user.css b/pages/plugins/distribution/user/user.css
new file mode 100644
index 0000000..3d9dba3
--- /dev/null
+++ b/pages/plugins/distribution/user/user.css
@@ -0,0 +1,122 @@
+/*
+* 头部
+*/
+.head-img {
+    width: 116rpx;
+    height: 116rpx;
+}
+
+.head-bottom {
+    height: 48rpx;
+}
+
+.head-item .level-item {
+    padding: 0 20rpx;
+    height: 48rpx;
+    line-height: 48rpx;
+    background-color: #FF8AA1;
+}
+
+.head-item .level-icon {
+    width: 26rpx;
+    height: 26rpx !important;
+}
+
+.head-base {
+    right: 0;
+    top: 74%;
+    transform: translateY(-50%);
+}
+
+.head-base button {
+    height: 52rpx;
+    line-height: 52rpx;
+    background: rgba(0, 0, 0, 0.3);
+    border-radius: 200rpx 0 0 200rpx;
+    padding: 0 40rpx 0 26rpx;
+    margin: 0;
+}
+
+/**
+ * 上级用户
+ */
+.superior {
+    padding: 0 54rpx;
+}
+
+.superior-item {
+    background: rgba(255, 72, 110, 0.51);
+    height: 90rpx;
+    line-height: 90rpx;
+    padding: 0 24rpx;
+}
+
+.superior .superior-content image {
+    width: 56rpx !important;
+    height: 56rpx !important;
+}
+
+/**
+ * 统计数据
+ */
+.stats-container-4 .item {
+    width: 25%;
+}
+
+.stats-container .stats-switch-submit {
+    height: 52rpx;
+    line-height: 52rpx;
+    padding: 0 44rpx 0 22rpx;
+}
+
+.popup-time-container .quit-time .item {
+    width: 25%;
+}
+
+.count-img {
+    width: 60rpx;
+    height: 60rpx !important;
+}
+
+.anti-mercenary-count {
+    padding: 20rpx 40rpx;
+}
+
+.promotion-size {
+    font-size: 44rpx;
+}
+
+/*
+* 导航
+*/
+.nav.nav-bottom {
+    padding-bottom: 170rpx;
+}
+
+.nav .item {
+    padding: 32rpx 20rpx;
+}
+
+.nav .item image {
+    width: 100rpx;
+    height: 100rpx;
+}
+
+/*
+* 推广按钮
+*/
+.promotion-btn {
+    height: 80rpx;
+    line-height: 80rpx;
+}
+
+/**
+ * 修改用户上级
+ */
+.user-search .custom-info {
+    height: 100rpx;
+}
+.user-search .custom-info .custom-avatar {
+    width: 50rpx;
+    height: 50rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/user/user.vue b/pages/plugins/distribution/user/user.vue
new file mode 100644
index 0000000..5649998
--- /dev/null
+++ b/pages/plugins/distribution/user/user.vue
@@ -0,0 +1,688 @@
+<template>
+    <view :class="theme_view">
+        <view class="pr">
+            <component-nav-back></component-nav-back>
+            <view v-if="(data_base || null) != null" class="weixin-nav-padding-top">
+                <view class="padding-top-xxxl">
+                    <!-- 头部背景 -->
+                    <image :src="distribution_static_url + 'distribution-bg.png'" mode="widthFix" class="pa top-0 bg-img wh-auto" />
+                    <view class="pr padding-top-main">
+                        <view class="padding-top-xxxl oh">
+                            <!-- 头部 -->
+                            <view class="padding-main border-radius-main oh pr">
+                                <view class="flex-row align-c">
+                                    <view class="head-img avatar bg-white circle">
+                                        <image class="wh-auto circle" @tap="preview_event" @error="user_avatar_error" :src="avatar" mode="widthFix"></image>
+                                    </view>
+                                    <view class="head-item padding-left-main flex-1 flex-width">
+                                        <view class="cr-white">
+                                            <view class="dis-inline-block text-size fw-b" @tap="user_referrer">{{ nickname }}</view>
+                                            <view v-if="(user_referrer || null) != null" class="dis-inline-block margin-left-lg br-b-f9 padding-bottom-xss text-size-xs" data-event="copy" :data-value="user_referrer" @tap="text_event">
+                                                <view class="dis-inline-block">
+                                                    <text>{{$t('common.recommend_code_name')}}</text>
+                                                    <text class="fw-b margin-left-sm">{{user_referrer}}</text>
+                                                </view>
+                                                <view class="dis-inline-block margin-left-xs">
+                                                    <iconfont name="icon-copy" size="22rpx" color="#fff"></iconfont>
+                                                </view>
+                                            </view>
+                                        </view>
+                                        <view class="margin-top oh head-bottom">
+                                            <view v-if="(user_level || null) != null" class="single-text level-item round dis-inline-block">
+                                                <image v-if="(user_level.images_url || null) != null" class="level-icon margin-right-sm pr top-sm" :src="user_level.images_url" mode="widthFix"></image>
+                                                <text v-if="(user_level.name || null) != null" class="cr-white text-size-xs">{{ user_level.name }}</text>
+                                            </view>
+                                            <view class="head-base pa">
+                                                <block v-if="(data_base || null) != null && (data_base.is_enable_self_extraction || 0) == 1">
+                                                    <button data-value="/pages/plugins/distribution/extraction/extraction" @tap="url_event" class="text-size-xs cr-white" size="mini" type="default" hover-class="none">
+                                                        {{ (extraction || null) == null ? $t('user.user.2344s8') : '' }}{{$t('user.user.b5cnj1')}}<iconfont name="icon-arrow-right" size="18rpx" color="#fff" propClass="pa"></iconfont>
+                                                    </button>
+                                                </block>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+
+                        <!-- 会员中心通知 -->
+                        <view v-if="(user_level || null) != null && (data_base.user_center_notice || null) != null && data_base.user_center_notice.length > 0" class="padding-horizontal-main padding-bottom-main">
+                            <view :class="(superior || null) != null ? 'padding-horizontal-main margin-horizontal-xs' : ''">
+                                <uni-notice-bar show-icon scrollable :text="data_base.user_center_notice.join('')" background-color="transparent" color="#fff" />
+                            </view>
+                        </view>
+
+                        <!-- 上级用户 -->
+                        <view v-if="(data_base.is_show_superior || 0) == 1 && ((superior || null) != null || (data_base.is_modify_superior || 0) == 1)" class="superior">
+                            <view class="superior-item flex-row jc-sb align-c oh border-radius-top-main">
+                                <view class="superior-title cr-white fw-b va-m text-size-sm">{{$t('user.user.4rj120')}}</view>
+                                <view class="superior-content">
+                                    <block v-if="(data_base.is_show_superior || 0) == 1 && (superior || null) != null">
+                                        <image :src="superior.avatar" mode="widthFix" class="circle va-m"></image>
+                                        <text class="cr-white va-m margin-left-sm text-size-xs">{{ superior.user_name_view }}</text>
+                                    </block>
+                                    <text v-if="(data_base.is_modify_superior || 0) == 1" class="cr-white text-size-xs br round padding-horizontal-main padding-top-xs padding-bottom-xs margin-left" @tap="modify_superior_open_event">{{$t('user.user.567lwz')}}</text>
+                                </view>
+                            </view>
+                        </view>
+
+                        <!-- 数据统计 -->
+                        <view v-if="stats_user_promotion_data_list.length > 0 || stats_base_data_list.length > 0 || stats_profit_data_list.length > 0" class="padding-horizontal-main oh">
+                            <view class="stats-container padding-main border-radius-main bg-white pr spacing-mb">
+                                <view class="flex-row jc-sb align-c">
+                                    <view class="title-left-border text-size fw-b">{{$t('user.user.67y36w')}}</view>
+                                    <button type="default" size="mini" class="br-grey-f5 bg-grey-f5 round stats-switch-submit text-size-xs pr margin-0" @tap="popup_time_event">
+                                        {{ popup_time_value.name }}
+                                        <iconfont name="icon-arrow-bottom" size="24rpx" class="pa" color="#999"></iconfont>
+                                    </button>
+                                </view>
+                                <!-- 推广统计 -->
+                                <view v-if="stats_user_promotion_data_list.length > 0" class="margin-top-main oh tc flex-row jc-sa align-c">
+                                    <block v-for="(item, index) in stats_user_promotion_data_list" :key="index">
+                                        <view class="padding-main flex-1" :class="stats_user_promotion_data_list.length - 1 > index ? 'divider-r-f5' : ''" :data-value="item.to_page" @tap="url_event">
+                                            <view class="single-text margin-top-sm">
+                                                <text class="fw-b promotion-size">{{ item.value }}</text>
+                                                <text v-if="(item.unit || null) != null" class="cr-grey-9 text-size-xs">{{$t('user.user.rjye50')}}</text>
+                                            </view>
+                                            <view class="cr-grey text-size-xs">{{ item.name }}</view>
+                                        </view>
+                                    </block>
+                                </view>
+                                <!-- 基础统计 -->
+                                <view v-if="stats_base_data_list.length > 0" class="margin-top oh tc">
+                                    <block v-for="(item, index) in stats_base_data_list_children" :key="index">
+                                        <view class="flex-row jc-sa bg-grey-f5 border-radius-main" :class="stats_base_data_list_children.length - 1 > index ? 'spacing-mb' : ''">
+                                            <block v-for="(child, i) in item" :key="i">
+                                                <view class="flex-width-half pr">
+                                                    <view class="padding-vertical-xxxl padding-left-xxxl padding-right-sm flex-row jc-c align-c" :data-value="child.to_page" @tap="url_event">
+                                                        <image :src="child.icon" mode="widthFix" class="count-img" />
+                                                        <view class="tl flex-1 flex-width padding-left-main">
+                                                            <view class="text-size-xs single-text">{{ child.name }}</view>
+                                                            <view class="single-text margin-top-sm">
+                                                                <text v-if="(child.first || null) != null" class="text-size-xs">{{ child.first }}</text>
+                                                                <text class="text-size-lg fw-b">{{ child.value }}</text>
+                                                                <text v-if="(child.unit || null) != null" class="cr-grey-9 text-size-xs">{{ child.unit }}</text>
+                                                            </view>
+                                                        </view>
+                                                    </view>
+                                                    <view v-if="child.data" class="flex-row jc-c align-c padding-horizontal-xs padding-bottom-sm pa bottom-0 left-0 right-0">
+                                                        <view v-for="(cdata, ci) in child.data" :key="ci" class="padding-horizontal-sm">
+                                                            <view class="cr-grey-9 text-size-xss" :data-value="cdata.to_page" @tap.stop="url_event">{{ cdata.name }}</view>
+                                                        </view>
+                                                    </view>
+                                                </view>
+                                            </block>
+                                        </view>
+                                    </block>
+                                </view>
+                            </view>
+
+                            <!-- 返佣统计 -->
+                            <view v-if="stats_profit_data_list.length > 0" class="stats-container padding-sm border-radius-main bg-white pr">
+                                <view class="title-left-border text-size fw-b padding-vertical-sm padding-horizontal-main margin-left-sm">{{$t('user.user.q822fj')}}</view>
+                                <view class="flex-row flex-wrap">
+                                    <block v-for="(item, index) in stats_profit_data_list" :key="index">
+                                        <view class="flex-width-half">
+                                            <view class="anti-mercenary-count bg-grey-f5 border-radius-main margin-sm">
+                                                <view class="text-size-xs single-text">{{ item.name }}</view>
+                                                <view class="single-text margin-top-sm">
+                                                    <text class="text-size-xs">{{ currency_symbol }}</text>
+                                                    <text class="text-size-lg fw-b">{{ item.value }}</text>
+                                                </view>
+                                            </view>
+                                        </view>
+                                    </block>
+                                </view>
+                            </view>
+                        </view>
+
+                        <!-- 导航 -->
+                        <view v-if="nav_list.length > 0" class="nav oh flex-row flex-wrap padding-sm" :class="(profit_ladder || null) != null ? 'nav-bottom' : 'padding-bottom-main'">
+                            <block v-for="(item, index) in nav_list" :key="index">
+                                <view class="flex-width-half">
+                                    <view class="item bg-white border-radius-main margin-sm">
+                                        <view :data-value="item.url" @tap="url_event" class="flex-row align-c">
+                                            <image :src="item.icon" mode="scaleToFill" class="dis-block"></image>
+                                            <view class="padding-left-main text-size fw-b flex-1 flex-width single-text">{{ item.title }}</view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </block>
+                        </view>
+
+                        <!-- 不符合分销条件描述 -->
+                        <view v-if="(user_level || null) == null && (data_base.non_conformity_desc || null) != null && data_base.non_conformity_desc.length > 0" class="padding-horizontal-main">
+                            <uni-notice-bar class="padding-0" show-icon scrollable :text="data_base.non_conformity_desc.join" background-color="transparent" color="#fff" />
+                        </view>
+
+                        <!-- 阶梯返佣提示 -->
+                        <view v-if="(profit_ladder || null) != null" class="bg-white pf pa-w bottom-0 left-0 right-0 wh-auto">
+                            <view class="padding-main">
+                                <view class="flex-row jc-sb align-c bottom-line-exclude">
+                                    <text class="cr-base">{{ profit_ladder.msg }}</text>
+                                    <text data-value="/pages/plugins/distribution/poster/poster" @tap="url_event" class="text-size bg-main cr-white dis-inline-block round cp padding-horizontal-xxxl promotion-btn">{{$t('user.user.xjxb2v')}}</text>
+                                </view>
+                            </view>
+                        </view>
+
+                        <!-- 时间选择弹窗 -->
+                        <component-popup :propShow="popup_time_status" propPosition="bottom" @onclose="popup_time_close_event">
+                            <view class="padding-horizontal-main padding-top-main bg-white">
+                                <view class="close oh">
+                                    <view class="tr" @tap.stop="popup_time_close_event">
+                                        <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                                    </view>
+                                </view>
+                                <view class="popup-time-container page-bottom-fixed">
+                                    <form @submit="form_submit" class="form-container">
+                                        <view v-if="(time_data || null) != null" class="quit-time oh">
+                                            <block v-for="(item, index) in time_data" :key="index">
+                                                <view class="item fl padding-main bs-bb">
+                                                    <view class="text-size-xs round padding-top-xs padding-bottom-xs tc" :class="quit_time_checked_name === item.name ? 'br-main bg-main cr-white' : 'br-grey cr-grey bg-white'" :data-value="item.name" :data-index="index" @tap="quit_time_event">
+                                                        {{ item.name }}
+                                                    </view>
+                                                </view>
+                                            </block>
+                                        </view>
+
+                                        <view class="form-gorup bg-white">
+                                            <view class="form-gorup-title">{{$t('team.team.pcaom3')}}</view>
+                                            <view class="br-b">
+                                                <uni-datetime-picker @change="time_start_change_event" v-model="popup_time_value.start" :border="false" :showFirstIcon="false" :hide-second="true" type="datetime" :placeholder="$t('team.team.pcaom3')" placeholder-class="cr-grey" />
+                                            </view>
+                                        </view>
+                                        <view class="form-gorup bg-white">
+                                            <view class="form-gorup-title">{{$t('team.team.iee9bp')}}</view>
+                                            <view class="br-b">
+                                                <uni-datetime-picker @change="time_end_change_event" v-model="popup_time_value.end" :border="false" :showFirstIcon="false" :hide-second="true" type="datetime" :placeholder="$t('team.team.iee9bp')" placeholder-class="cr-grey" />
+                                            </view>
+                                        </view>
+                                        <view class="bottom-fixed">
+                                            <view class="bottom-line-exclude">
+                                                <button class="bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :disabled="form_submit_disabled_status">{{$t('user.user.25f97u')}}</button>
+                                            </view>
+                                        </view>
+                                    </form>
+                                </view>
+                            </view>
+                        </component-popup>
+
+                        <!-- 修改上级用户弹窗 -->
+                        <component-popup :propShow="modify_superior_popup_status" propPosition="bottom" @onclose="modify_superior_close_event">
+                            <view class="padding-horizontal-main padding-top-main bg-white">
+                                <view class="close oh">
+                                    <view class="tr" @tap.stop="modify_superior_close_event">
+                                        <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                                    </view>
+                                </view>
+                                <view class="popup-time-container page-bottom-fixed">
+                                    <view class="form-container">
+                                        <view class="form-gorup margin-top-xl">
+                                            <view class="user-search">
+                                                <component-search
+                                                    @onsearch="modify_superior_search_submit_event"
+                                                    :propIsOnEvent="true"
+                                                    :propIsRequired="false"
+                                                    :propPlaceholder="$t('user.user.nk3cpq')"
+                                                    propClass="br"
+                                                    propSize="md"
+                                                    :propIsBtn="true"
+                                                    :propDefaultValue="modify_superior_search_input_keywords_value"
+                                                    <!-- #ifdef MP || APP -->
+                                                    propIcon="icon-scan"
+                                                    propIconColor="#333"
+                                                    @onicon="modify_superior_search_icon_event"
+                                                    :propIsIconOnEvent="true"
+                                                    <!-- #endif -->
+                                                ></component-search>
+                                                <view class="custom-info margin-top-lg">
+                                                    <block v-if="(modify_superior_user_data || null) != null">
+                                                        <block v-if="(modify_superior_user_data.data || null) != null">
+                                                            <image class="custom-avatar circle br va-m" :src="modify_superior_user_data.data.avatar" mode="aspectFill"></image>
+                                                            <text class="va-m margin-left-sm">{{modify_superior_user_data.data.user_name_view}}</text>
+                                                            <text class="cr-grey fr">{{modify_superior_user_data.data.add_time_text}}</text>
+                                                        </block>
+                                                        <view v-else class="cr-red">{{modify_superior_user_data.error_msg}}</view>
+                                                    </block>
+                                                    <view v-else class="cr-grey">{{$t('user.user.iynkpl')}}</view>
+                                                    <view v-if="(superior || null) != null && (superior.can_modify_number_msg || null) != null" class="cr-yellow margin-top">{{superior.can_modify_number_msg}}</view>
+                                                </view>
+                                            </view>
+                                        </view>
+                                        <view class="bottom-fixed">
+                                            <view class="bottom-line-exclude">
+                                                <button type="default" class="bg-main br-main cr-white round text-size" :disabled="form_submit_disabled_status" @tap="modify_superior_submit_event">{{$t('form.form.4yd066')}}</button>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                        </component-popup>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNavBack from '@/components/nav-back/nav-back';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentPopup from '@/components/popup/popup';
+    import componentSearch from '@/components/search/search';
+    var currency_symbol = app.globalData.currency_symbol();
+    var distribution_static_url = app.globalData.get_static_url('distribution', true) + 'app/';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                distribution_static_url: distribution_static_url,
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                currency_symbol: currency_symbol,
+                avatar: app.globalData.data.default_user_head_src,
+                nickname: this.$t('login.login.6yfr9g'),
+                user_referrer: null,
+                data_base: null,
+                user_level: null,
+                extraction: null,
+                superior: null,
+                profit_ladder: null,
+                nav_list: [],
+                time_data: null,
+                base_data: null,
+                user_promotion_data: null,
+                profit_data: null,
+                stats_user_promotion_data_list: [],
+                stats_base_data_list: [],
+                stats_base_data_list_children: [],
+                stats_profit_data_list: [],
+                popup_time_status: false,
+                form_submit_disabled_status: false,
+                popup_time_value: { name: this.$t('user.user.dcbt21'), start: '', end: '', index: '' },
+                quit_time_checked_name: '',
+                modify_superior_popup_status: false,
+                modify_superior_search_input_keywords_value: '',
+                modify_superior_user_data: null
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNavBack,
+            componentNoData,
+            componentPopup,
+            componentSearch
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 加载数据
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init(e) {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                    this.set_user_base(user);
+                }
+            },
+
+            // 设置用户基础信息
+            set_user_base(user) {
+                if ((user.avatar || null) != null) {
+                    this.setData({ avatar: user.avatar });
+                }
+                if ((user.user_name_view || null) != null) {
+                    this.setData({ nickname: user.user_name_view });
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'user', 'distribution'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            // 选择时间处理
+                            var time_data = data.time_data || null;
+                            var temp_value = this.popup_time_value;
+                            if (time_data != null) {
+                                var temp = time_data[data.default_day];
+                                temp_value.start = temp.start;
+                                temp_value.end = temp.end;
+                                temp_value.name = temp.name;
+                            }
+                            this.setData({
+                                data_base: data.base || null,
+                                user_level: data.user_level || null,
+                                extraction: data.extraction || null,
+                                superior: data.superior || null,
+                                user_referrer: data.user_referrer || null,
+                                profit_ladder: data.profit_ladder || null,
+                                nav_list: data.nav_list || [],
+                                time_data: time_data,
+                                stats_user_promotion_data_list: data.stats_user_promotion_data_list || [],
+                                stats_base_data_list: data.stats_base_data_list || [],
+                                stats_base_data_list_children: app.globalData.group_arry(data.stats_base_data_list, 2) || [],
+                                stats_profit_data_list: data.stats_profit_data_list || [],
+                                popup_time_value: temp_value,
+                                quit_time_checked_name: temp_value.name || '',
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: false,
+                            });
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 头像查看
+            preview_event() {
+                if (app.globalData.data.default_user_head_src != this.avatar) {
+                    uni.previewImage({
+                        current: this.avatar,
+                        urls: [this.avatar],
+                    });
+                }
+            },
+
+            // 头像加载错误
+            user_avatar_error(e) {
+                this.setData({
+                    avatar: app.globalData.data.default_user_head_src,
+                });
+            },
+
+            // 时间选择开启弹层
+            popup_time_event(e) {
+                this.setData({
+                    popup_time_status: true,
+                });
+            },
+
+            // 时间选择关闭弹层
+            popup_time_close_event(e) {
+                this.setData({
+                    popup_time_status: false,
+                });
+            },
+
+            // 时间快捷选择
+            quit_time_event(e) {
+                var index = e.currentTarget.dataset.index;
+                var item = this.time_data[index];
+                var temp_value = this.popup_time_value;
+                temp_value.start = item.start;
+                temp_value.end = item.end;
+                temp_value.index = index;
+                this.setData({
+                    popup_time_value: temp_value,
+                    quit_time_checked_name: e.currentTarget.dataset.value,
+                });
+            },
+
+            // 自定义开始时间事件
+            time_start_change_event(e) {
+                var temp_value = this.popup_time_value;
+                temp_value.start = e;
+                temp_value.index = '';
+                this.setData({
+                    popup_time_value: temp_value,
+                    quit_time_checked_name: '',
+                });
+            },
+
+            // 自定义结束时间事件
+            time_end_change_event(e) {
+                var temp_value = this.popup_time_value;
+                temp_value.end = e;
+                temp_value.index = '';
+                this.setData({
+                    popup_time_value: temp_value,
+                    quit_time_checked_name: '',
+                });
+            },
+
+            // 数据提交
+            form_submit(e) {
+                this.setData({
+                    form_submit_disabled_status: true,
+                });
+                uni.showLoading({
+                    title: this.$t('user.user.4141u2'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('stats', 'user', 'distribution'),
+                    method: 'POST',
+                    data: this.popup_time_value,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var temp_value = this.popup_time_value;
+                            temp_value.name = (temp_value.index || null) == null ? ((temp_value.start || null) == null && (temp_value.end || null) == null ? this.$t('common.all') : this.$t('user.user.dcbt21')) : this.time_data[temp_value.index]['name'];
+                            this.setData({
+                                popup_time_status: false,
+                                form_submit_disabled_status: false,
+                                stats_user_promotion_data_list: data.stats_user_promotion_data_list || [],
+                                stats_base_data_list: data.stats_base_data_list || [],
+                                stats_base_data_list_children: app.globalData.group_arry(data.stats_base_data_list, 2) || [],
+                                popup_time_value: temp_value,
+                                quit_time_checked_name: temp_value.name || '',
+                            });
+                        } else {
+                            this.setData({
+                                form_submit_disabled_status: false,
+                            });
+                            if (app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            } else {
+                                app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                            }
+                        }
+                    },
+                    fail: () => {
+                        this.setData({
+                            form_submit_disabled_status: false,
+                        });
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 上级用户修改事件 - 打开
+            modify_superior_open_event(e) {
+                this.setData({
+                    modify_superior_popup_status: true
+                });
+            },
+
+            // 上级用户修改事件 - 关闭
+            modify_superior_close_event(e) {
+                this.setData({
+                    modify_superior_popup_status: false
+                });
+            },
+
+            // 上级用户修改 - 搜索关键字事件
+            modify_superior_search_input_keywords_event(e) {
+                this.setData({
+                    modify_superior_search_input_keywords_value: e.detail.value,
+                });
+            },
+
+            // 上级用户修改 - 搜索确认事件
+            modify_superior_search_submit_event(e) {
+                this.setData({
+                    modify_superior_search_input_keywords_value: e
+                });
+                this.modify_superior_search_user();
+            },
+
+            // 上级用户修改 - icon事件
+            modify_superior_search_icon_event(e) {
+                var self = this;
+                uni.scanCode({
+                    success: function (res) {
+                        self.setData({
+                            modify_superior_search_input_keywords_value: res.result
+                        });
+                        self.modify_superior_search_user();
+                    },
+                });
+            },
+
+            // 上级用户修改 - 搜索用户
+            modify_superior_search_user() {
+                uni.showLoading({
+                    title: this.$t('recommend-form.recommend-form.e5k407'),
+                    mask: true
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("userquery", "user", "distribution"),
+                    method: "POST",
+                    data: {keywords: this.modify_superior_search_input_keywords_value},
+                    dataType: "json",
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            this.setData({
+                                modify_superior_user_data: {
+                                    data: res.data.data
+                                }
+                            });
+                        } else {
+                            this.setData({
+                                modify_superior_user_data: {
+                                    error_msg: res.data.msg
+                                }
+                            });
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 上级用户修改 - 提交
+            modify_superior_submit_event(e) {
+                if((this.modify_superior_user_data || null) == null || (this.modify_superior_user_data.data || null) == null) {
+                    app.globalData.showToast(this.$t('user.user.f5rny5'));
+                    return false;
+                }
+                this.setData({
+                    form_submit_disabled_status: true
+                });
+                uni.showLoading({
+                    title: this.$t('common.processing_in_text'),
+                    mask: true
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("superiorsave", "user", "distribution"),
+                    method: "POST",
+                    data: {superior_id: this.modify_superior_user_data.data.id},
+                    dataType: "json",
+                    success: (res) => {
+                        this.setData({
+                            form_submit_disabled_status: false
+                        });
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            this.setData({
+                                modify_superior_popup_status: false,
+                                superior: res.data.data,
+                            });
+                            app.globalData.showToast(res.data.msg, 'success');
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        this.setData({
+                            form_submit_disabled_status: false
+                        });
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 页面滚动监听
+            onPageScroll(res) {
+                uni.$emit('onPageScroll', res);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 文本事件
+            text_event(e) {
+                app.globalData.text_event_handle(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import './user.css';
+</style>
diff --git a/pages/plugins/distribution/visit-form/visit-form.css b/pages/plugins/distribution/visit-form/visit-form.css
new file mode 100644
index 0000000..3299f69
--- /dev/null
+++ b/pages/plugins/distribution/visit-form/visit-form.css
@@ -0,0 +1,7 @@
+.user-search .custom-info {
+    height: 58rpx;
+}
+.user-search .custom-info .custom-avatar {
+    width: 50rpx;
+    height: 50rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/visit-form/visit-form.vue b/pages/plugins/distribution/visit-form/visit-form.vue
new file mode 100644
index 0000000..b7bcd62
--- /dev/null
+++ b/pages/plugins/distribution/visit-form/visit-form.vue
@@ -0,0 +1,399 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="data_list_loding_status != 1" class="page-bottom-fixed">
+            <form @submit="form_submit" class="form-container">
+                <view class="padding-main oh border-radius-main">
+                    <view class="user-search">
+                        <component-search
+                            @onsearch="search_submit_event"
+                            :propIsOnEvent="true"
+                            :propIsRequired="false"
+                            :propPlaceholder="$t('user.user.nk3cpq')"
+                            propClass="br"
+                            propSize="md"
+                            :propIsBtn="true"
+                            :propDefaultValue="search_input_keywords_value"
+                            <!-- #ifdef MP || APP -->
+                            propIcon="icon-scan"
+                            propIconColor="#333"
+                            @onicon="search_icon_event"
+                            :propIsIconOnEvent="true"
+                            <!-- #endif -->
+                        ></component-search>
+                        <view class="custom-info margin-top-sm">
+                            <block v-if="(custom_data || null) != null && (custom_data.data || null) != null">
+                                <image class="custom-avatar circle br va-m" :src="custom_data.data.avatar" mode="aspectFill"></image>
+                                <text class="va-m margin-left-sm">{{custom_data.data.user_name_view}}</text>
+                                <text class="cr-grey fr">{{custom_data.data.add_time_text || ''}}</text>
+                            </block>
+                            <view v-else class="cr-red">{{custom_data.error_msg || $t('user.user.iynkpl')}}</view>
+                        </view>
+                    </view>
+
+                    <view class="form-gorup bg-white border-radius-main margin-top-main">
+                        <view class="form-gorup-title">{{$t('visit-form.visit-form.0su017')}}<text class="form-group-tips-must">*</text></view>
+                        <textarea class="cr-base" name="content" maxlength="230" auto-height placeholder-class="cr-grey-9" :placeholder="$t('visit-form.visit-form.e9r65a')" :value="data.content || ''"></textarea>
+                    </view>
+
+                    <view class="form-gorup form-container-upload oh border-radius-main margin-top-main">
+                        <view class="form-gorup-title">{{$t('visit-form.visit-form.6l81lz')}}<text class="form-group-tips-must">*</text><text class="form-group-tips">{{$t('order.order.o11d44')}}{{form_images_max_count}}{{$t('buy.buy.5iuqow')}}</text></view>
+                        <view class="form-upload-data oh">
+                            <block v-if="form_images_list.length > 0">
+                                <view v-for="(item, index) in form_images_list" :key="index" class="item fl">
+                                    <text class="delete-icon" @tap="upload_delete_event" :data-index="index">x</text>
+                                    <image :src="item" @tap="upload_show_event" :data-index="index" mode="aspectFill"></image>
+                                </view>
+                            </block>
+                            <image v-if="(form_images_list || null) == null || form_images_list.length < form_images_max_count" class="item fl upload-icon" :src="common_static_url + 'upload-icon.png'" mode="aspectFill" @tap="file_upload_event"></image>
+                        </view>
+                    </view>
+
+                    <view class="bottom-fixed" :style="bottom_fixed_style">
+                        <view class="bottom-line-exclude">
+                            <button class="item bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :disabled="form_submit_disabled_status">{{$t('form.form.4yd066')}}</button>
+                        </view>
+                    </view>
+                </view>
+            </form>
+        </view>
+        <block v-else>
+            <component-no-data :propStatus="data_list_loding_status" :propMag="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentSearch from '@/components/search/search';
+
+    var common_static_url = app.globalData.get_static_url("common");
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                bottom_fixed_style: '',
+                params: {},
+                search_input_keywords_value: '',
+                data: {},
+                form_images_list: [],
+                form_images_max_count: 30,
+                editor_path_type: '',
+                form_submit_disabled_status: false,
+                custom_data: null,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentSearch
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+
+            // 初始数据
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            // 初始化
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data() {            
+                uni.request({
+                    url: app.globalData.get_request_url("saveinfo", "visit", "distribution"),
+                    method: "POST",
+                    data: {...this.params, ...{is_lang: 0}},
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var result = res.data.data;
+                            var data = result.data || {};
+                            this.setData({
+                                data: data,
+                                form_images_list: data.images || [],
+                                custom_data: {data: data.custom_user || null},
+                                editor_path_type: result.editor_path_type || '',
+                                data_list_loding_status: 3,
+                                data_list_loding_msg: '',
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 数据提交
+            form_submit(e) {
+                // 表单数据
+                var form_data = e.detail.value;
+                form_data['custom_user_id'] = ((this.custom_data || null) != null && (this.custom_data.data || null) != null) ? this.custom_data.data.id : 0;
+                form_data['images'] = this.form_images_list;
+                // 是否编辑
+                if((this.data || null) != null) {
+                    form_data['id'] = this.data.id || 0;
+                }
+
+                // 数据校验
+                var validation = [
+                    { fields: 'custom_user_id', msg: this.$t('visit-form.visit-form.6f63it') },
+                    { fields: 'content', msg: this.$t('visit-form.visit-form.5k455y') },
+                    { fields: 'images', msg: this.$t('visit-form.visit-form.56vk4m') },
+                ];
+
+                // 验证提交表单
+                if (app.globalData.fields_check(form_data, validation)) {
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    this.setData({
+                        form_submit_disabled_status: true,
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('save', 'visit', 'distribution'),
+                        method: 'POST',
+                        data: form_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                                setTimeout(function () {
+                                    uni.$emit('refresh');
+                                    uni.navigateBack();
+                                }, 1000);
+                            } else {
+                                this.setData({
+                                    form_submit_disabled_status: false,
+                                });
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_disabled_status: false,
+                            });
+                            app.globalData.showToast(this.$t('extraction-apply.extraction-apply.h8f437'));
+                        },
+                    });
+                }
+            },
+
+            // 搜索关键字事件
+            search_input_keywords_event(e) {
+                this.setData({
+                    search_input_keywords_value: e.detail.value,
+                });
+            },
+
+            // 搜索确认事件
+            search_submit_event(e) {
+                this.setData({
+                    search_input_keywords_value: e
+                });
+                this.search_user();
+            },
+
+            // icon事件
+            search_icon_event(e) {
+                var self = this;
+                uni.scanCode({
+                    success: function (res) {
+                        self.setData({
+                            search_input_keywords_value: res.result
+                        });
+                        self.search_user();
+                    },
+                });
+            },
+
+            // 搜索用户
+            search_user() {
+                uni.showLoading({
+                    title: this.$t('recommend-form.recommend-form.e5k407'),
+                    mask: true
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("userquery", "user", "distribution"),
+                    method: "POST",
+                    data: {keywords: this.search_input_keywords_value},
+                    dataType: "json",
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            this.setData({
+                                custom_data: {
+                                    data: res.data.data
+                                }
+                            });
+                        } else {
+                            this.setData({
+                                custom_data: {
+                                    error_msg: res.data.msg
+                                }
+                            });
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 上传图片预览
+            upload_show_event(e) {
+                uni.previewImage({
+                    current: this.form_images_list[e.currentTarget.dataset.index],
+                    urls: this.form_images_list,
+                });
+            },
+
+            // 图片删除
+            upload_delete_event(e) {
+                var self = this;
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('order.order.psi67g'),
+                    success(res) {
+                        if (res.confirm) {
+                            var list = self.form_images_list;
+                            list.splice(e.currentTarget.dataset.index, 1);
+                            self.setData({
+                                form_images_list: list,
+                            });
+                        }
+                    },
+                });
+            },
+            
+            // 文件上传
+            file_upload_event(e) {
+                var self = this;
+                uni.chooseImage({
+                    count: this.form_images_max_count,
+                    success(res) {
+                        var success = 0;
+                        var fail = 0;
+                        var length = res.tempFilePaths.length;
+                        var count = 0;
+                        self.upload_one_by_one(res.tempFilePaths, success, fail, count, length);
+                    },
+                });
+            },
+            
+            // 采用递归的方式上传多张
+            upload_one_by_one(img_paths, success, fail, count, length) {
+                var self = this;
+                if (self.form_images_list.length < this.form_images_max_count) {
+                    uni.uploadFile({
+                        url: app.globalData.get_request_url("index", "ueditor"),
+                        filePath: img_paths[count],
+                        name: "upfile",
+                        formData: {
+                            action: "uploadimage",
+                            path_type: self.editor_path_type,
+                        },
+                        success: function (res) {
+                            success++;
+                            if (res.statusCode == 200) {
+                                var data = typeof res.data == "object" ? res.data : JSON.parse(res.data);
+                                if (data.code == 0 && (data.data.url || null) != null) {
+                                    var list = self.form_images_list;
+                                    list.push(data.data.url);
+                                    self.setData({
+                                        form_images_list: list,
+                                    });
+                                } else {
+                                    app.globalData.showToast(data.msg);
+                                }
+                            }
+                        },
+                        fail: function (e) {
+                            fail++;
+                        },
+                        complete: function (e) {
+                            count++;
+            
+                            // 下一张
+                            if (count >= length) {
+                                // 上传完毕，作一下提示
+                                //app.showToast('上传成功' + success +'张', 'success');
+                            } else {
+                                // 递归调用，上传下一张
+                                self.upload_one_by_one(img_paths, success, fail, count, length);
+                            }
+                        },
+                    });
+                }
+            }
+        },
+    };
+</script>
+<style>
+    @import "./visit-form.css";
+</style>
\ No newline at end of file
diff --git a/pages/plugins/distribution/visit-list/visit-list.css b/pages/plugins/distribution/visit-list/visit-list.css
new file mode 100644
index 0000000..e7de647
--- /dev/null
+++ b/pages/plugins/distribution/visit-list/visit-list.css
@@ -0,0 +1,5 @@
+.data-list .base .custom-avatar,
+.data-list .content .item-images {
+    width: 50rpx;
+    height: 50rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/visit-list/visit-list.vue b/pages/plugins/distribution/visit-list/visit-list.vue
new file mode 100644
index 0000000..bad27d7
--- /dev/null
+++ b/pages/plugins/distribution/visit-list/visit-list.vue
@@ -0,0 +1,300 @@
+<template>
+    <view :class="theme_view">
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                    <view class="base oh br-b padding-bottom-main">
+                        <view class="custom-info dis-inline-block">
+                            <image class="custom-avatar circle br va-m" :src="item.custom_user.avatar" mode="aspectFill"></image>
+                            <text class="va-m margin-left-sm">{{item.custom_user.user_name_view}}</text>
+                        </view>
+                        <text class="fr cr-base margin-top-xs">{{item.add_time}}</text>
+                    </view>
+                    <view class="content margin-top">
+                        <block v-for="(fv, fi) in content_list" :key="fi">
+                            <view v-if="(item[fv.field] || null) != null" class="margin-top-sm">
+                                <text class="cr-grey margin-right-xl va-m">{{ fv.name }}</text>
+                                <block v-if="fv.field == 'images'">
+                                    <block v-for="(iv, ix) in item[fv.field]" :key="ix">
+                                        <image :class="'item-images va-m br radius '+(ix > 0 ? 'margin-left-sm' : '')" :src="iv" mode="aspectFill" :data-index="index" :data-ix="ix" @tap="images_event"></image>
+                                    </block>
+                                </block>
+                                <text v-else class="cr-base">{{ item[fv.field] }}</text>
+                            </view>
+                        </block>
+                    </view>
+                    <view class="item-operation tr br-t padding-top-main margin-top-main">
+                        <button type="default" size="mini" class="bg-white br-green cr-green text-size-xs round" :data-value="'/pages/plugins/distribution/visit-form/visit-form?id='+item.id" @tap="url_event">{{$t('common.edit')}}</button>
+                        <button type="default" size="mini" class="bg-white br-red cr-red text-size-xs round margin-left-main" :data-index="index" @tap="delete_event">{{$t('common.del')}}</button>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 新增入口 -->
+        <view data-value="/pages/plugins/distribution/visit-form/visit-form" @tap="url_event" class="buttom-right-submit bg-main cr-white round tc">+</view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                content_list: [
+                    { name: this.$t('visit-list.visit-list.q76du4'), field: "content" },
+                    { name: this.$t('visit-list.visit-list.4z367h'), field: "images"},
+                    { name: this.$t('common.upd_time'), field: "upd_time" },
+                ],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+
+            // 初始数据
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 先解绑自定义事件
+            uni.$off('refresh');
+            // 监听自定义事件并进行页面刷新操作
+            uni.$on('refresh', (data) => {
+                // 重新请求数据
+                this.init();
+            });
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    // 获取数据
+                    this.setData({
+                        data_page: 1,
+                    });
+                    this.get_data_list(1);
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("index", "visit", "distribution"),
+                    method: "POST",
+                    data: {
+                        page: this.data_page
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 图片预览
+            images_event(e) {
+                var index = e.currentTarget.dataset.index;
+                var ix = e.currentTarget.dataset.ix;
+                uni.previewImage({
+                    current: this.data_list[index]['images'][ix],
+                    urls: this.data_list[index]['images'],
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 删除事件
+            delete_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var temp_data = this.data_list;
+                var data = temp_data[index] || null;
+                if (data == null) {
+                    app.globalData.showToast(this.$t('extraction-switch.extraction-switch.613b58'));
+                    return false;
+                }
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('recommend-list.recommend-list.54d418'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('recommend-list.recommend-list.w9460o'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text'),
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url("delete", "visit", "distribution"),
+                                method: "POST",
+                                data: { ids: data.id },
+                                dataType: "json",
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        temp_data.splice(index, 1);
+                                        this.setData({
+                                            data_list: temp_data
+                                        });
+
+                                        // 是否还存在数据
+                                        if(temp_data.length == 0) {
+                                            this.setData({
+                                                data_list_loding_status: 0,
+                                                data_bottom_line_status: false
+                                            });
+                                        }
+                                        app.globalData.showToast(res.data.msg, "success");
+                                    } else {
+                                        app.globalData.showToast(res.data.msg);
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                });
+            }
+        },
+    };
+</script>
+<style>
+    @import "./visit-list.css";
+</style>
\ No newline at end of file
diff --git a/pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail.vue b/pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail.vue
new file mode 100644
index 0000000..90d9c90
--- /dev/null
+++ b/pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail.vue
@@ -0,0 +1,142 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="detail != null">
+            <view class="padding-horizontal-main padding-top-main">
+                <view v-if="detail_list.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="panel-content oh">
+                        <view v-for="(item, index) in detail_list" :key="index" class="item br-b-dashed oh padding-vertical-main">
+                            <view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
+                            <view class="content fl br-l padding-left-main">{{ item.value }}</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                data_bottom_line_status: false,
+                detail: null,
+                detail_list: [],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("detail", "profit", "excellentbuyreturntocash"),
+                    method: "POST",
+                    data: {
+                        id: this.params.id,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                detail: data.data,
+                                detail_list: [
+                                    { name: this.$t('order-detail.order-detail.36op8f'), value: data.data.order_no },
+                                    { name: this.$t('order-detail.order-detail.x3ge6c'), value: data.data.total_price || "" },
+                                    { name: this.$t('order-detail.order-detail.v52n5r'), value: data.data.refund_price || "" },
+                                    { name: this.$t('profit.profit.nk58v6'), value: data.data.valid_price || "" },
+                                    { name: this.$t('profit.profit.vuvz6g'), value: data.data.profit_price || "" },
+                                    { name: this.$t('profit-detail.profit-detail.kn8yye'), value: data.data.status_name || "" },
+                                    { name: this.$t('user-order-detail.user-order-detail.yxwu8n'), value: data.data.order_status_name || "" },
+                                    { name: this.$t('profit-detail.profit-detail.x28rw5'), value: data.data.order_pay_status_name || "" },
+                                    { name: this.$t('order.order.330m76'), value: data.data.order_client_type_name || "" },
+                                    { name: this.$t('profit-detail.profit-detail.jkrvf3'), value: (data.data.status == 2 && (data.data.success_estimate_icon || null) != null ? "(" + data.data.success_estimate_icon + ") " : "") + data.data.success_time || "" },
+                                    { name: this.$t('common.add_time'), value: data.data.add_time || "" },
+                                    { name: this.$t('common.upd_time'), value: data.data.upd_time || "" },
+                                ],
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: "",
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "init")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+        },
+    };
+</script>
+<style></style>
diff --git a/pages/plugins/excellentbuyreturntocash/profit/profit.css b/pages/plugins/excellentbuyreturntocash/profit/profit.css
new file mode 100644
index 0000000..1fc0fba
--- /dev/null
+++ b/pages/plugins/excellentbuyreturntocash/profit/profit.css
@@ -0,0 +1,6 @@
+/*
+* 导航
+*/
+.nav-base .item {
+    width: 16.66%;
+}
\ No newline at end of file
diff --git a/pages/plugins/excellentbuyreturntocash/profit/profit.vue b/pages/plugins/excellentbuyreturntocash/profit/profit.vue
new file mode 100644
index 0000000..9ff93cc
--- /dev/null
+++ b/pages/plugins/excellentbuyreturntocash/profit/profit.vue
@@ -0,0 +1,318 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav-base bg-white">
+            <view v-for="(item, index) in nav_status_list" :key="index">
+                <view :class="'item fl tc ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+            </view>
+        </view>
+
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                    <view class="base oh br-b padding-bottom-main">
+                        <text class="cr-base">{{ item.add_time }}</text>
+                        <text class="fr cr-main">{{ item.status_name }}</text>
+                    </view>
+                    <view :data-value="'/pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail?id=' + item.id" @tap="url_event" class="content margin-top cp">
+                        <view v-for="(fv, fi) in content_list" :key="fi">
+                            <view class="single-text margin-top-xs">
+                                <text class="cr-grey margin-right-xl">{{ fv.name }}</text>
+                                <text class="cr-base">{{ item[fv.field] }}</text>
+                                <text v-if="(fv.unit || null) != null" class="cr-grey">{{ fv.unit }}</text>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="item-operation tr br-t padding-top-main margin-top-main">
+                        <button class="round bg-white br cr-base br" type="default" size="mini" hover-class="none" :data-oid="item.order_id" @tap="list_submit_order_event">{{$t('profit.profit.19a8l6')}}</button>
+                        <button v-if="item.status == 2" class="round bg-white br-green cr-green" type="default" size="mini" hover-class="none" :data-index="index" @tap="list_submit_settlement_event">{{$t('profit.profit.4r88cp')}}</button>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                nav_status_list: [
+                    { name: this.$t('common.all'), value: "-1" },
+                    { name: this.$t('profit.profit.3c7zmg'), value: "0" },
+                    { name: this.$t('profit.profit.8jqr78'), value: "1" },
+                    { name: this.$t('profit.profit.67o785'), value: "2" },
+                    { name: this.$t('profit.profit.l5knxu'), value: "3" },
+                    { name: this.$t('detail.detail.32171c'), value: "4" },
+                ],
+                nav_status_index: 0,
+                content_list: [
+                    { name: this.$t('order-detail.order-detail.x3ge6c'), field: "total_price" },
+                    { name: this.$t('order-detail.order-detail.v52n5r'), field: "refund_price" },
+                    { name: this.$t('profit.profit.nk58v6'), field: "valid_price" },
+                    { name: this.$t('profit.profit.vuvz6g'), field: "profit_price" },
+                ],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 是否指定状态
+            var nav_status_index = 0;
+            if ((params.status || null) != null) {
+                for (var i in this.nav_status_list) {
+                    if (this.nav_status_list[i]["value"] == params.status) {
+                        nav_status_index = i;
+                        break;
+                    }
+                }
+            }
+            this.setData({
+                params: params,
+                nav_status_index: nav_status_index,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 参数
+                var status = (this.nav_status_list[this.nav_status_index] || null) == null ? -1 : this.nav_status_list[this.nav_status_index]["value"];
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("index", "profit", "excellentbuyreturntocash"),
+                    method: "POST",
+                    data: {
+                        page: this.data_page,
+                        status: status,
+                        is_more: 1,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                            data_is_loading: 0,
+                        });
+                    },
+                });
+            },
+
+            // 订单详情
+            list_submit_order_event(e) {
+                var oid = e.currentTarget.dataset.oid || null;
+                if (oid != null) {
+                    app.globalData.url_open('/pages/user-order-detail/user-order-detail?id=' + oid);
+                } else {
+                    app.globalData.showToast(this.$t('profit.profit.5c7sof'));
+                }
+            },
+
+            // 立即结算事件
+            list_submit_settlement_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                uni.showLoading({
+                    title: this.$t('common.processing_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("auto", "profit", "excellentbuyreturntocash"),
+                    method: "POST",
+                    data: {
+                        id: this.data_list[index]["id"],
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            var temp_data_list = this.data_list;
+                            temp_data_list[index]["status"] = 3;
+                            temp_data_list[index]["status_name"] = this.$t('profit.profit.l5knxu');
+                            this.setData({
+                                data_list: temp_data_list,
+                            });
+                            app.globalData.showToast(res.data.msg, "success");
+                        } else {
+                            app.globalData.alert({
+                                msg: res.data.msg,
+                                is_show_cancel: 0,
+                            });
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_status_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import "./profit.css";
+</style>
diff --git a/pages/plugins/exchangerate/currency/currency.css b/pages/plugins/exchangerate/currency/currency.css
new file mode 100644
index 0000000..2b654d3
--- /dev/null
+++ b/pages/plugins/exchangerate/currency/currency.css
@@ -0,0 +1,15 @@
+.data-list .item {
+    height: 104rpx;
+    line-height: 104rpx;
+}
+.data-list .item .icon {
+    width: 100rpx !important;
+    height: 100rpx !important;
+}
+.data-list .item .checked {
+    top: 0;
+    right: 0;
+    width: 50rpx;
+    height: 38rpx;
+    border-bottom-left-radius: 100rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/exchangerate/currency/currency.vue b/pages/plugins/exchangerate/currency/currency.vue
new file mode 100644
index 0000000..a1a0978
--- /dev/null
+++ b/pages/plugins/exchangerate/currency/currency.vue
@@ -0,0 +1,187 @@
+<template>
+    <view :class="theme_view">
+        <!-- 货币列表 -->
+        <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+            <block v-for="(item, index) in data_list" :key="index">
+                <view :class="'item padding-main border-radius-main bg-white oh pr spacing-mb '+(item.id == data_default.id ? 'br-main' : 'br')" @tap="selected_event" :data-index="index">
+                    <image v-if="(item.icon || null) != null" class="icon va-m margin-right" :src="item.icon" mode="aspectFit"></image>
+                    <text class="va-m">{{item.name}}</text>
+                    <text class="cr-grey fr">{{item.symbol}}</text>
+                    <view v-if="item.id == data_default.id" class="checked pa bg-main lh-sm tc padding-top-xs padding-left-xs">
+                        <iconfont name="icon-checked" size="32rpx" color="#fff"></iconfont>
+                    </view>
+                </view>
+            </block>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 结尾 -->
+        <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: app.globalData.get_theme_color(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_list: [],
+                data_default: null,
+                data_base: null
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data_list();
+        },
+
+        methods: {
+            // 获取数据
+            init() {
+                this.get_data_list();
+            },
+
+            // 获取数据
+            get_data_list() {
+                var self = this;
+                if (self.data_list.length <= 0) {
+                    self.setData({
+                        data_list_loding_status: 1
+                    });
+                }
+                uni.request({
+                    url: app.globalData.get_request_url("index", "index", "exchangerate"),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: res => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var status = (data.data.data || []).length > 0;
+                            this.setData({
+                                data_base: data.base || null,
+                                data_default: data.data.default || null,
+                                data_list: data.data.data || [],
+                                data_list_loding_msg: '',
+                                data_list_loding_status: status ? 3 : 0,
+                                data_bottom_line_status: status
+                            });
+                        } else {
+                            self.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        self.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips')
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    }
+                });
+            },
+
+            // 选择事件
+            selected_event(e) {
+                // 参数处理
+                var index = e.currentTarget.dataset.index;
+                var temp_list = this.data_list;
+                var data = temp_list[index] || null;
+                if (data == null) {
+                    app.globalData.showToast(this.$t('extraction-switch.extraction-switch.613b58'));
+                    return false;
+                }
+                
+                // id与当前默认一致则不处理
+                if (data.id != this.data_default.id) {
+                    var self = this;
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text')
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url("setcurrency", "index", "exchangerate"),
+                        method: 'POST',
+                        data: {
+                            "currency": data.id
+                        },
+                        dataType: 'json',
+                        success: res => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                                self.setData({
+                                    data_default: data
+                                });
+                                
+                                // 重新初始化配置
+                                app.globalData.init_config();
+                                
+                                // 返回上一页
+                                setTimeout(function() {
+                                    uni.navigateBack();
+                                }, 1500);
+                            } else {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        }
+                    });
+                }
+            }
+        }
+    };
+</script>
+<style>
+    @import './currency.css';
+</style>
\ No newline at end of file
diff --git a/pages/plugins/express/detail/detail.css b/pages/plugins/express/detail/detail.css
new file mode 100644
index 0000000..fa629e6
--- /dev/null
+++ b/pages/plugins/express/detail/detail.css
@@ -0,0 +1,10 @@
+.express-icon {
+    width: 85rpx;
+    height: 85rpx !important;
+}
+.express-data .i {
+    top: -15rpx;
+    left: -15rpx;
+    border: 6rpx solid #fff;
+    padding: 10rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/express/detail/detail.vue b/pages/plugins/express/detail/detail.vue
new file mode 100644
index 0000000..f3461e0
--- /dev/null
+++ b/pages/plugins/express/detail/detail.vue
@@ -0,0 +1,165 @@
+<template>
+    <view :class="theme_view">
+        <!-- 多个包括导航 -->
+        <scroll-view v-if="(express_data || null) != null && express_data.length > 1" class="scroll-view-horizontal bg-white oh" scroll-x="true">
+            <block v-for="(item, index) in express_data" :key="index">
+                <view :class="'item cr-grey dis-inline-block padding-horizontal-main padding-top-main padding-bottom-sm ' + (item.is_active == 1 ? 'cr-main nav-active-line bg-main-befor fw-b' : '')" @tap="nav_event" :data-index="index">{{ item.show_name }}</view>
+            </block>
+        </scroll-view>
+
+        <!-- 物流信息 -->
+        <view v-if="(express_info || null) != null" class="padding-horizontal-main padding-top-main">
+            <view class="padding-main border-radius-main bg-white oh spacing-mb">
+                <image class="express-icon fl radius" :src="express_info.icon" mode="aspectFill"></image>
+                <view class="fl margin-left-lg">
+                    <view class="cr-base fw-b">{{ express_info.name }}</view>
+                    <view class="cr-base margin-top-sm" data-event="copy" :data-value="express_info.number" @tap="text_event">{{ express_info.number }}</view>
+                </view>
+            </view>
+            <view v-if="(express_info.note || null) != null" class="cr-red spacing-mt">{{ express_info.note }}</view>
+            <view v-if="(express_info.msg || null) != null" class="cr-blue spacing-mt">{{ express_info.msg }}</view>
+            <view v-if="(express_info.data || null) != null && express_info.data.length > 0" class="express-data margin-top-xl">
+                <block v-for="(item, index) in express_info.data" :key="index">
+                    <view :class="'item padding-main border-radius-main bg-white margin-left-sm br-b br-l br-r pr ' + (index == 0 ? 'br-t' : '')">
+                        <view :class="'i pa round ' + (index == 0 ? 'bg-green' : 'bg-grey')"></view>
+                        <view :class="'cr-base ' + (index == 0 ? 'fw-b' : '')">{{ item.desc }}</view>
+                        <view class="cr-grey margin-top-sm">{{ item.time }}</view>
+                    </view>
+                </block>
+            </view>
+        </view>
+
+        <!-- 提示信息 -->
+        <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+
+        <!-- 结尾 -->
+        <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                data_bottom_line_status: false,
+                params: null,
+                express_info: null,
+                express_data: [],
+                data_status: false,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.get_data();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        methods: {
+            // 初始化
+            get_data() {
+                if (!this.data_status) {
+                    this.setData({
+                        data_list_loding_status: 1,
+                        data_list_loding_msg: "",
+                    });
+                }
+                uni.request({
+                    url: app.globalData.get_request_url("index", "index", "express"),
+                    method: "POST",
+                    data: this.params,
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var express_info = data.express_info || null;
+                            var status = express_info != null && ((express_info.msg || null) != null || ((express_info.data || null) != null && express_info.data.length > 0));
+                            this.setData({
+                                data_bottom_line_status: status,
+                                data_list_loding_status: status ? 3 : 0,
+                                data_list_loding_msg: status ? "" : this.$t('detail.detail.j5owf1'),
+                                data_status: status,
+                                express_info: express_info,
+                                express_data: data.express_data || [],
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 导航事件
+            nav_event(e) {
+                var temp = this.params;
+                temp['eid'] = e.currentTarget.dataset.index;
+                this.setData({
+                    params: temp
+                });
+                this.get_data();
+            },
+
+            // 文本事件
+            text_event(e) {
+                app.globalData.text_event_handle(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import "./detail.css";
+</style>
diff --git a/pages/plugins/form/check/check.vue b/pages/plugins/form/check/check.vue
new file mode 100644
index 0000000..1c7f4fa
--- /dev/null
+++ b/pages/plugins/form/check/check.vue
@@ -0,0 +1,309 @@
+<template>
+    <view :class="theme_view">
+        <view class="padding-main page-content">
+            <view class="tr">
+                <view class="fr padding-main" @tap="popup_data_event">
+                    <iconfont name="icon-transfer" color="#2196F3" propClass="va-m"></iconfont>
+                    <text class="cr-blue text-size-sm margin-left-xs">{{$t('realstore-cart.realstore-cart.6bmc34')}}{{data == null ? '' : '('+data.title+')'}}</text>
+                </view>
+            </view>
+            <form @submit="form_submit" class="form-container">
+                <view class="border-radius-main bg-white padding-main padding-bottom-xxxxl spacing-mb">
+                    <view class="title fw-b text-size margin-vertical-xxxl">{{$t('common.verification_text')}}</view>
+                    <view class="flex-row align-c padding-bottom-xl">
+                        <!-- #ifndef H5 -->
+                        <view class="margin-right" @tap="scan_event">
+                            <uni-icons type="scan" size="56rpx" color="#666"></uni-icons>
+                        </view>
+                        <!-- #endif -->
+                        <input type="text" class="wh-auto check-value" :placeholder="$t('common.verification_mobile_message')" placeholder-class="cr-grey-c" :value="check_value" @input="check_event" />
+                    </view>
+                </view>
+                <view class="padding-main">
+                    <button type="default" form-type="submit" hover-class="none" class="br-main bg-main cr-white round text-size-lg" :disabled="form_submit_loading">{{$t('common.confirm')}}</button>
+                </view>
+                <view class="padding-lg margin-top-xl text-size-lg tc">
+                    <text v-if="(error_msg || null) != null" class="cr-red">{{error_msg}}</text>
+                    <text v-if="(success_msg || null) != null" class="cr-green">{{success_msg}}</text>
+                </view>
+                <view class="bottom-fixed padding-xl tc">
+                    <button type="default" size="mini" class="bg-main-light br-main cr-main text-size-lg circle padding-0 refresh-submit" @tap="refresh_data_event">{{$t('common.refresh_text')}}</button>
+                    <view class="bottom-line-exclude flex-row jc-sb margin-top-xl">
+                        <block v-if="stats_data.length > 0">
+                            <block v-for="(item, index) in stats_data">
+                                <view>
+                                    <view class="cr-grey">{{item.name}}</view>
+                                    <view class="fw-b text-size-lg" :class="item.type == 1 ? 'cr-green' : (item.type == 0 ? 'cr-yellow' : '')">{{item.value}}</view>
+                                </view>
+                            </block>
+                        </block>
+                    </view>
+                </view>
+            </form>
+        </view>
+
+        <!-- 数据选择弹层 -->
+        <component-popup :propShow="popup_data_status" propPosition="bottom" @onclose="popup_data_close_event">
+            <view class="padding-horizontal-main padding-top-main bg-white">
+                <view class="close oh">
+                    <view class="fr" @tap.stop="popup_data_close_event">
+                        <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                    </view>
+                </view>
+                <view class="data-list">
+                    <block v-if="(data_list || null) != null && data_list.length > 0">
+                        <block v-for="(item, index) in data_list" :key="index">
+                            <view :class="'item oh padding-vertical-main ' + (index > 0 ? 'br-t' : '')">
+                                <view class="fl left">
+                                    <image class="icon dis-block radius" :src="item.cover" mode="widthFix"></image>
+                                </view>
+                                <view class="fr right tl pr">
+                                    <view class="cr-base fw-b text-size-sm">{{ item.title }}</view>
+                                    <view class="cr-grey text-size-xs margin-top-xs">{{ item.describe }}</view>
+                                    <button type="default" size="mini" class="bg-main br-main cr-white text-size-sm round pa top-xxxxl right-xxxxl" :data-index="index" @tap="data_list_choice_event">选择</button>
+                                </view>
+                            </view>
+                        </block>
+                    </block>
+                    <block v-else>
+                        <view class="cr-grey tc padding-top-xl padding-bottom-xxxl">{{$t('common.no_relevant_data_tips')}}</view>
+                    </block>
+                </view>
+            </view>
+        </component-popup>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentPopup from '@/components/popup/popup';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                form_submit_loading: false,
+                check_value: '',
+                error_msg: '',
+                success_msg: '',
+                stats_data: [],
+                data_list: [],
+                data: null,
+                popup_data_status: false,
+            };
+        },
+        components: {
+            componentCommon,
+            componentPopup
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        methods: {
+            // 获取数据
+            init() {
+                app.globalData.get_user_info(this, "init");
+                this.get_data();
+            },
+
+            // 获取数据
+            get_data() {
+                uni.showLoading({
+                    title: this.$t('common.loading_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('init', 'index', 'form'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var data_list = data.data_list || [];
+                            this.setData({
+                                data_list: data_list,
+                                data: (data_list.length == 0) ? null : data_list[0],
+                            });
+                            this.refresh_data_event('init');
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    }
+                });
+            },
+
+            // 输入事件
+            check_event(e) {
+                this.setData({
+                    check_value: e.detail.value
+                });
+            },
+
+            // 扫码事件
+            scan_event(e) {
+                var self = this;
+                uni.scanCode({
+                	success: function (res) {
+                        if((res.result || null) != null) {
+                            self.setData({
+                                check_value: res.result
+                            });
+                            self.form_submit();
+                        }
+                	}
+                });
+            },
+
+            // 表单提交
+            form_submit() {
+                this.setData({
+                    error_msg: '',
+                    success_msg: ''
+                });
+                var form_data = {
+                    value: this.check_value,
+                    unique: (this.data == null) ? '' : (this.data.unique || ''),
+                }
+                var validation = [
+                    { fields: 'value', msg: this.$t('common.verification_mobile_message') },
+                    { fields: 'unique', msg: this.$t('common.unique_message') }
+                ];
+                if (app.globalData.fields_check(form_data, validation)) {
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    this.setData({
+                        form_submit_loading: true
+                    });
+                    var temp_code = this.check_value;
+                    uni.request({
+                        url: app.globalData.get_request_url('check', 'index', 'form'),
+                        method: 'POST',
+                        data: form_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            var data = res.data;
+                            if (data.code == 0) {
+                                this.setData({
+                                    form_submit_loading: false,
+                                    check_value: '',
+                                    error_msg: '',
+                                    stats_data: data.data.stats_data || [],
+                                    success_msg: data.msg+'（'+data.data.username+'）',
+                                });
+                            } else {
+                                if (app.globalData.is_login_check(data, this, 'form_submit')) {
+                                    this.setData({
+                                        form_submit_loading: false,
+                                        error_msg: data.msg+'（'+temp_code+'）',
+                                        success_msg: '',
+                                    });
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_loading: false,
+                                error_msg: this.$t('common.internet_error_tips')+'（'+temp_code+'）',
+                                success_msg: '',
+                            });
+                        },
+                    });
+                }
+            },
+            
+            // 刷新数据
+            refresh_data_event(e) {
+                uni.request({
+                    url: app.globalData.get_request_url('stats', 'index', 'form'),
+                    method: 'POST',
+                    data: {unique: (this.data == null) ? '' : (this.data.unique || '')},
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            this.setData({
+                                stats_data: res.data.data || []
+                            });
+                            if(e != 'init')
+                            {
+                                app.globalData.showToast(res.data.msg, 'success');
+                            }
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    }
+                });
+            },
+
+            // 列表数据开启弹层
+            popup_data_event(e) {
+                this.setData({
+                    popup_data_status: true,
+                });
+            },
+
+            // 列表数据弹层关闭
+            popup_data_close_event(e) {
+                this.setData({
+                    popup_data_status: false,
+                });
+            },
+
+            // 列表数据选择
+            data_list_choice_event(e) {
+                this.setData({
+                    popup_data_status: false,
+                    data: this.data_list[e.currentTarget.dataset.index],
+                });
+                this.refresh_data_event('init');
+            }
+        }
+    };
+</script>
+<style scoped>
+    input.check-value {
+        height: 100rpx;
+        line-height: 100rpx;
+        font-size: 44rpx;
+    }
+    .page-content {
+        padding-top: 12vh;
+    }
+    .refresh-submit {
+        width: 140rpx;
+        height: 140rpx;
+        line-height: 140rpx;
+    }
+    .data-list .item .icon {
+        width: 100rpx;
+        height: 100rpx;
+    }
+    .data-list .item .right {
+        width: calc(100% - 120rpx);
+    }
+</style>
\ No newline at end of file
diff --git a/pages/plugins/giftcard/form/form.vue b/pages/plugins/giftcard/form/form.vue
new file mode 100644
index 0000000..bddc249
--- /dev/null
+++ b/pages/plugins/giftcard/form/form.vue
@@ -0,0 +1,184 @@
+<template>
+    <view :class="theme_view">
+        <view class="padding-main">
+            <block v-if="data_list_loding_status == 3">
+                <form @submit="form_submit" class="form-container">
+                    <view class="border-radius-main bg-white padding-main padding-bottom-xxxxl spacing-mb">
+                        <view class="title fw-b text-size margin-vertical-xxxl">{{$t('giftcard-index.giftcard-index.hfg2fg')}}</view>
+                        <view class="flex-row align-c padding-bottom-xl">
+                            <!-- #ifndef H5 -->
+                            <view class="margin-right" @tap="scan_event">
+                                <uni-icons type="scan" size="56rpx" color="#666"></uni-icons>
+                            </view>
+                            <!-- #endif -->
+                            <input type="text" class="wh-auto secret-key-value" :placeholder="$t('giftcard-index.giftcard-index.fu3rf1')" placeholder-class="cr-grey-c" :value="secret_key_value" @input="secret_key_event" />
+                        </view>
+                    </view>
+                    <view class="padding-main">
+                        <button type="default" form-type="submit" hover-class="none" class="br-main bg-main cr-white round text-size-lg" :disabled="form_submit_loading">{{$t('common.confirm')}}</button>
+                    </view>
+                    <view class="padding-lg margin-top-xl text-size-lg tc">
+                        <text v-if="(error_msg || null) != null" class="cr-red">{{error_msg}}</text>
+                        <text v-if="(success_msg || null) != null" class="cr-green">{{success_msg}}</text>
+                    </view>
+                </form>
+            </block>
+            <block v-else>
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </block>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                form_submit_loading: false,
+                secret_key_value: '',
+                error_msg: '',
+                success_msg: ''
+            };
+        },
+        components: {
+            componentCommon,
+            componentNoData,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 加载数据
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user == false) {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_list_loding_msg: this.$t('setup.setup.nwt4o1'),
+                    });
+                } else {
+                    this.setData({
+                        data_list_loding_status: 3,
+                        data_list_loding_msg: '',
+                    });
+                }
+            },
+            
+            // 输入事件
+            secret_key_event(e) {
+                this.setData({
+                    secret_key_value: e.detail.value
+                });
+            },
+
+            // 扫码事件
+            scan_event(e) {
+                var self = this;
+                uni.scanCode({
+                	success: function (res) {
+                        if((res.result || null) != null) {
+                            self.setData({
+                                secret_key_value: res.result
+                            });
+                            self.form_submit();
+                        }
+                	}
+                });
+            },
+
+            // 表单提交
+            form_submit() {
+                this.setData({
+                    error_msg: '',
+                    success_msg: ''
+                });
+                var form_data = {
+                    secret_key: this.secret_key_value
+                }
+                var validation = [
+                    { fields: 'secret_key', msg: this.$t('giftcard-index.giftcard-index.fu3rf1') }
+                ];
+                if (app.globalData.fields_check(form_data, validation)) {
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    this.setData({
+                        form_submit_loading: true
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('exchange', 'index', 'giftcard'),
+                        method: 'POST',
+                        data: form_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                var self = this;
+                                self.setData({
+                                    error_msg: '',
+                                    success_msg: res.data.msg,
+                                });
+                                setTimeout(function() {
+                                    self.setData({
+                                        form_submit_loading: false,
+                                    });
+                                    if(app.globalData.prev_page() == null) {
+                                        app.globalData.url_open('/pages/plugins/giftcard/index/index', true);
+                                    } else {
+                                        uni.navigateBack();
+                                    }
+                                }, 1500);
+                            } else {
+                                if (app.globalData.is_login_check(res.data, this, 'form_submit')) {
+                                    this.setData({
+                                        form_submit_loading: false,
+                                        error_msg: res.data.msg,
+                                        success_msg: '',
+                                    });
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_loading: false,
+                                error_msg: this.$t('common.internet_error_tips'),
+                                success_msg: '',
+                            });
+                        },
+                    });
+                }
+            }
+        }
+    };
+</script>
+<style scoped>
+    input.secret-key-value {
+        height: 100rpx;
+        line-height: 100rpx;
+        font-size: 44rpx;
+    }
+</style>
\ No newline at end of file
diff --git a/pages/plugins/giftcard/index/index.css b/pages/plugins/giftcard/index/index.css
new file mode 100644
index 0000000..5189be8
--- /dev/null
+++ b/pages/plugins/giftcard/index/index.css
@@ -0,0 +1,3 @@
+.secret-value-data .value-title {
+    width: calc(100% - 160rpx);
+}
\ No newline at end of file
diff --git a/pages/plugins/giftcard/index/index.vue b/pages/plugins/giftcard/index/index.vue
new file mode 100644
index 0000000..cf9e4b0
--- /dev/null
+++ b/pages/plugins/giftcard/index/index.vue
@@ -0,0 +1,272 @@
+<template>
+    <view :class="theme_view">
+        <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view class="page-bottom-fixed">
+                <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                    <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                        <view class="content">
+                            <view class="single-text margin-top-xs">
+                                <text class="cr-grey-9 margin-right-main">{{ $t('giftcard-index.giftcard-index.87ytyh') }}:</text>
+                                <text class="cr-black">{{ item.data_type_name }}</text>
+                            </view>
+                            <view class="single-text margin-top-xs">
+                                <text class="cr-grey-9 margin-right-main">{{ $t('giftcard-index.giftcard-index.hfg2fg') }}:</text>
+                                <text class="cr-black" data-event="copy" :data-value="item.secret_key" @tap="text_event">{{ item.secret_key }}</text>
+                            </view>
+                            <view v-if="(item.secret_value_text || null) != null" class="single-text margin-top-xs">
+                                <text class="cr-grey-9 margin-right-main">{{ $t('giftcard-index.giftcard-index.fyjnsd') }}:</text>
+                                <text class="cr-black am-margin-right-lg">{{ item.secret_value_text }}</text>
+                                <text v-if="item.data_type == 0" data-value="/pages/plugins/wallet/user/user" @tap="url_event" class="cr-grey fr">{{ $t('common.view_text') }}</text>
+                                <text v-else-if="item.data_type == 1" data-value="/pages/plugins/coupon/user/user" @tap="url_event" class="cr-grey fr">{{ $t('common.view_text') }}</text>
+                                <text v-else-if="item.data_type == 2" data-value="/pages/user-integral/user-integral" @tap="url_event" class="cr-grey fr">{{ $t('common.view_text') }}</text>
+                            </view>
+                            <block v-else>
+                                <view class="margin-top-sm fw-b">{{$t('giftcard-index.giftcard-index.fyjnsd')}}</view>
+                                <view v-if="(item.secret_value_data || null) != null" class="secret-value-data margin-bottom-sm">
+                                    <view v-for="(items, indexs) in item.secret_value_data" :key="indexs" class="oh">
+                                        <view class="single-text fl value-title">{{items.title}}</view>
+                                        <text :data-value="items.url" @tap="url_event" :class="'fr cr-'+((item.use_data || null) == null ? 'blue' : 'grey')">{{(item.use_data || null) == null ? $t('common.place_order_text') : $t('common.view_text') }}</text>
+                                    </view>
+                                </view>
+                                <view v-else class="cr-grey margin-bottom-sm">{{ $t('common.no_relevant_data_tips') }}</view>
+                            </block>
+                            <view v-for="(fv, fi) in content_list" :key="fi">
+                                <view class="single-text margin-top-xs">
+                                    <text class="cr-grey-9 margin-right-main">{{ fv.name }}:</text>
+                                    <text class="cr-black">{{ item[fv.field] }}</text>
+                                    <text v-if="(fv.unit || null) != null" class="cr-grey">{{ fv.unit }}</text>
+                                </view>
+                            </view>
+                            <view v-if="(item.use_data || null) != null && item.use_data.length > 0">
+                                <view class="margin-top-sm fw-b">{{$t('giftcard-index.giftcard-index.6redfg')}}</view>
+                                <view v-for="(uv, uk) in item.use_data" :key="uk">
+                                    <view>
+                                        <text class="cr-grey-9 margin-right-main">{{$t('user-order-detail.user-order-detail.n18sd2')}}:</text>
+                                        <text data-event="copy" :data-value="uv.order_no" @tap="text_event">{{uv.order_no}}</text>
+                                    </view>
+                                    <view>
+                                        <text class="cr-grey-9 margin-right-main">{{$t('user-order-detail.user-order-detail.yghjkf')}}:</text>
+                                        <text :data-value="uv.goods_url" @tap="url_event">{{uv.goods_title}}</text>
+                                    </view>
+                                    <view>
+                                        <text class="cr-grey-9 margin-right-main">{{$t('common.use_time')}}:</text>
+                                        <text>{{uv.use_time}}</text>
+                                    </view>
+                                </view>
+                            </view>
+                        </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"></component-no-data>
+                </view>
+
+                <!-- 兑换卡密 -->
+                <view class="bottom-fixed" :style="bottom_fixed_style">
+                    <view class="bottom-line-exclude">
+                        <button class="item round cr-main bg-white br-main text-size wh-auto sub-btn" type="default" hover-class="none" data-value="/pages/plugins/giftcard/form/form" @tap="url_event">{{$t('giftcard-index.giftcard-index.8tfgh2')}}</button>
+                    </view>
+                </view>
+            </view>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                bottom_fixed_style: '',
+                data_base: null,
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                content_list: [
+                    { name: this.$t('giftcard-index.giftcard-index.87yyj3'), field: 'exchange_time' },
+                    { name: this.$t('common.add_time'), field: 'add_time' },
+                    { name: this.$t('common.upd_time'), field: 'upd_time' },
+                ],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 初始化配置
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            // 初始化
+            init(e) {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.setData({
+                        data_page: 1,
+                    });
+                    this.get_data_list(1);
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'index', 'giftcard'),
+                    method: 'POST',
+                    data: {page: this.data_page},
+                    dataType: 'json',
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data_list.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data_list;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data_list;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 文本事件
+            text_event(e) {
+                app.globalData.text_event_handle(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import "./index.css";
+</style>
\ No newline at end of file
diff --git a/pages/plugins/givegift/code/code.css b/pages/plugins/givegift/code/code.css
new file mode 100644
index 0000000..58e77df
--- /dev/null
+++ b/pages/plugins/givegift/code/code.css
@@ -0,0 +1,7 @@
+/**
+ * 用户
+ */
+.user-images {
+    width: 40rpx;
+    height: 40rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/givegift/code/code.vue b/pages/plugins/givegift/code/code.vue
new file mode 100644
index 0000000..08a9193
--- /dev/null
+++ b/pages/plugins/givegift/code/code.vue
@@ -0,0 +1,294 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav-base bg-white flex-row jc-sa align-c">
+            <block v-for="(item, index) in nav_status_list" :key="index">
+                <view :class="'item fl tc ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+            </block>
+        </view>
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                    <view class="base oh br-b padding-bottom-main">
+                        <block v-if="(item.use_user || null) != null">
+                            <image :src="item.use_user.avatar" mode="aspectFill" class="radius user-images dis-inline-block va-m"></image>
+                            <text class="va-m margin-left-sm">{{item.use_user.user_name_view}}</text>
+                        </block>
+                        <text class="fr cr-main">{{ item.status_name }}</text>
+                    </view>
+                    <view class="margin-top">
+                        <component-panel-content :propData="item" :propDataField="field_list" propExcludeField="status_name" :propIsTerse="true"></component-panel-content>
+                    </view>
+                    <view v-if="item.status == 0" class="item-operation tr br-t padding-top-main margin-top-main">
+                        <button class="round bg-white cr-green br-green" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/givegift/receive/receive?code='+item.code" hover-class="none">{{$t('common.link')}}</button>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </view>
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentPanelContent from "@/components/panel-content/panel-content";
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                field_list: [],
+            };
+        },
+        components: {
+            componentCommon,
+            componentPanelContent,
+            componentNoData,
+            componentBottomLine
+        },
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 参数处理
+            params = app.globalData.launch_params_handle(params);
+
+            // 是否指定状态
+            var nav_status_index = 0;
+            if ((params.status || null) != null) {
+                for (var i in this.nav_status_list) {
+                    if (this.nav_status_list[i]['value'] == params.status) {
+                        nav_status_index = i;
+                        break;
+                    }
+                }
+            }
+            this.setData({
+                params: params,
+                nav_status_index: nav_status_index,
+            });
+            this.init();
+        },
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取公共数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('init', 'giftcode', 'givegift'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                nav_status_list: data.nav_status_list || [],
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: false,
+                                data_page: 1,
+                            });
+                            this.get_data_list();
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 列表数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+                
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+                
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 请求数据
+                var data = {...this.params, ...{
+                    page: this.data_page,
+                }};
+
+                // 状态
+                var status = (this.nav_status_list[this.nav_status_index] || null) == null ? -1 : this.nav_status_list[this.nav_status_index]['value'];
+                if (status != -1) {
+                    data['status'] = status;
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'giftcode', 'givegift'),
+                    method: 'POST',
+                    data: data,
+                    dataType: 'json',
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            if (data.data_list.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = data.data_list;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = data.data_list;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: data.data_total,
+                                    data_page_total: data.page_total,
+                                    field_list: data.field_list || [],
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_status_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        }
+    };
+</script>
+<style>
+    @import './code.css';
+</style>
\ No newline at end of file
diff --git a/pages/plugins/givegift/gift/gift.css b/pages/plugins/givegift/gift/gift.css
new file mode 100644
index 0000000..fcf737c
--- /dev/null
+++ b/pages/plugins/givegift/gift/gift.css
@@ -0,0 +1,17 @@
+/**
+ * 商品
+ */
+.goods-images {
+    width: 76rpx;
+    height: 76rpx;
+}
+.goods-title {
+    width: calc(100% - 90rpx);
+}
+
+/**
+ * 编辑表单
+ */
+.form-container .message-tips {
+    width: calc(100% - 200rpx) !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/givegift/gift/gift.vue b/pages/plugins/givegift/gift/gift.vue
new file mode 100644
index 0000000..0bd82e0
--- /dev/null
+++ b/pages/plugins/givegift/gift/gift.vue
@@ -0,0 +1,607 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav-base bg-white flex-row jc-sa align-c">
+            <block v-for="(item, index) in nav_status_list" :key="index">
+                <view :class="'item fl tc ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+            </block>
+        </view>
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                    <view class="base oh br-b padding-bottom-main">
+                        <text class="cr-base">{{ item.add_time }}</text>
+                        <text class="fr cr-main">{{ item.status_name }}</text>
+                    </view>
+                    <view  class="margin-top">
+                        <view class="oh" :data-value="item.goods.goods_url" @tap="url_event">
+                            <image :src="item.goods.images" mode="aspectFill" class="radius goods-images fl"></image>
+                            <view class="goods-title multi-text fr">{{item.goods.title}}</view>
+                        </view>
+                        <component-panel-content :propData="item" :propDataField="field_list" propExcludeField="status_name" propIsItemShowMax="6" :propIsTerse="true"></component-panel-content>
+                    </view>
+                    <view class="item-operation tr br-t padding-top-main margin-top-main">
+                        <button class="round bg-white cr-base br-grey" type="default" size="mini" @tap="popup_edit_open_event" :data-index="index" hover-class="none">{{$t('common.edit')}}</button>
+                        <block v-if="item.status == 0">
+                            <button class="round bg-white cr-green br-green" type="default" size="mini" @tap="pay_event" :data-value="item.id" :data-price="item.total_price" :data-index="index" :data-payment="item.payment_id" hover-class="none">{{$t('order.order.1i873j')}}</button>
+                            <button class="round bg-white cr-yellow br-yellow" type="default" size="mini" @tap="cancel_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('common.cancel')}}</button>
+                        </block>
+                        <block v-if="item.status == 1">
+                            <button class="round bg-white cr-main br-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/givegift/code/code?oid='+item.id" hover-class="none">{{$t('common.gift')}}</button>
+                            <button class="round bg-white cr-green br-green" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/givegift/receive/receive?key='+item.key" hover-class="none">{{$t('common.link')}}</button>
+                        </block>
+                        <button v-if="item.status == 2" class="round bg-white cr-red br-red" type="default" size="mini" @tap="delete_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('common.del')}}</button>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 编辑弹层 -->
+        <component-popup :propShow="popup_edit_status" propPosition="bottom" @onclose="popup_edit_close_event">
+            <view class="padding-horizontal-main padding-top-main bg-white">
+                <view class="close oh">
+                    <view class="fr" @tap.stop="popup_edit_close_event">
+                        <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                    </view>
+                </view>
+                <view class="padding-bottom-main">
+                    <view v-if="(edit_data || null) != null">
+                        <form @submit="form_submit" class="form-container">
+                            <view class="border-radius-main spacing-mb oh">
+                                <view class="form-gorup">
+                                    <view class="flex-row jc-sb align-c padding-top-sm">
+                                        <view class="form-gorup-title">{{$t('givegift-gift.givegift-gift.567uye')}}</view>
+                                        <input type="text" name="message_tips" :value="edit_data.message_tips || ''" class="br-b-f5 tr message-tips" placeholder-class="cr-grey-c" :placeholder="$t('givegift-gift.givegift-gift.rtyu33')" />
+                                    </view>
+                                </view>
+                                <view class="form-gorup">
+                                    <view class="flex-row jc-sb align-c padding-bottom-sm">
+                                        <view class="form-gorup-title">{{$t('givegift-gift.givegift-gift.8yghjd')}}</view>
+                                        <switch name="is_no_limit_receive" :checked="edit_data.is_no_limit_receive == 1" />
+                                    </view>
+                                </view>
+                            </view>
+                            <view class="padding-main">
+                                <button class="bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :disabled="form_submit_disabled_status">{{$t('common.save')}}</button>
+                            </view>
+                        </form>
+                    </view>
+                    <block v-else>
+                        <component-no-data propStatus="0"></component-no-data>
+                    </block>
+                </view>
+            </view>
+        </component-popup>
+
+        <!-- 支付组件 -->
+        <component-payment
+            ref="payment"
+            :propPayUrl="pay_url"
+            :propQrcodeUrl="qrcode_url"
+            propPayDataKey="order_id"
+            :propPaymentList="payment_list"
+            :propTempPayValue="temp_pay_value"
+            :propTempPayIndex="temp_pay_index"
+            :propPaymentId="payment_id"
+            :propDefaultPaymentId="default_payment_id"
+            :propPayPrice="pay_price"
+            :propIsShowPayment="is_show_payment_popup"
+            @close-payment-popup="payment_popup_event_close"
+            @pay-success="order_item_pay_success_handle"
+            :propNavDtatusIndex="nav_status_index"
+            @reset-event="reset_event"
+        ></component-payment>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentPanelContent from "@/components/panel-content/panel-content";
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentPayment from '@/components/payment/payment';
+    import componentPopup from '@/components/popup/popup';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                edit_data: null,
+                popup_edit_status: false,
+                edit_item_index: 0,
+                form_submit_disabled_status: false,
+                nav_status_list: [],
+                nav_status_index: 0,
+                field_list: [],
+                // 支付弹窗参数
+                pay_url: '',
+                qrcode_url: '',
+                payment_list: [],
+                temp_pay_value: '',
+                temp_pay_index: 0,
+                payment_id: 0,
+                default_payment_id: 0,
+                is_show_payment_popup: false,
+                pay_price: 0,
+            };
+        },
+        components: {
+            componentCommon,
+            componentPanelContent,
+            componentPayment,
+            componentNoData,
+            componentBottomLine,
+            componentPopup
+        },
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 参数处理
+            params = app.globalData.launch_params_handle(params);
+
+            // 是否指定状态
+            var nav_status_index = 0;
+            if ((params.status || null) != null) {
+                for (var i in this.nav_status_list) {
+                    if (this.nav_status_list[i]['value'] == params.status) {
+                        nav_status_index = i;
+                        break;
+                    }
+                }
+            }
+            this.setData({
+                params: params,
+                nav_status_index: nav_status_index,
+            });
+            this.init();
+        },
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.setData({
+                        pay_url: app.globalData.get_request_url('pay', 'gift', 'givegift'),
+                        qrcode_url: app.globalData.get_request_url('paycheck', 'gift', 'givegift'),
+                    });
+                    // 获取数据
+                    this.get_data();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+            
+            // 获取公共数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('init', 'gift', 'givegift'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                payment_list: data.payment_list || [],
+                                default_payment_id: data.default_payment_id || 0,
+                                nav_status_list: data.nav_status_list || [],
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: false,
+                                data_page: 1,
+                            });
+                            this.get_data_list();
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_base')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 列表数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+                
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+                
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 请求数据
+                var data = {
+                    page: this.data_page,
+                };
+
+                // 状态
+                var status = (this.nav_status_list[this.nav_status_index] || null) == null ? -1 : this.nav_status_list[this.nav_status_index]['value'];
+                if (status != -1) {
+                    data['status'] = status;
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'gift', 'givegift'),
+                    method: 'POST',
+                    data: data,
+                    dataType: 'json',
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            if (data.data_list.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = data.data_list;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = data.data_list;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: data.data_total,
+                                    data_page_total: data.page_total,
+                                    field_list: data.field_list || [],
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+
+                                // 下订单支付处理
+                                var key = app.globalData.data.cache_page_pay_key;
+                                var pay_data = uni.getStorageSync(key) || null;
+                                if (pay_data != null && (pay_data.order_ids || null) != null && (pay_data.payment_id || null) != null) {
+                                    uni.removeStorageSync(key);
+                                    this.setData({
+                                        temp_pay_value: pay_data.order_ids,
+                                        payment_id: pay_data.payment_id,
+                                    });
+                                    if ((this.$refs.payment || null) != null) {
+                                        this.$refs.payment.pay_handle(pay_data.order_ids, pay_data.payment_id, this.payment_list);
+                                    }
+                                }
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 支付
+            pay_event(e) {
+                this.setData({
+                    is_show_payment_popup: true,
+                    temp_pay_value: e.currentTarget.dataset.value,
+                    temp_pay_index: e.currentTarget.dataset.index,
+                    pay_price: e.currentTarget.dataset.price,
+                    payment_id: e.currentTarget.dataset.payment || '',
+                });
+            },
+
+            // 支付弹窗关闭
+            payment_popup_event_close(e) {
+                this.setData({
+                    is_show_payment_popup: false,
+                });
+            },
+
+            // 重置列表数据
+            reset_event() {
+                this.get_data_list();
+            },
+
+            // 支付成功数据设置
+            order_item_pay_success_handle(data) {
+                var order_ids_arr = data.order_id.toString().split(',');
+                var temp_data_list = this.data_list;
+                for (var i in temp_data_list) {
+                    if (order_ids_arr.indexOf(temp_data_list[i]['id'].toString()) != -1) {
+                        temp_data_list[i]['pay_price'] = temp_data_list[i]['total_price'];
+                        temp_data_list[i]['status'] = 1;
+                        temp_data_list[i]['status_name'] = this.$t('order.order.s8g966');
+                    }
+                }
+                this.setData({
+                    data_list: temp_data_list,
+                });
+            },
+
+            // 取消
+            cancel_event(e) {
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('order.order.pn78ns'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('recommend-list.recommend-list.w9460o'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            // 参数
+                            var id = e.currentTarget.dataset.value;
+                            var index = e.currentTarget.dataset.index;
+                            // 加载loding
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text'),
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url('cancel', 'gift', 'givegift'),
+                                method: 'POST',
+                                data: {
+                                    ids: id,
+                                },
+                                dataType: 'json',
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        var temp_data_list = this.data_list;
+                                        temp_data_list[index]['status'] = 2;
+                                        temp_data_list[index]['status_name'] = this.$t('order.order.1k98tk');
+                                        this.setData({
+                                            data_list: temp_data_list,
+                                        });
+                                        app.globalData.showToast(res.data.msg, 'success');
+                                    } else {
+                                        app.globalData.showToast(res.data.msg);
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 删除
+            delete_event(e) {
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('recommend-list.recommend-list.54d418'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('recommend-list.recommend-list.w9460o'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            // 参数
+                            var id = e.currentTarget.dataset.value;
+                            var index = e.currentTarget.dataset.index;
+                            // 加载loding
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text'),
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url('delete', 'gift', 'givegift'),
+                                method: 'POST',
+                                data: {
+                                    ids: id,
+                                },
+                                dataType: 'json',
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        var temp_data_list = this.data_list;
+                                        temp_data_list.splice(index, 1);
+                                        this.setData({
+                                            data_list: temp_data_list,
+                                        });
+                                        if (temp_data_list.length == 0) {
+                                            this.setData({
+                                                data_list_loding_status: 0,
+                                                data_bottom_line_status: false,
+                                            });
+                                        }
+                                        app.globalData.showToast(res.data.msg, 'success');
+                                    } else {
+                                        app.globalData.showToast(res.data.msg);
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_status_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 编辑开启弹层
+            popup_edit_open_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                this.setData({
+                    popup_edit_status: true,
+                    edit_data: this.data_list[index],
+                    edit_item_index: index
+                });
+            },
+
+            // 编辑弹层关闭
+            popup_edit_close_event(e) {
+                this.setData({
+                    popup_edit_status: false,
+                });
+            },
+
+            // 数据提交
+            form_submit(e) {
+                var form_data = e.detail.value;
+                form_data['is_no_limit_receive'] = form_data.is_no_limit_receive == true ? 1 : 0;
+                form_data['id'] = this.edit_data.id;
+                this.setData({
+                    form_submit_disabled_status: true,
+                });
+                uni.showLoading({
+                    title: this.$t('common.processing_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('save', 'gift', 'givegift'),
+                    method: 'POST',
+                    data: form_data,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            var temp_data = this.data_list;
+                            var index = this.edit_item_index;
+                            temp_data[index]['is_no_limit_receive_name'] = form_data.is_no_limit_receive == 1 ? this.$t('common.yes_text') : this.$t('common.no_text');
+                            temp_data[index]['is_no_limit_receive'] = form_data.is_no_limit_receive;
+                            temp_data[index]['message_tips'] = form_data.message_tips;
+                            this.setData({
+                                data_list: temp_data,
+                                form_submit_disabled_status: false,
+                                popup_edit_status: false
+                            });
+                            app.globalData.showToast(res.data.msg, 'success');
+                        } else {
+                            this.setData({
+                                form_submit_disabled_status: false,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'form_submit', e)) {
+                                app.globalData.showToast(res.data.msg);
+                            } else {
+                                app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                            }
+                        }
+                    },
+                    fail: () => {
+                        this.setData({
+                            form_submit_disabled_status: false,
+                        });
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        }
+    };
+</script>
+<style>
+    @import './gift.css';
+</style>
\ No newline at end of file
diff --git a/pages/plugins/givegift/goods/goods.css b/pages/plugins/givegift/goods/goods.css
new file mode 100644
index 0000000..c7463fe
--- /dev/null
+++ b/pages/plugins/givegift/goods/goods.css
@@ -0,0 +1,23 @@
+.goods-buy-number {
+    height: 70rpx;
+}
+.number-content {
+    background: #eee;
+    border: 1px solid #eee;
+}
+.number-content .number-submit {
+    width: 80rpx;
+    font-weight: bold;
+}
+.number-content input {
+    width: 50px;
+}
+.number-content .number-submit,
+.number-content input {
+    padding: 0;
+    height: 60rpx;
+    line-height: 60rpx;
+}
+.right-width .fr {
+    width: calc(100% - 190rpx);
+}
\ No newline at end of file
diff --git a/pages/plugins/givegift/goods/goods.vue b/pages/plugins/givegift/goods/goods.vue
new file mode 100644
index 0000000..02cf589
--- /dev/null
+++ b/pages/plugins/givegift/goods/goods.vue
@@ -0,0 +1,369 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(goods || null) != null" class="page-bottom-fixed">
+            <form @submit="form_submit">
+                <image :src="goods.images" mode="widthFix" class="wh-auto dis-block"></image>
+                <view class="padding-main">
+                    <view class="bg-white padding-main border-radius-main">
+                        <view class="fw-b text-size multi-text lh-xl margin-bottom">{{goods.title}}</view>
+                        <view class="pr">
+                            <view v-if="(goods.show_field_price_status || 0) == 1" class="margin-bottom-xs">
+                                <text class="price cr-price">{{goods.show_price_symbol}}</text>
+                                <text class="sales-price text-size-lg">{{goods.price}}</text>
+                                <text v-if="(goods.show_price_unit || null) != null" class="cr-grey text-size-xs">{{goods.show_price_unit}}</text>
+                            </view>
+                            <view v-if="(goods.show_field_original_price_status || 0) == 1" class="original-price">
+                                <text class="text-size-xs">{{goods.show_original_price_symbol}}</text>
+                                <text class="text-size">{{goods.original_price}}</text>
+                                <text v-if="(goods.show_original_price_unit || null) != null" class="text-size-xs">{{goods.show_original_price_unit}}</text>
+                            </view>
+                            <view class="pa top-0 right-0" @tap="share_event">
+                                <iconfont name="icon-share-square" size="34rpx" color="#999"></iconfont>
+                            </view>
+                        </view>
+                        <view v-if="(goods.show_inventory_status || 0) == 1" class="inventory text-size-xs margin-top">
+                            <text class="cr-grey">{{ $t('goods-detail.goods-detail.1s79t4') }}</text>
+                            <text class="cr-base">{{ goods.inventory }}</text>
+                            <text class="cr-grey">{{ goods.inventory_unit }}</text>
+                        </view>
+
+                        <view class="goods-buy-number oh pr margin-top-xxxl">
+                            <view class="fl margin-top-sm">{{ $t('common.num') }}</view>
+                            <view class="number-content tc oh round pa right-0 top-0">
+                                <view @tap="goods_buy_number_event" class="number-submit tc cr-grey fl va-m" data-type="0">-</view>
+                                <input @blur="goods_buy_number_blur" class="tc cr-grey bg-white fl va-m radius-0" type="number" name="buy_number" :value="buy_number" />
+                                <view @tap="goods_buy_number_event" class="number-submit tc cr-grey fl va-m" data-type="1">+</view>
+                            </view>
+                        </view>
+
+                        <view class="oh margin-top-xl">
+                            <view class="fl margin-top-sm">{{$t('givegift-gift.givegift-gift.8yghjd')}}</view>
+                            <view class="fr">
+                                <switch name="is_no_limit_receive" :checked="true" />
+                            </view>
+                        </view>
+
+                        <view class="oh margin-top-xl right-width">
+                            <view class="fl margin-top-sm">{{$t('givegift-gift.givegift-gift.567uye')}}</view>
+                            <view class="fr">
+                                <input type="text" class="br round padding-horizontal lh-xxl ht-xxl" placeholder-class="cr-grey-c" :placeholder="$t('givegift-gift.givegift-gift.rtyu33')" name="message_tips" />
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <view class="bottom-fixed" :style="bottom_fixed_style">
+                    <view class="bottom-line-exclude">
+                        <button type="default" form-type="submit" class="item bg-main br-main cr-white text-size round wh-auto" :disabled="form_submit_disabled_status">{{$t('common.submit_payment')}}</button>
+                    </view>
+                </view>
+            </form>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </view>
+        <!-- 分享弹窗 -->
+        <component-share-popup ref="share"></component-share-popup>
+
+        <!-- 支付组件 -->
+        <component-payment
+            :propPayUrl="pay_url"
+            :propQrcodeUrl="qrcode_url"
+            propPayDataKey="order_id"
+            :propPaymentList="payment_list"
+            :propTempPayValue="temp_pay_value"
+            :propTempPayIndex="temp_pay_index"
+            :propPaymentId="payment_id"
+            :propDefaultPaymentId="default_payment_id"
+            :propPayPrice="pay_price"
+            :propIsRedirectTo="true"
+            :propToPageBack="to_page_back"
+            :propToFailPage="to_fail_page"
+            :propToAppointPage="to_appoint_page"
+            :propIsShowPayment="is_show_payment_popup"
+            @close-payment-popup="payment_popup_event_close"
+        ></component-payment>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentPayment from '@/components/payment/payment';
+    import componentSharePopup from '@/components/share-popup/share-popup';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                bottom_fixed_style: '',
+                params: {},
+                goods: null,
+                buy_number: 1,
+                form_submit_disabled_status: false,
+                // 支付弹窗参数
+                pay_url: '',
+                qrcode_url: '',
+                payment_list: [],
+                temp_pay_value: '',
+                temp_pay_index: 0,
+                payment_id: 0,
+                default_payment_id: 0,
+                is_show_payment_popup: false,
+                pay_price: 0,
+                // 前往支付页面携带的参数
+                to_page_back: {
+                    page: '/pages/plugins/givegift/gift/gift',
+                    title: '我的送礼'
+                },
+                // 支付失败跳转的页面
+                to_fail_page: '/pages/plugins/givegift/gift/gift',
+                // 现金--跳转指定页面
+                to_appoint_page: '/pages/plugins/givegift/gift/gift',
+                // 自定义分享信息
+                share_info: {}
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentPayment,
+            componentSharePopup
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 初始化
+            this.init();
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        methods: {
+            init(e) {
+                this.setData({
+                    pay_url: app.globalData.get_request_url('pay', 'gift', 'givegift'),
+                    qrcode_url: app.globalData.get_request_url('paycheck', 'gift', 'givegift'),
+                });
+                this.get_data();
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('goods', 'gift', 'givegift'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var payment_list = data.payment_list || [];
+                            var default_payment_id = data.default_payment_id || 0;
+                            this.setData({
+                                goods: data.goods || null,
+                                default_payment_id: default_payment_id,
+                                payment_list: payment_list,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: false,
+                            });
+                            if (this.goods != null) {
+                                // 基础自定义分享
+                                this.setData({
+                                    share_info: {
+                                        title: this.goods.seo_title || this.goods.title,
+                                        desc: this.goods.seo_desc || this.goods.simple_desc,
+                                        path: '/pages/goods-detail/goods-detail',
+                                        query: 'id='+this.goods.id,
+                                        img: this.goods.images
+                                    },
+                                });
+                                // 标题
+                                uni.setNavigationBarTitle({ title: this.goods.title });
+                            }
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+            
+            // 数量输入事件
+            goods_buy_number_blur(e) {
+                var number = parseInt(e.detail.value) || 1;
+                if (isNaN(number)) {
+                    number = this.goods.buy_min_number || 1;
+                }
+                this.goods_buy_number_func(number);
+            },
+            
+            // 数量操作事件
+            goods_buy_number_event(e) {
+                var type = parseInt(e.currentTarget.dataset.type || 0);
+                var temp_number = parseInt(this.buy_number);
+                var number = type == 0 ? temp_number - 1 : temp_number + 1;
+                this.goods_buy_number_func(number);
+            },
+
+            // 数量处理方法
+            goods_buy_number_func(number) {
+                var buy_min_number = parseInt(this.goods.buy_min_number || 1);
+                var buy_max_number = parseInt(this.goods.buy_max_number || 0);
+                var spec_buy_min_number = parseInt(this.goods_spec_base_buy_min_number || 0);
+                var spec_buy_max_number = parseInt(this.goods_spec_base_buy_max_number || 0);
+                var inventory = parseInt(this.goods.inventory || 0);
+                var inventory_unit = this.goods.inventory_unit;
+
+                // 最小起购数量
+                var min = spec_buy_min_number > 0 ? spec_buy_min_number : buy_min_number;
+                if (min > 0 && number < min) {
+                    number = min;
+                    app.globalData.showToast(this.$t('recommend-detail.recommend-detail.265vyu') + min + inventory_unit);
+                }
+
+                // 最大购买数量
+                var max = spec_buy_max_number > 0 ? spec_buy_max_number : buy_max_number;
+                if (max > 0 && number > max) {
+                    number = max;
+                    app.globalData.showToast(this.$t('goods-category.goods-category.z1eh3v') + max + inventory_unit);
+                }
+
+                // 是否超过库存数量
+                if (number > inventory) {
+                    number = inventory;
+                    app.globalData.showToast(this.$t('recommend-detail.recommend-detail.2sis3v') + inventory + inventory_unit);
+                }
+
+                this.setData({ buy_number: number });
+            },
+
+            // 数据提交
+            form_submit(e) {
+                // 是否登录
+                var user = app.globalData.get_user_info(this, 'form_submit', e);
+                if(user !== false) {
+                    var form_data = e.detail.value;
+                    form_data['goods_id'] = this.goods.id;
+                    this.setData({
+                        form_submit_disabled_status: true,
+                    });
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('create', 'gift', 'givegift'),
+                        method: 'POST',
+                        data: form_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                var data = res.data.data;
+                                if(parseInt(data.is_success || 0) == 1) {
+                                    app.globalData.showToast(res.data.msg, 'success');
+                                    var self = this;
+                                    setTimeout(function() {
+                                        app.globalData.url_open(self.to_appoint_page, true);
+                                    }, 1500);
+                                } else {
+                                    this.setData({
+                                        is_show_payment_popup: this.is_show_payment_popup ? false : true,
+                                        temp_pay_value: data.order_id,
+                                        pay_price: data.total_price,
+                                        payment_id: data.payment_user_id || this.default_payment_id,
+                                    });
+                                    uni.setStorageSync(app.globalData.data.cache_page_pay_key, {
+                                        order_ids: data.order_id,
+                                    });
+                                }
+                            } else {
+                                this.setData({
+                                    form_submit_disabled_status: false,
+                                });
+                                if (app.globalData.is_login_check(res.data, this, 'form_submit', e)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            this.setData({
+                                form_submit_disabled_status: false,
+                            });
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 支付窗口关闭
+            payment_popup_event_close() {
+                this.setData({
+                    is_show_payment_popup: false,
+                    form_submit_disabled_status: false,
+                });
+            },
+
+            // 分享开启弹层
+            share_event(e) {
+                if ((this.$refs.share || null) != null) {
+                    this.$refs.share.init({
+                        status: true,
+                        share_info: this.share_info
+                    });
+                }
+            }
+        }
+    };
+</script>
+<style scoped>
+    @import './goods.css';
+</style>
diff --git a/pages/plugins/givegift/receive/receive.css b/pages/plugins/givegift/receive/receive.css
new file mode 100644
index 0000000..847aa83
--- /dev/null
+++ b/pages/plugins/givegift/receive/receive.css
@@ -0,0 +1,4 @@
+.user-avatar {
+    width: 46rpx;
+    height: 46rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/givegift/receive/receive.vue b/pages/plugins/givegift/receive/receive.vue
new file mode 100644
index 0000000..4fc606f
--- /dev/null
+++ b/pages/plugins/givegift/receive/receive.vue
@@ -0,0 +1,233 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data || null) != null" class="page-bottom-fixed">
+            <form @submit="form_submit">
+                <image :src="data.goods.images" mode="widthFix" class="wh-auto dis-block"></image>
+                <view class="padding-main">
+                    <view class="bg-white padding-main border-radius-main">
+                        <view class="fw-b text-size multi-text lh-xl margin-bottom">{{data.goods.title}}</view>
+                        <view class="pr">
+                            <view v-if="(data.goods.show_field_price_status || 0) == 1" class="margin-bottom-xs">
+                                <text class="price cr-price">{{data.goods.show_price_symbol}}</text>
+                                <text class="sales-price text-size-lg">{{data.goods.price}}</text>
+                                <text v-if="(data.goods.show_price_unit || null) != null" class="cr-grey text-size-xs">{{data.goods.show_price_unit}}</text>
+                            </view>
+                            <view v-if="(data.goods.show_field_original_price_status || 0) == 1" class="original-price">
+                                <text class="text-size-xs">{{data.goods.show_original_price_symbol}}</text>
+                                <text class="text-size">{{data.goods.original_price}}</text>
+                                <text v-if="(data.goods.show_original_price_unit || null) != null" class="text-size-xs">{{data.goods.show_original_price_unit}}</text>
+                            </view>
+                            <view class="pa top-0 right-0" @tap="share_event">
+                                <iconfont name="icon-share-square" size="34rpx" color="#999"></iconfont>
+                            </view>
+                        </view>
+                        <view class="margin-top-xl margin-bottom-lg">
+                            <image :src="data.user.avatar" mode="aspectFit" class="va-m user-avatar"></image>
+                            <text class="text-size-sm cr-grey va-m margin-left-sm">{{ data.title }}</text>
+                        </view>
+                        <view v-if="(data.desc || null) != null" class="margin-top-lg cr-red">{{data.desc}}</view>
+                        <view class="margin-top-xxl padding-bottom-sm">
+                            <input type="text" class="br round padding-horizontal lh-xxl ht-xxl" placeholder-class="cr-grey-c" :placeholder="$t('givegift-gift.givegift-gift.34rrr3')" name="user_message" />
+                        </view>
+                    </view>
+                </view>
+                <view class="bottom-fixed" :style="bottom_fixed_style">
+                    <view class="bottom-line-exclude">
+                        <button type="default" form-type="submit" class="item bg-main br-main cr-white text-size round wh-auto">{{$t('common.my_want_receive')}}</button>
+                    </view>
+                </view>
+            </form>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </view>
+
+        <!-- 分享弹窗 -->
+        <component-share-popup ref="share"></component-share-popup>
+
+        <!-- 规格选择 -->
+        <component-goods-spec-choice ref="goods_spec_choice" v-on:specConfirmEvent="spec_confirm_event"></component-goods-spec-choice>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import base64 from '@/common/js/lib/base64.js';
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentGoodsSpecChoice from '@/components/goods-spec-choice/goods-spec-choice';
+    import componentSharePopup from '@/components/share-popup/share-popup';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                bottom_fixed_style: '',
+                params: {},
+                data: null,
+                form_data: {},
+                // 自定义分享信息
+                share_info: {}
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentGoodsSpecChoice,
+            componentSharePopup
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 加载数据
+            this.get_data();
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        methods: {
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('receive', 'gift', 'givegift'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            this.setData({
+                                data: res.data.data || null,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: false,
+                            });
+                            if (this.data != null) {
+                                // 基础自定义分享
+                                this.setData({
+                                    share_info: {
+                                        title: this.data.title || this.data.desc,
+                                        desc: this.data.desc,
+                                        path: '/pages/plugins/givegift/receive/receive',
+                                        query: app.globalData.json_to_url_params(this.params),
+                                        img: (this.data.goods || null) != null ? this.data.goods.images : ''
+                                    },
+                                });
+                                // 标题
+                                uni.setNavigationBarTitle({ title: this.data.title });
+                            }
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+
+            // 数据提交
+            form_submit(e) {
+                // 是否登录
+                var user = app.globalData.get_user_info(this, 'form_submit', e);
+                if(user !== false) {
+                    // 设置表单数据
+                    this.setData({
+                        form_data: e.detail.value || {}
+                    });
+
+                    // 是否多规格
+                    var goods = this.data.goods;
+                    if(goods.is_exist_many_spec == 1) {
+                        if ((this.$refs.goods_spec_choice || null) != null) {
+                            this.$refs.goods_spec_choice.init(goods.id, goods['specifications']['choose'], goods.buy_min_number);
+                        }
+                    } else {
+                        this.buy_handle();
+                    }
+                }
+            },
+
+            // 规格确认回调事件
+            spec_confirm_event(value) {
+                this.buy_handle(value.spec);
+            },
+
+            // 购买处理
+            buy_handle(spec = '') {
+                var data = {
+                    buy_type: 'goods',
+                    goods_data: encodeURIComponent(
+                        base64.encode(
+                            JSON.stringify([
+                                {
+                                    goods_id: this.data.goods.id,
+                                    stock: 1,
+                                    spec: spec,
+                                    plugins_givegift_value: this.data.code || this.data.key,
+                                    plugins_givegift_type: (this.data.code || null) == null ? 'key' : 'code',
+                                    plugins_givegift_user_message: this.form_data.user_message
+                                },
+                            ])
+                        )
+                    )
+                };
+                app.globalData.url_open('/pages/buy/buy?data=' + encodeURIComponent(base64.encode(JSON.stringify(data))));
+            },
+
+            // 分享开启弹层
+            share_event(e) {
+                if ((this.$refs.share || null) != null) {
+                    this.$refs.share.init({
+                        status: true,
+                        share_info: this.share_info
+                    });
+                }
+            }
+        }
+    };
+</script>
+<style scoped>
+    @import './receive.css';
+</style>
diff --git a/pages/plugins/hospital/patient-list/patient-list.vue b/pages/plugins/hospital/patient-list/patient-list.vue
new file mode 100644
index 0000000..5a61396
--- /dev/null
+++ b/pages/plugins/hospital/patient-list/patient-list.vue
@@ -0,0 +1,215 @@
+<template>
+    <view :class="theme_view">
+        <view class="page-bottom-fixed padding-main">
+            <view v-if="patient_tips != null" class="margin-bottom">
+                <uni-notice-bar background-color="" :text="patient_tips" />
+            </view>
+            <view v-if="(data_list || null) != null && data_list.length > 0" class="bg-white padding-horizontal-main border-radius-main">
+                <block v-for="(item, index) in data_list" :key="index">
+                    <view class="item padding-vertical-main oh pr" :class="index > 0 ? 'br-t-f5' : ''" :data-index="index" @tap="item_event">
+                        <view>
+                            <text>{{item.name}}</text>
+                            <block v-if="(item.gender_name || null) != null">
+                                <text class="cr-grey-white padding-horizontal-sm">|</text>
+                                <text>{{item.gender_name}}</text>
+                            </block>
+                            <block v-if="(item.age_name || null) != null">
+                                <text class="cr-grey-white padding-horizontal-sm">|</text>
+                                <text>{{item.age_name}}</text>
+                            </block>
+                        </view>
+                        <view>{{item.idcard}}</view>
+                        <view class="pa top-0 right-0 margin-top-xl">
+                            <view class="dis-inline-block va-m" :data-value="'/pages/plugins/hospital/patient/patient?id='+item.id" @tap.stop="url_event">
+                                <iconfont name="icon-edit-o" size="48rpx" color="#999"></iconfont>
+                            </view>
+                            <view class="dis-inline-block va-m margin-left" :data-index="index" @tap.stop="del_event">
+                                <iconfont name="icon-delete-o" size="48rpx" color="#999"></iconfont>
+                            </view>
+                        </view>
+                    </view>
+                </block>
+            </view>
+            <block v-else>
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </block>
+        </view>
+        <view class="bottom-fixed">
+            <view class="bottom-line-exclude">
+                <button class="item bg-main br-main cr-white round text-size wh-auto" type="default" hover-class="none" data-value="/pages/plugins/hospital/patient/patient" @tap="url_event">添加就诊人</button>
+            </view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                params: {},
+                data_list: [],
+                patient_tips: null,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.get_data();
+
+            // 初始化配置
+            this.init_config();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        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');
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'patient', 'hospital'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: '',
+                                patient_tips: data.patient_tips || null,
+                                data_list: data.data_list || [],
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    }
+                });
+            },
+
+            // 删除
+            del_event(e) {
+                var data = this.data_list[e.currentTarget.dataset.index];
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('recommend-list.recommend-list.54d418'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('recommend-list.recommend-list.w9460o'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            // 加载loding
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text'),
+                            });
+                            // 获取数据
+                            uni.request({
+                                url: app.globalData.get_request_url('delete', 'patient', 'hospital'),
+                                method: 'POST',
+                                data: {
+                                    ids: data.id,
+                                },
+                                dataType: 'json',
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        app.globalData.showToast(res.data.msg, 'success');
+                                        // 数据加载
+                                        this.get_data();
+                                    } else {
+                                        if (app.globalData.is_login_check(res.data)) {
+                                            app.globalData.showToast(res.data.msg);
+                                        } else {
+                                            app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                        }
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    }
+                });
+            },
+
+            // 数据项事件
+            item_event(e) {
+                if(parseInt(this.params.is_choice || 0) == 1) {
+                    var data = this.data_list[e.currentTarget.dataset.index];
+                    uni.setStorageSync(app.globalData.data.cache_hospital_patient_choice_value_key, data.id);
+                    app.globalData.page_back_prev_event();
+                }
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        }
+    };
+</script>
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/plugins/hospital/patient/patient.css b/pages/plugins/hospital/patient/patient.css
new file mode 100644
index 0000000..64a4a15
--- /dev/null
+++ b/pages/plugins/hospital/patient/patient.css
@@ -0,0 +1,3 @@
+.health-tips {
+    width: calc(100% - 100rpx);
+}
\ No newline at end of file
diff --git a/pages/plugins/hospital/patient/patient.vue b/pages/plugins/hospital/patient/patient.vue
new file mode 100644
index 0000000..0ef00db
--- /dev/null
+++ b/pages/plugins/hospital/patient/patient.vue
@@ -0,0 +1,506 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="data_list_loding_status == 3">
+            <view class="page-bottom-fixed padding-main">
+                <view v-if="patient_tips != null" class="margin-bottom">
+                    <uni-notice-bar background-color="" :text="patient_tips" />
+                </view>
+                <form @submit="form_submit" class="form-container">
+                    <view class="oh border-radius-main tr">
+                        <view class="form-gorup flex-row jc-sb align-c br-b-f9">
+                            <view class="form-gorup-title">真实姓名<text class="form-group-tips-must">*</text></view>
+                            <view class="flex-row align-c flex-1 flex-width">
+                                <input type="text" name="name" :value="data.name || ''" maxlength="30" placeholder-class="cr-grey-9" class="cr-base" placeholder="请输入真实姓名" />
+                            </view>
+                        </view>
+                        <view class="form-gorup flex-row jc-sb align-c br-b-f9">
+                            <view class="form-gorup-title">身份证号码<text class="form-group-tips-must">*</text></view>
+                            <view class="flex-row align-c flex-1 flex-width">
+                                <input type="idcard" name="idcard" :value="data.idcard || ''" maxlength="60" placeholder-class="cr-grey-9" class="cr-base" placeholder="请输入身份证号码" />
+                            </view>
+                        </view>
+                        <view class="form-gorup flex-row jc-sb align-c br-b-f9">
+                            <view class="form-gorup-title">手机号码<text class="form-group-tips-must">*</text></view>
+                            <view class="flex-row align-c flex-1 flex-width">
+                                <input type="text" name="mobile" :value="data.mobile || ''" maxlength="30" placeholder-class="cr-grey-9" class="cr-base" placeholder="请输入手机号码" />
+                            </view>
+                        </view>
+                        <view class="form-gorup flex-row jc-sb align-c br-b-f9">
+                            <view class="form-gorup-title">性别<text class="form-group-tips-must">*</text></view>
+                            <view class="flex-row align-c flex-1 flex-width">
+                                <picker class="picker" name="gender" data-field="gender_index" @change="select_change_event" :value="select_index.gender_index" :range="common_gender_list" range-key="name">
+                                    <text v-if="select_index.gender_index === ''" class="cr-grey-9">请选择请别</text>
+                                    <text v-else class="cr-base">{{common_gender_list[select_index.gender_index].name}}</text>
+                                    <view class="dis-inline-block margin-left-xs">
+                                        <iconfont name="icon-arrow-right" size="28rpx" color="#ccc"></iconfont>
+                                    </view>
+                                </picker>
+                            </view>
+                        </view>
+                        <view class="form-gorup flex-row jc-sb align-c br-b-f9">
+                            <view class="form-gorup-title">年龄</view>
+                            <view class="flex-row align-c flex-1 flex-width">
+                                <input type="number" name="age" :value="data.age || ''" placeholder-class="cr-grey-9" class="cr-base" placeholder="请输入年龄" />
+                            </view>
+                        </view>
+                        <view class="form-gorup flex-row jc-sb align-c br-b-f9">
+                            <view class="form-gorup-title">体重</view>
+                            <view class="flex-row align-c flex-1 flex-width">
+                                <input type="digit" name="weight" :value="data.weight || ''" placeholder-class="cr-grey-9" class="cr-base" placeholder="请输入体重" />
+                            </view>
+                        </view>
+                        <view class="form-gorup flex-row jc-sb align-c br-b-f9">
+                            <view class="form-gorup-title">健康信息</view>
+                            <view class="flex-row align-c flex-1 flex-width">
+                                <view class="form-gorup-value" @tap="popup_health_event">
+                                    <view class="dis-inline-block single-text va-m health-tips">
+                                        <text v-if="(health_tips || null) != null" class="cr-base">{{health_tips}}</text>
+                                        <text v-else class="cr-grey-9">可填写健康信息</text>
+                                    </view>
+                                    <view class="dis-inline-block margin-left-xs va-m">
+                                        <iconfont name="icon-arrow-right" size="28rpx" color="#ccc"></iconfont>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                        <view class="form-gorup flex-row jc-sb align-c br-b-f9">
+                            <view class="form-gorup-title">关系标签</view>
+                            <view class="flex-row align-c flex-1 flex-width">
+                                <picker class="picker" name="relation_tags" data-field="relation_tags_index" @change="select_change_event" :value="select_index.relation_tags_index" :range="hospital_relation_tags_list" range-key="name">
+                                    <text v-if="select_index.relation_tags_index === ''" class="cr-grey-9">可选择关系标签</text>
+                                    <text v-else class="cr-base">{{hospital_relation_tags_list[select_index.relation_tags_index].name}}</text>
+                                    <view class="dis-inline-block margin-left-xs">
+                                        <iconfont name="icon-arrow-right" size="28rpx" color="#ccc"></iconfont>
+                                    </view>
+                                </picker>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="bottom-fixed">
+                        <view class="bottom-line-exclude">
+                            <button class="item bg-main br-main cr-white round text-size wh-auto" type="default" form-type="submit" hover-class="none" :disabled="form_submit_disabled_status">{{$t('common.save')}}</button>
+                        </view>
+                    </view>
+                </form>
+            </view>
+
+            <!-- 健康信息弹窗 -->
+            <component-popup :propShow="popup_health_status" propPosition="bottom" @onclose="popup_health_close_event">
+                <view class="padding-horizontal-main padding-top-main bg-white">
+                    <view class="close oh">
+                        <view class="fr" @tap.stop="popup_health_close_event">
+                            <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                        </view>
+                    </view>
+                    <view class="page-bottom-fixed">
+                        <view class="form-container">
+                            <view class="form-gorup">
+                                <view class="flex-row jc-sb align-c">
+                                    <view class="form-gorup-title">过敏史</view>
+                                    <switch :color="theme_color" :checked="(health.is_history_of_allergy || 0) == 1" data-field="is_history_of_allergy" @change="health_switch_value_event" style="transform:scale(0.7)" />
+                                </view>
+                                <input v-if="(health.is_history_of_allergy || 0) == 1" type="text" :value="health.is_history_of_allergy_value || ''" data-field="history_of_allergy_value" @input="health_input_value_event" placeholder-class="cr-grey-9" class="cr-base" placeholder="请输入过敏史项" />
+                            </view>
+                            <view class="form-gorup br-t-f9">
+                                <view class="flex-row jc-sb align-c">
+                                    <view class="form-gorup-title">疾病史</view>
+                                    <switch :color="theme_color" :checked="(health.is_history_of_sickness || 0) == 1" data-field="is_history_of_sickness" @change="health_switch_value_event" style="transform:scale(0.7)" />
+                                </view>
+                                <input v-if="(health.is_history_of_sickness || 0) == 1" type="text" :value="health.is_history_of_sickness_value || ''" data-field="history_of_sickness_value" @input="health_input_value_event" placeholder-class="cr-grey-9" class="cr-base" placeholder="请输入疾病史项" />
+                            </view>
+                            <view class="form-gorup flex-row jc-sb align-c br-t-f9">
+                                <view class="form-gorup-title">肝功能异常</view>
+                                <switch :color="theme_color" :checked="(health.liver_type || 0) == 1" data-field="liver_type" @change="health_switch_value_event" style="transform:scale(0.7)" />
+                            </view>
+                            <view class="form-gorup flex-row jc-sb align-c br-t-f9">
+                                <view class="form-gorup-title">肾功能异常</view>
+                                <switch :color="theme_color" :checked="(health.renal_type || 0) == 1" data-field="renal_type" @change="health_switch_value_event" style="transform:scale(0.7)" />
+                            </view>
+                            <view v-if="(data.gender || 0) == 1" class="form-gorup flex-row jc-sb align-c br-t-f9">
+                                <view class="form-gorup-title">妊娠哺乳</view>
+                                <view class="flex-row align-c flex-1 flex-width tr">
+                                    <picker class="picker" data-field="pregnancy" @change="health_input_value_event" :value="health.pregnancy || 0" :range="hospital_pregnancy_list" range-key="name">
+                                        <text class="cr-base">{{hospital_pregnancy_list[health.pregnancy || 0].name}}</text>
+                                        <view class="dis-inline-block margin-left-xs">
+                                            <iconfont name="icon-arrow-right" size="28rpx" color="#ccc"></iconfont>
+                                        </view>
+                                    </picker>
+                                </view>
+                            </view>
+                        </view>
+                        <view class="bottom-fixed">
+                            <view class="bottom-line-exclude">
+                                <button class="item bg-main br-main cr-white round text-size-sm wh-auto" type="default" hover-class="none" @tap="popup_health_confirm_event">{{$t('common.confirm')}}</button>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </component-popup>
+        </block>
+
+        <!-- 提示信息 -->
+        <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import base64 from '@/common/js/lib/base64.js';
+    import componentCommon from '@/components/common/common';
+    import componentPopup from '@/components/popup/popup';
+    import componentNoData from '@/components/no-data/no-data';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: app.globalData.get_theme_color(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                popup_health_status: false,
+                form_submit_disabled_status: false,
+                params: {},
+                data: {},
+                health: {},
+                health_tips: '',
+                patient_tips: null,
+                common_gender_list: [],
+                hospital_pregnancy_list: [],
+                hospital_relation_tags_list: [],
+                select_index: {
+                    gender_index: '',
+                    relation_tags_index: '',
+                }
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentPopup,
+            componentNoData
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.get_data();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        methods: {
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('saveinfo', 'patient', 'hospital'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var temp_data = data.data || null;
+                            // 性别去掉保密
+                            var temp_gender_list = data.common_gender_list || [];
+                            temp_gender_list.splice(0, 1);
+                            this.setData({
+                                data_list_loding_status: 3,
+                                data_list_loding_msg: '',
+                                data: temp_data || {},
+                                patient_tips: data.patient_tips || null,
+                                common_gender_list: temp_gender_list,
+                                hospital_pregnancy_list: data.hospital_pregnancy_list || [],
+                                hospital_relation_tags_list: data.hospital_relation_tags_list || [],
+                            });
+                            // 健康信息
+                            var health = this.data.health || null;
+                            this.setData({
+                                health: health || {},
+                                health_tips: (health == null) ? '' : health.map(function(v){return v.msg;}).join(';')
+                            });
+                            // 下拉选中数据处理
+                            if(temp_data !== null) {
+                                var temp_select_index = this.select_index;
+                                for(var i in this.common_gender_list) {
+                                    if(this.common_gender_list[i]['id'] == temp_data.gender) {
+                                        temp_select_index['gender_index'] = i;
+                                    }
+                                }
+                                for(var i in this.hospital_relation_tags_list) {
+                                    if(this.hospital_relation_tags_list[i]['value'] == temp_data.relation_tags) {
+                                        temp_select_index['relation_tags_index'] = i;
+                                    }
+                                }
+                                this.setData({select_index: temp_select_index});
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    }
+                });
+            },
+
+            // 性别、标签选择事件
+            select_change_event(e) {
+                // 索引存储
+                var temp = this.select_index || {};
+                var field = e.currentTarget.dataset.field;
+                var value = e.detail.value;
+                temp[field] = value;
+                this.setData({ select_index: temp });
+
+                // 性别赋值
+                if(field == 'gender_index') {
+                    var temp_data = this.data;
+                    temp_data['gender'] = this.common_gender_list[value]['id'];
+                    this.setData({ data: temp_data });
+                }
+            },
+
+            // 健康信息切换事件
+            health_switch_value_event(e) {
+                var temp = this.health || {};
+                var field = e.currentTarget.dataset.field;
+                var value = e.detail.value;
+                temp[field] = value ? 1 : 0;
+                this.setData({ health: temp });
+            },
+
+            // 健康信息输入事件
+            health_input_value_event(e) {
+                var temp = this.health || {};
+                var field = e.currentTarget.dataset.field;
+                var value = e.detail.value;
+                temp[field] = value;
+                this.setData({ health: temp });
+            },
+
+            // 健康信息确认事件
+            popup_health_confirm_event() {
+                var health = this.health_handle_data();
+                if(health !== false) {
+                    this.setData({
+                        popup_health_status: false,
+                        health_tips: health.map(function(v){return v.msg;}).join(';')
+                    });
+                }
+            },
+            
+            // 健康处理数据
+            health_handle_data() {
+                var arr = [];
+                // 过敏史
+                var is_history_of_allergy = parseInt(this.health.is_history_of_allergy || 0);
+                if(is_history_of_allergy == 1) {
+                    var value = this.health.is_history_of_allergy_value || '';
+                    if(value === '') {
+                        app.globalData.showToast('请填写过敏史');
+                        return false;
+                    }
+                    var msg = '过敏史:'+value;
+                } else {
+                    var msg = '无过敏史';
+                    var value = '';
+                }
+                 arr.push({
+                    type: 'is_history_of_allergy', 
+                    status: is_history_of_allergy, 
+                    value: value, 
+                    msg: msg
+                });
+                
+                // 疾病史
+                var is_history_of_sickness = parseInt(this.health.is_history_of_sickness || 0);
+                if(is_history_of_sickness == 1) {
+                    var value = this.health.is_history_of_sickness_value || '';
+                    if(value === '') {
+                        app.globalData.showToast('请填写疾病史');
+                        return false;
+                    }
+                    var msg = '疾病史:'+value;
+                } else {
+                    var msg = '无疾病史';
+                    var value = '';
+                }
+                 arr.push({
+                    type: 'is_history_of_sickness', 
+                    status: is_history_of_sickness, 
+                    value: value, 
+                    msg: msg
+                });
+                
+                // 肝功能
+                var liver_type = parseInt(this.health.liver_type || 0);
+                 arr.push({
+                    type: 'liver_type', 
+                    status: liver_type,  
+                    msg: '无肝功能'+((liver_type == 1) ? '异常' : '正常'),
+                });
+                
+                // 肾功能
+                var renal_type = parseInt(this.health.renal_type || 0);
+                 arr.push({
+                    type: 'renal_type', 
+                    status: renal_type,  
+                    msg: '无肾功能'+((renal_type == 1) ? '异常' : '正常'),
+                });
+                
+                // 妊娠哺乳
+                var pregnancy = parseInt(this.health.pregnancy || 0);
+                // 性别为男的时候强制为否
+                if(parseInt(this.data.gender || 0) == 2) {
+                    pregnancy = 0;
+                }
+                var temp_pregnancy = this.hospital_pregnancy_list[pregnancy];
+                 arr.push({
+                    type: 'pregnancy', 
+                    status: temp_pregnancy.value,  
+                    msg: '妊娠哺乳:'+temp_pregnancy.name,
+                });
+                return arr;
+            },
+
+            // 健康信息开启弹层
+            popup_health_event(e) {
+                var health = this.health || {};
+                for(var i in health) {
+                    switch(health[i]['type']) {
+                        // 过敏史、疾病史
+                        case 'is_history_of_allergy' :
+                        case 'is_history_of_sickness' :
+                            health[health[i]['type']+'_value'] = health[i]['value'] || '';
+                            break;
+                    }
+                    health[health[i]['type']] = parseInt(health[i]['status'] || 0);
+                }
+                this.setData({
+                    health: health,
+                    popup_health_status: true
+                });
+            },
+
+            // 健康信息关闭弹层
+            popup_health_close_event(e) {
+                this.setData({
+                    popup_health_status: false
+                });
+            },
+
+            // 数据提交
+            form_submit(e) {
+                // 表单数据
+                var form_data = e.detail.value;
+                // 性别
+                form_data['gender'] = this.select_index.gender_index;
+                if(form_data['gender'] !== '') {
+                    form_data['gender'] = this.common_gender_list[form_data['gender']]['id'];
+                }
+                // 标签
+                form_data['relation_tags'] = this.select_index.relation_tags_index;
+                if(form_data['relation_tags'] !== '') {
+                    form_data['relation_tags'] = this.hospital_relation_tags_list[form_data['relation_tags']]['value'];
+                }
+
+                // 数据校验
+                var validation = [
+                    { fields: 'name', msg: '请输入真实姓名' },
+                    { fields: 'idcard', msg: '请输入身份证号码' },
+                    { fields: 'mobile', msg: '请输入手机号码' },
+                    { fields: 'gender', msg: '请选择请别', is_can_zero: 1 },
+                ];
+                // 验证提交表单
+                if (app.globalData.fields_check(form_data, validation)) {
+                    // 健康信息
+                    form_data['health'] = this.health_handle_data();
+                    if(form_data['health'] === false) {
+                        return false;
+                    }
+                    form_data['health'] = encodeURIComponent(base64.encode(JSON.stringify(form_data['health'])));
+                    // 数据id
+                    form_data['id'] = this.data.id || 0;
+
+                    // 保存数据
+                    this.setData({
+                        form_submit_disabled_status: true,
+                    });
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('save', 'patient', 'hospital'),
+                        method: 'POST',
+                        data: form_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                                setTimeout(function() {
+                                    app.globalData.page_back_prev_event();
+                                }, 1000);
+                            } else {
+                                this.setData({
+                                    form_submit_disabled_status: false,
+                                });
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            this.setData({
+                                form_submit_disabled_status: false,
+                            });
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            }
+        }
+    };
+</script>
+<style>
+    @import './patient.css';
+</style>
\ No newline at end of file
diff --git a/pages/plugins/hospital/prescription/prescription.css b/pages/plugins/hospital/prescription/prescription.css
new file mode 100644
index 0000000..58f5879
--- /dev/null
+++ b/pages/plugins/hospital/prescription/prescription.css
@@ -0,0 +1,7 @@
+.buy-goods-list .goods-images {
+    width: 60rpx;
+    height: 60rpx;
+}
+.buy-goods-list .goods-title {
+    width: calc(100% - 300rpx);
+}
\ No newline at end of file
diff --git a/pages/plugins/hospital/prescription/prescription.vue b/pages/plugins/hospital/prescription/prescription.vue
new file mode 100644
index 0000000..a18f148
--- /dev/null
+++ b/pages/plugins/hospital/prescription/prescription.vue
@@ -0,0 +1,319 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="data_list_loding_status == 3">
+            <view class="page-bottom-fixed padding-main">
+                <form @submit="form_submit" class="form-container">
+                    <!-- 购买商品 -->
+                    <view v-if="(goods_data || null) != null && goods_data.length > 0" class="bg-white padding-main border-radius-main">
+                        <block v-for="(item, index) in goods_data" :key="index">
+                            <view class="buy-goods-list oh">
+                                <image :src="item.images" mode="aspectFit" class="goods-images radius dis-inline-block va-m"></image>
+                                <view class="single-text dis-inline-block va-m margin-left-xs goods-title">{{item.title}}</view>
+                                <view class="fr">
+                                    <text class="cr-price">{{item.show_price_symbol}}{{item.price}}</text>
+                                    <text class="cr-grey margin-left-xs">x{{item.stock}}</text>
+                                </view>
+                            </view>
+                        </block>
+                    </view>
+                    <!-- 用药人 -->
+                    <view class="bg-white border-radius-main oh spacing-mt">
+                        <view class="padding-main">
+                            <view>
+                                <text class="fw-b va-m">用药人</text>
+                                <view v-if="(patient_tips || null) != null" class="dis-inline-block va-m margin-left-sm" @tap="popup_patient_tips_event">
+                                    <iconfont name="icon-sigh-o" size="28rpx" color="#999"></iconfont>
+                                </view>
+                            </view>
+                            <view v-if="(patient_data || null) != null" class="oh pr margin-top">
+                                <view>
+                                    <text>{{patient_data.name}}</text>
+                                    <block v-if="(patient_data.gender_name || null) != null">
+                                        <text class="cr-grey-white padding-horizontal-sm">|</text>
+                                        <text>{{patient_data.gender_name}}</text>
+                                    </block>
+                                    <block v-if="(patient_data.age_name || null) != null">
+                                        <text class="cr-grey-white padding-horizontal-sm">|</text>
+                                        <text>{{patient_data.age_name}}</text>
+                                    </block>
+                                </view>
+                                <view>{{patient_data.idcard}}</view>
+                                <view class="pa top-0 right-0">
+                                    <button type="default" size="mini" class="cr-main br-main bg-white round text-size-sm" hover-class="none" data-value="/pages/plugins/hospital/patient-list/patient-list?is_choice=1" @tap="url_event">
+                                        <iconfont name="icon-transfer" size="28rpx" :color="theme_color"></iconfont>
+                                        <text class="margin-left-xs">切换用药人</text>
+                                    </button>
+                                </view>
+                            </view>
+                            <view v-else class="tc padding-vertical-xxl">
+                                <button type="default" size="mini" class="cr-main br-main bg-white round text-size-sm" hover-class="none" data-value="/pages/plugins/hospital/patient-list/patient-list?is_choice=1" @tap="url_event">
+                                    <iconfont name="icon-user-group" size="28rpx" :color="theme_color"></iconfont>
+                                    <text class="margin-left-xs">选择用药人</text>
+                                </button>
+                            </view>
+                        </view>
+                        <view class="form-gorup br-t-f5">
+                            <view class="form-gorup-title">主诉<text class="form-group-tips">例如: 感冒, 胃炎, 头疼, 肚子疼</text></view>
+                            <input type="text" name="ill_desc" maxlength="230" placeholder-class="cr-grey-9" class="cr-base" placeholder="主诉格式1～230个字符" />
+                        </view>
+                    </view>
+                    <view class="bottom-fixed">
+                        <view class="bottom-line-exclude">
+                            <button class="item bg-main br-main cr-white round text-size wh-auto" type="default" form-type="submit" hover-class="none" :disabled="form_submit_disabled_status">免费问诊开方</button>
+                        </view>
+                    </view>
+                </form>
+            </view>
+
+            <!-- 提示弹窗 -->
+            <component-popup :propShow="popup_patient_tips_status" propPosition="bottom" @onclose="popup_patient_tips_close_event">
+                <view class="padding-horizontal-main padding-top-main bg-white">
+                    <view class="close oh">
+                        <view class="fr" @tap.stop="popup_patient_tips_close_event">
+                            <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                        </view>
+                    </view>
+                    <view class="padding-vertical-main">
+                        <block v-if="patient_tips != null">{{patient_tips}}</block>
+                        <block v-else>
+                            <component-no-data propStatus="0"></component-no-data>
+                        </block>
+                    </view>
+                </view>
+            </component-popup>
+        </block>
+
+        <!-- 提示信息 -->
+        <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import base64 from '@/common/js/lib/base64.js';
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentPopup from '@/components/popup/popup';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: app.globalData.get_theme_color(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                form_submit_disabled_status: false,
+                params: null,
+                goods_data: [],
+                patient_data: null,
+                patient_list: [],
+                popup_patient_tips_status: false,
+                patient_tips: null
+                
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentPopup
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            // params.data 参数 urlencode(base64_encode(json字符串))
+            // buy_type 下单类型（goods 立即购买、cart 购物车）
+            // goods_data 下单商品urlencode(base64_encode(json字符串[{goods_id,stock,spec}]))
+            // params['data'] = '{"buy_type":"goods","goods_data":"W3siZ29vZHNfaWQiOiI5Iiwic3RvY2siOjEsInNwZWMiOlt7InR5cGUiOiLpopzoibIiLCJ2YWx1ZSI6IueyieiJsiJ9LHsidHlwZSI6IuWwuueggSIsInZhbHVlIjoiTCJ9XX1"}';
+            // ids 购物车主键ids
+            if ((params.data || null) != null) {
+                params = JSON.parse(base64.decode(decodeURIComponent(params.data)));
+                this.setData({
+                    params: params,
+                });
+            }
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 初始化配置
+            this.init_config();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        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');
+                }
+            },
+
+            // 获取数据
+            init() {
+                uni.request({
+                    url: app.globalData.get_request_url('saveinit', 'prescription', 'hospital'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            this.get_data();
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'init')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    }
+                });
+            },
+
+            // 获取数据
+            get_data() {
+                var patient_id = uni.getStorageSync(app.globalData.data.cache_hospital_patient_choice_value_key) || 0;
+                uni.request({
+                    url: app.globalData.get_request_url('saveinfo', 'prescription', 'hospital'),
+                    method: 'POST',
+                    data: {...this.params, ...{id: patient_id}},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_list_loding_status: 3,
+                                data_list_loding_msg: '',
+                                goods_data: data.goods_data || [],
+                                patient_data: data.patient_data || null,
+                                patient_tips: data.patient_tips || null
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    }
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 就诊人提示开启弹层
+            popup_patient_tips_event(e) {
+                this.setData({
+                    popup_patient_tips_status: true
+                });
+            },
+            
+            // 就诊人提示关闭弹层
+            popup_patient_tips_close_event(e) {
+                this.setData({
+                    popup_patient_tips_status: false
+                });
+            },
+
+            // 数据提交
+            form_submit(e) {
+                // 表单数据
+                var form_data = e.detail.value;
+                // 就诊人
+                form_data['id'] = ((this.patient_data || null) == null) ? 0 : (this.patient_data.id || 0);
+                // 数据校验
+                var validation = [
+                    { fields: 'id', msg: '请选择就诊人' },
+                ];
+                // 验证提交表单
+                if (app.globalData.fields_check(form_data, validation)) {
+                    // 数据保存
+                    this.setData({
+                        form_submit_disabled_status: true,
+                    });
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('created', 'prescription', 'hospital'),
+                        method: 'POST',
+                        data: form_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.open_web_view(res.data.data, true);
+                            } else {
+                                this.setData({
+                                    form_submit_disabled_status: false,
+                                });
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            this.setData({
+                                form_submit_disabled_status: false,
+                            });
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            }
+        }
+    };
+</script>
+<style>
+    @import './prescription.css';
+</style>
\ No newline at end of file
diff --git a/pages/plugins/intellectstools/goods-comments/goods-comments.css b/pages/plugins/intellectstools/goods-comments/goods-comments.css
new file mode 100644
index 0000000..3225a39
--- /dev/null
+++ b/pages/plugins/intellectstools/goods-comments/goods-comments.css
@@ -0,0 +1,15 @@
+.avatar {
+    width: 80rpx;
+    height: 80rpx;
+}
+.input-height {
+    min-height: 200rpx;
+}
+.sub-btn {
+    padding: 40rpx 66rpx;
+}
+.sub-btn button {
+    height: 88rpx;
+    line-height: 88rpx;
+    padding: 0;
+}
\ No newline at end of file
diff --git a/pages/plugins/intellectstools/goods-comments/goods-comments.vue b/pages/plugins/intellectstools/goods-comments/goods-comments.vue
new file mode 100644
index 0000000..6be1c13
--- /dev/null
+++ b/pages/plugins/intellectstools/goods-comments/goods-comments.vue
@@ -0,0 +1,231 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="goods_id" class="padding-main">
+            <form v-if="data_list_loding_status == 3" @submit="formSubmit" class="form-container">
+                <view class="bg-white border-radius-main padding-main flex-row align-c spacing-mb">
+                    <image v-if="data.images" class="avatar dis-block margin-right-xs br-f5 padding-xs radius" :src="data.images" mode="aspectFit"></image>
+                    <view class="flex-1 flex-width flex-row align-c">
+                        <view class="margin-right-sm">{{ $t('goods-comments.goods-comments.31ees6') }}</view>
+                        <uni-rate :value="rate_value" @change="rate_change_event" />
+                    </view>
+                </view>
+                <view class="bg-white border-radius-main padding-main">
+                    <textarea name="content" @input="text_input_event" maxlength="230" auto-height :placeholder="$t('goods-comments.goods-comments.6p942c')" placeholder-class="cr-grey-9" class="wh-auto input-height" />
+                    <view class="tr text-size-xs cr-grey-c">{{ text_num }}/230</view>
+                    <view class="spacing-mt">
+                        <view class="margin-bottom-main">{{ $t('form.form.s14osm') }}{{ image_list.length }}/3)</view>
+                        <component-upload :propData="image_list" :propPathType="editor_path_type" @call-back="retrun_image_event"></component-upload>
+                    </view>
+                    <view class="tr">
+                        <checkbox-group @change="is_anonymous_change_event">
+                            <label class="cr-grey-9 text-size-xs">
+                                <checkbox value="1" :checked="false" :color="theme_color" style="transform: scale(0.5)" />
+                                <text class="pr top-xs">{{ $t('form.form.2f52v3') }}</text>
+                            </label>
+                        </checkbox-group>
+                    </view>
+                </view>
+                <view class="sub-btn">
+                    <button class="bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">{{ $t('form.form.4yd066') }}</button>
+                </view>
+            </form>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data propStatus="0"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentUpload from '@/components/upload/upload';
+    const theme_color = app.globalData.get_theme_color();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: theme_color,
+                data: {},
+                rate_value: 0,
+                image_list: [],
+                editor_path_type: '',
+                goods_id: '',
+                is_anonymous: '0',
+                text_num: 0,
+                theme_color: theme_color,
+                data_list_loding_status: 1,
+                data_list_loding_msg: this.$t('form.form.bniyyt'),
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentUpload,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            if (params !== null && params.goods_id) {
+                this.setData({
+                    goods_id: params.goods_id,
+                });
+            }
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        // 页面销毁时执行
+        onUnload: function () {},
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    uni.request({
+                        url: app.globalData.get_request_url('index', 'goodscomments', 'intellectstools'),
+                        method: 'POST',
+                        success: (res) => {
+                            uni.stopPullDownRefresh();
+                            if (res.data.code == 0) {
+                                this.setData({
+                                    data: res.data.data.goods || {},
+                                    editor_path_type: res.data.data.editor_path_type || '',
+                                    data_list_loding_status: 3,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                });
+                            }
+                        },
+                        fail: () => {
+                            uni.stopPullDownRefresh();
+                            this.setData({
+                                data_list_loding_status: 2,
+                            });
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                } else {
+                    // 提示错误
+                    this.setData({
+                        data_list_loding_status: 2,
+                        data_list_loding_msg: this.$t('form.form.8l3ul5'),
+                    });
+                }
+            },
+
+            // 表单提交
+            formSubmit(e) {
+                // 数据验证
+                var validation = [
+                    { fields: 'rating', msg: this.$t('goods-comments.goods-comments.pe5p52') },
+                    { fields: 'content', msg: this.$t('goods-comments.goods-comments.1wut9j') },
+                ];
+                var validate = {
+                    rating: this.rate_value,
+                    content: e.detail.value.content,
+                };
+                if (app.globalData.fields_check(validate, validation)) {
+                    uni.showLoading({
+                        title: this.$t('buy.buy.r79t77'),
+                    });
+                    this.setData({
+                        form_submit_loading: true,
+                    });
+                    var newData = {
+                        goods_id: this.goods_id,
+                        image_list: this.image_list,
+                        is_anonymous: this.is_anonymous,
+                        ...validate,
+                    };
+                    // 网络请求
+                    uni.request({
+                        url: app.globalData.get_request_url('save', 'goodscomments', 'intellectstools'),
+                        method: 'POST',
+                        data: newData,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                                setTimeout(function () {
+                                    app.globalData.page_back_prev_event();
+                                }, 2000);
+                            } else {
+                                this.setData({
+                                    form_submit_loading: false,
+                                });
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_loading: false,
+                            });
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+            text_input_event(e) {
+                this.setData({
+                    text_num: e.detail.cursor,
+                });
+            },
+            rate_change_event(e) {
+                this.setData({
+                    rate_value: e.value,
+                });
+            },
+            is_anonymous_change_event(e) {
+                this.setData({
+                    is_anonymous: e.detail.value.length > 0 ? e.detail.value[0] : 0,
+                });
+            },
+            // 上传回调
+            retrun_image_event(data) {
+                this.setData({
+                    image_list: data,
+                });
+            },
+        },
+    };
+</script>
+<style>
+    @import './goods-comments.css';
+</style>
diff --git a/pages/plugins/invoice/invoice-detail/invoice-detail.vue b/pages/plugins/invoice/invoice-detail/invoice-detail.vue
new file mode 100644
index 0000000..af5e77f
--- /dev/null
+++ b/pages/plugins/invoice/invoice-detail/invoice-detail.vue
@@ -0,0 +1,142 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="detail != null">
+            <!-- 申请信息 -->
+            <component-panel-content :propData="detail" :propDataField="field_list" propExcludeField="express_name,express_number" :propTitle="$t('invoice-detail.invoice-detail.s70kj4')"></component-panel-content>
+
+            <!-- 快递信息 -->
+            <block v-if="detail.status == 2 && detail.invoice_type != 0">
+                <component-panel-content :propData="detail" :propDataField="field_list" propAppointField="express_name,express_number" :propTitle="$t('user-order-detail.user-order-detail.0876xf')"></component-panel-content>
+            </block>
+
+            <!-- 电子发票 -->
+            <block v-if="detail.status == 2 && detail.invoice_type == 0 && (detail.electronic_invoice || null) != null" class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                <component-panel-content :propTitle="$t('invoice-detail.invoice-detail.1s2f0g')">
+                    <view v-for="(item, index) in detail.electronic_invoice" :key="index" class="item br-b-f5 oh padding-vertical-main">
+                        <view class="content fl" @tap="electronic_invoice_event" :data-value="item.url">{{ item.title }}</view>
+                    </view>
+                    <view class="cr-red padding-top-main">{{$t('invoice-detail.invoice-detail.4tu3v3')}}</view>
+                </component-panel-content>
+            </block>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+    import componentPanelContent from "@/components/panel-content/panel-content";
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                field_list: [],
+                detail: null
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentPanelContent
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("detail", "user", "invoice"),
+                    method: "POST",
+                    data: {
+                        id: this.params.id,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                detail: data.data,
+                                field_list: data.field_list || [],
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: "",
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "init")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 电子发票复制
+            electronic_invoice_event(e) {
+                app.globalData.text_copy_event(e);
+            },
+        },
+    };
+</script>
+<style></style>
diff --git a/pages/plugins/invoice/invoice-saveinfo/invoice-saveinfo.vue b/pages/plugins/invoice/invoice-saveinfo/invoice-saveinfo.vue
new file mode 100644
index 0000000..2098034
--- /dev/null
+++ b/pages/plugins/invoice/invoice-saveinfo/invoice-saveinfo.vue
@@ -0,0 +1,438 @@
+<template>
+    <view :class="theme_view">
+        <view class="page-bottom-fixed">
+            <view v-if="save_base_data != null && save_base_data.total_price > 0">
+                <form @submit="form_submit" class="form-container">
+                    <view class="padding-main oh">
+                        <view class="padding-main border-radius-main bg-white spacing-mb">
+                            <view>
+                                <text class="cr-base margin-right-sm">{{$t('invoice.invoice.fvuc4p')}}</text>
+                                <text class="cr-main text-size fw-b">{{ save_base_data.total_price }}</text>
+                            </view>
+                            <view class="cr-base margin-top-sm">{{ save_base_data.business_desc }}</view>
+                        </view>
+
+                        <view class="border-radius-main bg-white oh spacing-mb">
+                            <view class="form-gorup">
+                                <view class="form-gorup-title">{{$t('invoice.invoice.j04kjc')}}<text class="form-group-tips-must">*</text></view>
+                                <picker name="invoice_type" @change="form_invoice_type_event" :value="form_invoice_type_index" :range="can_invoice_type_list" range-key="name">
+                                    <view :class="'picker ' + (can_invoice_type_list[form_invoice_type_index] == undefined ? 'cr-grey' : 'cr-base') + ' arrow-right'">
+                                        {{ can_invoice_type_list[form_invoice_type_index] == undefined ? $t('invoice-saveinfo.invoice-saveinfo.t3i3e3') : can_invoice_type_list[form_invoice_type_index]['name'] }}
+                                    </view>
+                                </picker>
+                            </view>
+
+                            <view class="form-gorup">
+                                <view class="form-gorup-title">{{$t('invoice.invoice.hoenw8')}}<text class="form-group-tips-must">*</text></view>
+                                <picker name="apply_type" @change="form_apply_type_event" :disabled="form_apply_type_disabled" :value="form_apply_type_index" :range="apply_type_list" range-key="name">
+                                    <view :class="'picker ' + (apply_type_list[form_apply_type_index] == undefined ? 'cr-grey' : 'cr-base') + ' arrow-right'">
+                                        {{ apply_type_list[form_apply_type_index] == undefined ? $t('invoice-saveinfo.invoice-saveinfo.k31t2s') : apply_type_list[form_apply_type_index]['name'] }}
+                                    </view>
+                                </picker>
+                            </view>
+
+                            <view v-if="invoice_content_list.length > 0" class="form-gorup">
+                                <view class="form-gorup-title">{{$t('invoice-detail.invoice-detail.p73963')}}<text class="form-group-tips-must">*</text></view>
+                                <picker name="invoice_content" @change="form_invoice_content_event" :value="form_invoice_content_index" :range="invoice_content_list">
+                                    <view :class="'picker ' + (invoice_content_list[form_invoice_content_index] == undefined ? 'cr-grey' : 'cr-base') + ' arrow-right'">
+                                        {{ invoice_content_list[form_invoice_content_index] == undefined ? $t('invoice-saveinfo.invoice-saveinfo.i73t3c') : invoice_content_list[form_invoice_content_index] }}
+                                    </view>
+                                </picker>
+                            </view>
+
+                            <view class="form-gorup">
+                                <view class="form-gorup-title">{{$t('invoice.invoice.y724c7')}}<text class="form-group-tips-must">*</text></view>
+                                <input type="text" name="invoice_title" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('invoice-saveinfo.invoice-saveinfo.x461e0')" maxlength="200" :value="data.invoice_title || ''" />
+                            </view>
+
+                            <!-- 企业信息 -->
+                            <view v-if="company_container">
+                                <view class="form-gorup">
+                                    <view class="form-gorup-title">{{$t('invoice-saveinfo.invoice-saveinfo.x8hhiv')}}<text class="form-group-tips-must">*</text> </view>
+                                    <input type="text" name="invoice_code" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('invoice-saveinfo.invoice-saveinfo.924cag')" maxlength="160" :value="data.invoice_code || ''" />
+                                </view>
+                            </view>
+
+                            <!-- 企业专票信息 -->
+                            <view v-if="company_special_container">
+                                <view class="form-gorup">
+                                    <view class="form-gorup-title">{{$t('invoice-detail.invoice-detail.41qbu6')}}<text class="form-group-tips-must">*</text></view>
+                                    <input type="text" name="invoice_bank" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('invoice-saveinfo.invoice-saveinfo.ymvw6b')" maxlength="200" :value="data.invoice_bank || ''" />
+                                </view>
+                                <view class="form-gorup">
+                                    <view class="form-gorup-title">{{$t('invoice-detail.invoice-detail.3a9459')}}<text class="form-group-tips-must">*</text></view>
+                                    <input type="text" name="invoice_account" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('invoice-saveinfo.invoice-saveinfo.664qc7')" maxlength="160" :value="data.invoice_account || ''" />
+                                </view>
+                                <view class="form-gorup">
+                                    <view class="form-gorup-title">{{$t('invoice-detail.invoice-detail.2g7t23')}}<text class="form-group-tips-must">*</text></view>
+                                    <input type="text" name="invoice_tel" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('invoice-saveinfo.invoice-saveinfo.bbseo1')" maxlength="15" :value="data.invoice_tel || ''" />
+                                </view>
+                                <view class="form-gorup">
+                                    <view class="form-gorup-title">{{$t('invoice-detail.invoice-detail.6k6sov')}}<text class="form-group-tips-must">*</text></view>
+                                    <input type="text" name="invoice_address" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('invoice-saveinfo.invoice-saveinfo.85735j')" maxlength="230" :value="data.invoice_address || ''" />
+                                </view>
+                            </view>
+
+                            <!-- 收件人信息 -->
+                            <view v-if="addressee_container">
+                                <view class="form-gorup">
+                                    <view class="form-gorup-title">{{$t('invoice-detail.invoice-detail.7159m0')}}<text class="form-group-tips-must">*</text></view>
+                                    <input type="text" name="name" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('invoice-saveinfo.invoice-saveinfo.gsc7dy')" maxlength="30" :value="data.name || ''" />
+                                </view>
+                                <view class="form-gorup">
+                                    <view class="form-gorup-title">{{$t('invoice-detail.invoice-detail.f2222p')}}<text class="form-group-tips-must">*</text></view>
+                                    <input type="text" name="tel" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('invoice-saveinfo.invoice-saveinfo.bp8822')" maxlength="15" :value="data.tel || ''" />
+                                </view>
+                                <view class="form-gorup">
+                                    <view class="form-gorup-title">{{$t('invoice-detail.invoice-detail.q8l3zj')}}<text class="form-group-tips-must">*</text></view>
+                                    <input type="text" name="address" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('invoice-saveinfo.invoice-saveinfo.u7h724')" maxlength="230" :value="data.address || ''" />
+                                </view>
+                            </view>
+
+                            <!-- 电子邮箱信息 -->
+                            <view v-if="email_container">
+                                <view class="form-gorup">
+                                    <view class="form-gorup-title">{{$t('login.login.db1rf4')}}</view>
+                                    <input type="text" name="email" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('invoice-saveinfo.invoice-saveinfo.d3qbe1')" maxlength="60" :value="data.email || ''" />
+                                </view>
+                            </view>
+
+                            <view class="form-gorup">
+                                <view class="form-gorup-title">{{$t('common.note')}}</view>
+                                <input type="text" name="user_note" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('invoice-saveinfo.invoice-saveinfo.vaw647')" maxlength="60" :value="data.user_note || ''" />
+                            </view>
+                        </view>
+                        <view class="bottom-fixed" :style="bottom_fixed_style">
+                            <view class="bottom-line-exclude">
+                                <button class="item bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">{{$t('form.form.4yd066')}}</button>
+                            </view>
+                        </view>
+                    </view>
+                </form>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                params: {},
+                form_submit_loading: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                bottom_fixed_style: '',
+                data_base: null,
+                apply_type_list: [],
+                can_invoice_type_list: [],
+                invoice_content_list: [],
+                save_base_data: null,
+                data: {},
+                form_invoice_type_index: 0,
+                form_apply_type_index: 0,
+                form_invoice_content_index: 0,
+                form_apply_type_disabled: false,
+                company_container: false,
+                company_special_container: false,
+                addressee_container: false,
+                email_container: true,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params || {},
+            });
+
+            // 标题设置
+            uni.setNavigationBarTitle({
+                title: this.$t('invoice-saveinfo.invoice-saveinfo.89815t') + ((this.params.id || null) == null ? this.$t('invoice-saveinfo.invoice-saveinfo.004t56') : this.$t('common.edit')),
+            });
+
+            // 加载数据
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('saveinfo', 'user', 'invoice'),
+                    method: 'POST',
+                    data: {...this.params, ...{lang_can_key: 'apply_type_list,can_invoice_type_list'}},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var default_data = ((data.data || null) == null || data.data.length == 0) ? null : data.data;
+                            var upd_data = {
+                                data_base: data.base || null,
+                                apply_type_list: data.apply_type_list || [],
+                                can_invoice_type_list: data.can_invoice_type_list || [],
+                                invoice_content_list: data.invoice_content_list || [],
+                                save_base_data: data.save_base_data,
+                                data: default_data || {},
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: data.save_base_data.total_price <= 0 ? this.$t('invoice-saveinfo.invoice-saveinfo.dl11n1') : '',
+                            };
+                            // 类型数据处理
+                            if (default_data != null) {
+                                var invoice_content_index = upd_data.invoice_content_list.indexOf(default_data.invoice_content);
+                                upd_data['form_invoice_type_index'] = default_data.invoice_type;
+                                upd_data['form_apply_type_index'] = default_data.apply_type;
+                                upd_data['form_invoice_content_index'] = invoice_content_index == -1 ? 0 : invoice_content_index;
+                                upd_data['form_apply_type_disabled'] = default_data.apply_type == 1;
+                            }
+                            this.setData(upd_data);
+
+                            // 数据容器处理
+                            this.invoice_container_handle();
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'init')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 发票类型事件
+            form_invoice_type_event(e) {
+                this.setData({
+                    form_invoice_type_index: e.detail.value,
+                });
+                this.invoice_container_handle();
+            },
+
+            // 发票类型事件
+            form_apply_type_event(e) {
+                this.setData({
+                    form_apply_type_index: e.detail.value,
+                });
+                this.invoice_container_handle();
+            },
+
+            // 发票内容事件
+            form_invoice_content_event(e) {
+                this.setData({
+                    form_invoice_content_index: e.detail.value,
+                });
+            },
+
+            // 容器显隐处理
+            invoice_container_handle() {
+                // 发票类型
+                var invoice_type = this.can_invoice_type_list[this.form_invoice_type_index]['id'];
+                if (invoice_type == 2 || invoice_type == 3) {
+                    // 选择专票的时候申请类型必须是企业
+                    this.setData({
+                        form_apply_type_index: 1,
+                        form_apply_type_disabled: true,
+                    });
+                } else {
+                    this.setData({
+                        form_apply_type_disabled: false,
+                    });
+                }
+
+                // 申请类型
+                switch (invoice_type) {
+                    // 增值税普通电子发票
+                    case 0:
+                        this.setData({
+                            company_special_container: false,
+                            addressee_container: false,
+                            email_container: true,
+                        });
+                        break;
+                    // 增值税普通纸质发票
+                    case 1:
+                        this.setData({
+                            company_special_container: false,
+                            addressee_container: true,
+                            email_container: false,
+                        });
+                        break;
+                    // 增值税专用纸质发票
+                    case 2:
+                        this.setData({
+                            company_container: true,
+                            company_special_container: true,
+                            addressee_container: true,
+                            email_container: false,
+                        });
+                        break;
+                        
+                    // 增值税专用纸质发票
+                    case 3:
+                        this.setData({
+                            company_container: true,
+                            company_special_container: true,
+                            addressee_container: false,
+                            email_container: true,
+                        });
+                        break;
+                }
+
+                // 增值税专用纸质发票情况下个人类型处理
+                if (invoice_type == 0 || invoice_type == 1) {
+                    var apply_type = this.apply_type_list[this.form_apply_type_index]['id'];
+                    this.setData({
+                        company_container: apply_type != 0,
+                    });
+                }
+            },
+
+            // 表单提交
+            form_submit(e) {
+                var data = e.detail.value;
+                if ((this.data || null) == null || (this.data.id || null) == null) {
+                    data['ids'] = this.params.ids || '';
+                    data['type'] = this.params.type || '';
+                } else {
+                    data['id'] = this.data.id;
+                }
+
+                // 数据验证
+                var validation = [
+                    { fields: 'invoice_type', msg: this.$t('invoice-saveinfo.invoice-saveinfo.t3i3e3'), is_can_zero: 1 },
+                    { fields: 'apply_type', msg: this.$t('invoice-saveinfo.invoice-saveinfo.k31t2s'), is_can_zero: 1 },
+                    { fields: 'invoice_title', msg: this.$t('invoice-saveinfo.invoice-saveinfo.r13p43') },
+                ];
+                if (app.globalData.fields_check(data, validation)) {
+                    var invoice_type = this.can_invoice_type_list[this.form_invoice_type_index]['id'];
+                    var apply_type = this.apply_type_list[this.form_apply_type_index]['id'];
+                    if (apply_type == 1) {
+                        validation.push({ fields: 'invoice_code', msg: this.$t('invoice-saveinfo.invoice-saveinfo.ws4wbb') });
+                    }
+                    if (invoice_type == 2) {
+                        validation.push({ fields: 'invoice_bank', msg: this.$t('invoice-saveinfo.invoice-saveinfo.87itn8') });
+                        validation.push({ fields: 'invoice_account', msg: this.$t('invoice-saveinfo.invoice-saveinfo.01lw93') });
+                        validation.push({ fields: 'invoice_tel', msg: this.$t('invoice-saveinfo.invoice-saveinfo.414ihr') });
+                        validation.push({ fields: 'invoice_address', msg: this.$t('invoice-saveinfo.invoice-saveinfo.g3yh32') });
+                    }
+
+                    if (invoice_type == 1 || invoice_type == 2) {
+                        validation.push({ fields: 'name', msg: this.$t('invoice-saveinfo.invoice-saveinfo.4xy6xi') });
+                        validation.push({ fields: 'tel', msg: this.$t('invoice-saveinfo.invoice-saveinfo.quhnk0') });
+                        validation.push({ fields: 'address', msg: this.$t('invoice-saveinfo.invoice-saveinfo.kq77u3') });
+                    }
+
+                    if (app.globalData.fields_check(data, validation)) {
+                        // 发票类型
+                        data['invoice_type'] = this.can_invoice_type_list[this.form_invoice_type_index]['id'];
+
+                        // 发票内容
+                        if (this.invoice_content_list.length > 0 && this.invoice_content_list[this.form_invoice_content_index] != undefined) {
+                            data['invoice_content'] = this.invoice_content_list[this.form_invoice_content_index];
+                        }
+                        uni.showLoading({
+                            title: this.$t('buy.buy.r79t77'),
+                        });
+                        this.setData({
+                            form_submit_loading: true,
+                        });
+
+                        // 网络请求
+                        uni.request({
+                            url: app.globalData.get_request_url('save', 'user', 'invoice'),
+                            method: 'POST',
+                            data: data,
+                            dataType: 'json',
+                            success: (res) => {
+                                uni.hideLoading();
+                                if (res.data.code == 0) {
+                                    app.globalData.showToast(res.data.msg, 'success');
+                                    var is_to = (this.params || null) != null && (this.params.is_redirect || 0) == 1;
+                                    setTimeout(function () {
+                                        // 是否关闭页面进入我的发票、适合从订单开票中过来提交成功直接进入我的发票列表
+                                        if (is_to) {
+                                            app.globalData.url_open('/pages/plugins/invoice/invoice/invoice', true);
+                                        } else {
+                                            uni.navigateBack();
+                                        }
+                                    }, 2000);
+                                } else {
+                                    this.setData({
+                                        form_submit_loading: false,
+                                    });
+                                    if (app.globalData.is_login_check(res.data)) {
+                                        app.globalData.showToast(res.data.msg);
+                                    } else {
+                                        app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                    }
+                                }
+                            },
+                            fail: () => {
+                                uni.hideLoading();
+                                this.setData({
+                                    form_submit_loading: false,
+                                });
+                                app.globalData.showToast(this.$t('common.internet_error_tips'));
+                            },
+                        });
+                    }
+                }
+            },
+        },
+    };
+</script>
+<style></style>
diff --git a/pages/plugins/invoice/invoice/invoice.css b/pages/plugins/invoice/invoice/invoice.css
new file mode 100644
index 0000000..ed4fbb7
--- /dev/null
+++ b/pages/plugins/invoice/invoice/invoice.css
@@ -0,0 +1,15 @@
+/*
+* 导航
+*/
+.scroll-box-ece-nav.top-notice {
+    height: calc(100vh - 154rpx);
+}
+
+/*
+* 发票内容
+*/
+.item-operation .btn {
+    padding: 0 48rpx;
+    height: 60rpx;
+    line-height: 60rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/invoice/invoice/invoice.vue b/pages/plugins/invoice/invoice/invoice.vue
new file mode 100644
index 0000000..fb4dcd0
--- /dev/null
+++ b/pages/plugins/invoice/invoice/invoice.vue
@@ -0,0 +1,358 @@
+<template>
+    <view :class="theme_view">
+        <!-- 公告 -->
+        <view v-if="(data_base || null) != null && (data_base.invoice_desc || null) != null && data_base.invoice_desc.length > 0" class="padding-horizontal-main padding-vertical-sm bg-white">
+            <uni-notice-bar class="padding-0 margin-0" show-icon scrollable :text="data_base.invoice_desc.join('')" background-color="transparent" color="#666" />
+        </view>
+        <!-- 导航 -->
+        <view v-if="nav_status_list.length > 0" class="nav-base bg-white flex-row jc-sa align-c">
+            <block v-for="(item, index) in nav_status_list" :key="index">
+                <view :class="'item tc ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+            </block>
+        </view>
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" :class="'scroll-box-ece-nav '+((data_base || null) != null && (data_base.invoice_desc || null) != null && data_base.invoice_desc.length > 0 ? 'top-notice' : '')" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view class="page-bottom-fixed">
+                <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                    <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                        <view class="base oh br-b-dashed padding-bottom-main flex-row jc-sb align-c">
+                            <text class="cr-grey-9">{{ item.add_time }}</text>
+                            <text class="cr-black" :class="item.status == 0 || item.status == 1 ? 'cr-black' : item.status == 2 ? 'cr-grey-c' : 'cr-red'">{{ item.status_name }}</text>
+                        </view>
+                        <view :data-value="'/pages/plugins/invoice/invoice-detail/invoice-detail?id=' + item.id" @tap="url_event" class="content margin-top-main cp">
+                            <component-panel-content :propData="item" :propDataField="field_list" propIsItemShowMax="6" propExcludeField="add_time,status_name" :propIsTerse="true"></component-panel-content>
+                        </view>
+                        <!-- 0待审核、1待开票、2已开票、3已拒绝, 4已关闭） -->
+                        <view v-if="item.status == 0 || item.status == 3 || item.status == 4" class="item-operation tr margin-top-main">
+                            <button class="btn round br-grey-9 bg-white text-size-md" type="default" size="mini" @tap="delete_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('common.del')}}</button>
+                            <button v-if="item.status == 0 || item.status == 3" class="btn round cr-main br-main bg-white text-size-md" type="default" size="mini" :data-value="'/pages/plugins/invoice/invoice-saveinfo/invoice-saveinfo?id='+item.id" @tap="url_event" hover-class="none">{{$t('common.edit')}}</button>
+                        </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 v-if="(data_base.is_invoice_order || 0) == 1 || (data_base.is_invoice_recharge || 0) == 1" class="bottom-fixed" :style="bottom_fixed_style">
+                    <view class="bottom-line-exclude flex-row gap-10">
+                        <button v-if="(data_base.is_invoice_order || 0) == 1" class="item round cr-main bg-white br-main text-size wh-auto" type="default" hover-class="none" data-value="/pages/plugins/invoice/order/order" @tap="url_event">{{$t('invoice.invoice.p3dmd2')}}</button>
+                        <button v-if="(data_base.is_invoice_recharge || 0) == 1" class="item round cr-main bg-white br-main text-size wh-auto" type="default" hover-class="none" data-value="/pages/plugins/invoice/recharge/recharge" @tap="url_event">{{$t('invoice.invoice.bh8yt3')}}</button>
+                    </view>
+                </view>
+            </view>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentPanelContent from "@/components/panel-content/panel-content";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                field_list: [],
+                data_base: null,
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                bottom_fixed_style: '',
+                params: null,
+                nav_status_list: [],
+                nav_status_index: 0,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentPanelContent
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 是否指定状态
+            var nav_status_index = 0;
+            if ((params.status || null) != null) {
+                for (var i in this.nav_status_list) {
+                    if (this.nav_status_list[i]['id'] == params.status) {
+                        nav_status_index = i;
+                        break;
+                    }
+                }
+            }
+            this.setData({
+                params: params,
+                nav_status_index: nav_status_index,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 初始化配置
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            // 初始化
+            init(e) {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data_base();
+                }
+            },
+            // 获取公共数据
+            get_data_base() {
+                uni.request({
+                    url: app.globalData.get_request_url('center', 'user', 'invoice'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_base: data.base || null,
+                                nav_status_list: data.nav || [],
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: false,
+                                data_page: 1,
+                            });
+                            this.get_data_list();
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_base')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 请求数据
+                var data = {
+                    page: this.data_page,
+                };
+
+                // 状态
+                var status = (this.nav_status_list[this.nav_status_index] || null) == null ? -1 : this.nav_status_list[this.nav_status_index]['id'];
+                if (status != -1) {
+                    data['status'] = status;
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'user', 'invoice'),
+                    method: 'POST',
+                    data: data,
+                    dataType: 'json',
+                    success: (res) => {
+                        if (this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            // 数据列表
+                            var data = res.data.data;
+                            if (this.data_page <= 1) {
+                                var temp_data_list = data.data_list || [];
+                            } else {
+                                var temp_data_list = this.data_list || [];
+                                var temp_data = data.data_list;
+                                for (var i in temp_data) {
+                                    temp_data_list.push(temp_data[i]);
+                                }
+                            }
+                    
+                            this.setData({
+                                field_list: data.field_list || [],
+                                data_list: temp_data_list,
+                                data_total: data.total,
+                                data_page_total: data.page_total,
+                                data_list_loding_status: temp_data_list.length > 0 ? 3 : 0,
+                                data_list_loding_msg: '',
+                                data_page: this.data_page + 1,
+                                data_is_loading: 0,
+                            });
+                    
+                            // 是否还有数据
+                            this.setData({
+                                data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                        }
+                    },
+                    fail: () => {
+                        if (this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+
+            // 删除
+            delete_event(e) {
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('recommend-list.recommend-list.54d418'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('recommend-list.recommend-list.w9460o'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            // 参数
+                            var value = e.currentTarget.dataset.value;
+                            var index = e.currentTarget.dataset.index;
+
+                            // 加载loding
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text'),
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url('delete', 'user', 'invoice'),
+                                method: 'POST',
+                                data: {
+                                    ids: value,
+                                },
+                                dataType: 'json',
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        var temp_data_list = this.data_list;
+                                        temp_data_list.splice(index, 1);
+                                        this.setData({
+                                            data_list: temp_data_list,
+                                        });
+                                        if (temp_data_list.length == 0) {
+                                            this.setData({
+                                                data_list_loding_status: 0,
+                                                data_bottom_line_status: false,
+                                            });
+                                        }
+                                        app.globalData.showToast(res.data.msg, 'success');
+                                    } else {
+                                        app.globalData.showToast(res.data.msg);
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_status_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import './invoice.css';
+</style>
diff --git a/pages/plugins/invoice/order/order.css b/pages/plugins/invoice/order/order.css
new file mode 100644
index 0000000..f79006f
--- /dev/null
+++ b/pages/plugins/invoice/order/order.css
@@ -0,0 +1,11 @@
+/*
+* 列表
+*/
+.select-scroll-box {
+    height: calc(100vh - 186rpx);
+}
+
+.data-list .item .select-icon {
+    width: 35rpx;
+    height: 35rpx !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/invoice/order/order.vue b/pages/plugins/invoice/order/order.vue
new file mode 100644
index 0000000..ea803cb
--- /dev/null
+++ b/pages/plugins/invoice/order/order.vue
@@ -0,0 +1,272 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="data_list.length > 0" class="data-list">
+            <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+                <view class="padding-horizontal-main padding-top-main" :class="select_ids.length > 0 ? 'page-bottom-fixed' : ''">
+                    <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                        <view class="base oh br-b-dashed padding-bottom-main">
+                            <view class="dis-inline-block va-m" data-type="node":data-value="item.id" @tap="selected_event">
+                                <iconfont
+                                    propClass="margin-right-sm pr top-xs"
+                                    :name="select_ids.indexOf(item.id) != -1 ? 'icon-zhifu-yixuan' : 'icon-zhifu-weixuan'"
+                                    size="40rpx"
+                                    :color="select_ids.indexOf(item.id) != -1 ? '#E22C08' : '#999'"
+                                ></iconfont>
+                            </view>
+                            <text class="va-m">{{ item.order_no }}</text>
+                            <text class="fr">{{ item.pay_price }}</text>
+                        </view>
+                        <view :data-value="'/pages/user-order-detail/user-order-detail?id=' + item.id" @tap="url_event" class="content margin-top cp">
+                            <component-panel-content :propData="item" :propDataField="field_list" propExcludeField="order_no,pay_price" :propIsTerse="true"></component-panel-content>
+                        </view>
+                        <view class="item-operation tr margin-top-main">
+                            <button class="round bg-white br-grey-9 text-size-md" type="default" size="mini" hover-class="none" :data-ids="item.id" data-type="item" @tap="invoice_event">{{$t('invoice-saveinfo.invoice-saveinfo.89815t')}}</button>
+                        </view>
+                    </view>
+                    <!-- 结尾 -->
+                    <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+                </view>
+            </scroll-view>
+            <!-- 合并开票 -->
+            <view v-if="select_ids.length > 0" class="bottom-fixed" :style="bottom_fixed_style">
+                <view class="bottom-line-exclude">
+                    <button class="item bg-white cr-main br-main round wh-auto" type="default" hover-class="none" data-type="all" @tap="invoice_event">{{$t('order.order.o411h6')}}</button>
+                </view>
+            </view>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentPanelContent from "@/components/panel-content/panel-content";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_base: null,
+                field_list: [],
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                bottom_fixed_style: '',
+                params: null,
+                select_ids: [],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentPanelContent
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'order', 'invoice'),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            if (data.data_list.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = data.data_list;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = data.data_list;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_base: data.base || null,
+                                    field_list: data.field_list || [],
+                                    data_list: temp_data_list,
+                                    data_total: data.total,
+                                    data_page_total: data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 选择
+            selected_event(e) {
+                var value = e.currentTarget.dataset.value;
+                var temp_select_ids = this.select_ids;
+                var index = temp_select_ids.indexOf(value);
+                if (index == -1) {
+                    temp_select_ids.push(value);
+                } else {
+                    temp_select_ids.splice(index, 1);
+                }
+                this.setData({
+                    select_ids: temp_select_ids,
+                });
+            },
+
+            // 合并开票
+            invoice_event(e) {
+                var type = e.currentTarget.dataset.type || 'all';
+                var ids = e.currentTarget.dataset.ids || null;
+                if (type == 'all') {
+                    if (this.select_ids.length <= 0) {
+                        app.globalData.showToast(this.$t('order.order.15k32o'));
+                        return false;
+                    } else {
+                        ids = this.select_ids.join(',');
+                    }
+                } else {
+                    if (ids === null) {
+                        app.globalData.showToast(this.$t('order.order.3fr155'));
+                        return false;
+                    }
+                }
+                app.globalData.url_open('/pages/plugins/invoice/invoice-saveinfo/invoice-saveinfo?ids=' + ids + '&type=0&is_redirect=1');
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style scoped>
+    @import './order.css';
+</style>
diff --git a/pages/plugins/invoice/recharge/recharge.css b/pages/plugins/invoice/recharge/recharge.css
new file mode 100644
index 0000000..f79006f
--- /dev/null
+++ b/pages/plugins/invoice/recharge/recharge.css
@@ -0,0 +1,11 @@
+/*
+* 列表
+*/
+.select-scroll-box {
+    height: calc(100vh - 186rpx);
+}
+
+.data-list .item .select-icon {
+    width: 35rpx;
+    height: 35rpx !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/invoice/recharge/recharge.vue b/pages/plugins/invoice/recharge/recharge.vue
new file mode 100644
index 0000000..09681a5
--- /dev/null
+++ b/pages/plugins/invoice/recharge/recharge.vue
@@ -0,0 +1,272 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="data_list.length > 0" class="data-list">
+            <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+                <view class="padding-horizontal-main padding-top-main" :class="select_ids.length > 0 ? 'page-bottom-fixed' : ''">
+                    <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                        <view class="base oh br-b-dashed padding-bottom-main">
+                            <view class="dis-inline-block va-m" data-type="node":data-value="item.id" @tap="selected_event">
+                                <iconfont
+                                    propClass="margin-right-sm pr top-xs"
+                                    :name="select_ids.indexOf(item.id) != -1 ? 'icon-zhifu-yixuan' : 'icon-zhifu-weixuan'"
+                                    size="40rpx"
+                                    :color="select_ids.indexOf(item.id) != -1 ? '#E22C08' : '#999'"
+                                ></iconfont>
+                            </view>
+                            <text class="va-m">{{ item.recharge_no }}</text>
+                            <text class="fr">{{ item.pay_money }}</text>
+                        </view>
+                        <view :data-value="'/pages/plugins/wallet/user-recharge-detail/user-recharge-detail?id=' + item.id" @tap="url_event" class="content margin-top cp">
+                            <component-panel-content :propData="item" :propDataField="field_list" propExcludeField="recharge_no,pay_money" :propIsTerse="true"></component-panel-content>
+                        </view>
+                        <view class="item-operation tr margin-top-main">
+                            <button class="round bg-white br-grey-9 text-size-md" type="default" size="mini" hover-class="none" :data-ids="item.id" data-type="item" @tap="invoice_event">{{$t('invoice-saveinfo.invoice-saveinfo.89815t')}}</button>
+                        </view>
+                    </view>
+                    <!-- 结尾 -->
+                    <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+                </view>
+            </scroll-view>
+            <!-- 合并开票 -->
+            <view v-if="select_ids.length > 0" class="bottom-fixed" :style="bottom_fixed_style">
+                <view class="bottom-line-exclude">
+                    <button class="item bg-white cr-main br-main round wh-auto" type="default" hover-class="none" data-type="all" @tap="invoice_event">{{$t('order.order.o411h6')}}</button>
+                </view>
+            </view>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentPanelContent from "@/components/panel-content/panel-content";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_base: null,
+                field_list: [],
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                bottom_fixed_style: '',
+                params: null,
+                select_ids: [],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentPanelContent
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'recharge', 'invoice'),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            if (data.data_list.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = data.data_list;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = data.data_list;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_base: data.base || null,
+                                    field_list: data.field_list || [],
+                                    data_list: temp_data_list,
+                                    data_total: data.total,
+                                    data_page_total: data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 选择
+            selected_event(e) {
+                var value = e.currentTarget.dataset.value;
+                var temp_select_ids = this.select_ids;
+                var index = temp_select_ids.indexOf(value);
+                if (index == -1) {
+                    temp_select_ids.push(value);
+                } else {
+                    temp_select_ids.splice(index, 1);
+                }
+                this.setData({
+                    select_ids: temp_select_ids,
+                });
+            },
+
+            // 合并开票
+            invoice_event(e) {
+                var type = e.currentTarget.dataset.type || 'all';
+                var ids = e.currentTarget.dataset.ids || null;
+                if (type == 'all') {
+                    if (this.select_ids.length <= 0) {
+                        app.globalData.showToast(this.$t('order.order.15k32o'));
+                        return false;
+                    } else {
+                        ids = this.select_ids.join(',');
+                    }
+                } else {
+                    if (ids === null) {
+                        app.globalData.showToast(this.$t('order.order.3fr155'));
+                        return false;
+                    }
+                }
+                app.globalData.url_open('/pages/plugins/invoice/invoice-saveinfo/invoice-saveinfo?ids=' + ids + '&type=1&is_redirect=1');
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style scoped>
+    @import './recharge.css';
+</style>
diff --git a/pages/plugins/label/detail/detail.css b/pages/plugins/label/detail/detail.css
new file mode 100644
index 0000000..d585ff5
--- /dev/null
+++ b/pages/plugins/label/detail/detail.css
@@ -0,0 +1,32 @@
+/**
+ * 基础信息
+ */
+.label-info {
+    height: 40rpx;
+}
+
+/**
+* 排序导航
+*/
+.nav-sort-content .item {
+    height: 80rpx;
+    line-height: 80rpx;
+    width: 16%;
+}
+.nav-sort-content .item .icon {
+    width: 30rpx;
+    height: 30rpx !important;
+}
+.show-type-submit {
+    width: 50rpx;
+    height: 50rpx !important;
+    top: 15rpx;
+    right: 16rpx;
+}
+
+/**
+* 商品列表
+*/
+.scroll-box {
+    height: calc(100vh - 150rpx);
+}
\ No newline at end of file
diff --git a/pages/plugins/label/detail/detail.vue b/pages/plugins/label/detail/detail.vue
new file mode 100644
index 0000000..4d34648
--- /dev/null
+++ b/pages/plugins/label/detail/detail.vue
@@ -0,0 +1,352 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="(label || null) != null">
+            <!-- 基础 -->
+            <view class="label-info bg-white padding-horizontal-main padding-top-main padding-bottom-sm">
+                <view
+                    class="dis-inline-block round cr-white bg-main padding-left-lg padding-right-lg padding-top-xs padding-bottom-xs"
+                    :style="('background-color:'+(label.bg_color || '#666'))+' !important;'+('color:'+(label.text_color || '#fff'))+' !important;'"
+                    >{{ label.name }}</view
+                >
+                <view class="dis-inline-block cr-grey margin-left-sm"
+                    >{{$t('detail.detail.025362')}}<text class="cr-red fw-b margin-left-xs margin-right-xs">{{ data_total }}</text
+                    >{{$t('detail.detail.0av5r9')}}</view
+                >
+            </view>
+
+            <!-- 排序 -->
+            <view class="nav-sort bg-white oh pr">
+                <view class="nav-sort-content">
+                    <block v-for="(item, index) in search_nav_sort_list" :key="index">
+                        <view class="item tc fl" :data-index="index" @tap="nav_sort_event">
+                            <text class="cr-base va-m">{{ item.name }}</text>
+                            <image v-if="(item.icon || null) != null" class="icon va-m" :src="common_static_url + 'sort-' + item.icon + '-icon.png'" mode="aspectFill"></image>
+                        </view>
+                    </block>
+                </view>
+                <image class="show-type-submit pa cp" :src="common_static_url + 'show-' + (data_show_type_value == 0 ? 'grid' : 'list') + '-icon.png'" mode="aspectFill" @tap="data_show_type_event"></image>
+            </view>
+
+            <!-- 列表 -->
+            <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+                <view v-if="data_list.length > 0" class="padding-horizontal-main padding-top-main">
+                    <component-goods-list :propData="{ style_type: data_show_type_value, goods_list: data_list }" :propCurrencySymbol="currency_symbol"></component-goods-list>
+                </view>
+                <view v-else>
+                    <!-- 提示信息 -->
+                    <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+                </view>
+
+                <!-- 结尾 -->
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            </scroll-view>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    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 common_static_url = app.globalData.get_static_url("common");
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                currency_symbol: app.globalData.currency_symbol(),
+                params: null,
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                label: null,
+                search_nav_sort_list: [
+                    { name: this.$t('goods-category.goods-category.x69aow'), field: "default", sort: "asc", icon: null },
+                    { name: this.$t('goods-category.goods-category.at5p35'), field: "sales", sort: "asc", icon: "default" },
+                    { name: this.$t('goods-category.goods-category.283ot0'), field: "access", sort: "asc", icon: "default" },
+                    { name: this.$t('goods-category.goods-category.g2u3lf'), field: "price", sort: "asc", icon: "default" },
+                    { name: this.$t('goods-category.goods-category.5p4ksj'), field: "new", sort: "asc", icon: "default" },
+                ],
+                search_nav_sort_value: "",
+                // 数据展示样式（0图文、1九方格）
+                data_show_type_value: 1,
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentGoodsList,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 初始化配置
+            this.init_config();
+
+            // 数据加载
+            this.get_data();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        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("detailinit", "index", "label"),
+                    method: "POST",
+                    data: { id: this.params.id || 0 },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var label = data.label || null;
+                            this.setData({
+                                data_base: data.base || null,
+                                label: label,
+                                data_list_loding_status: label == null ? 0 : 1,
+                                data_list_loding_msg: this.$t('detail.detail.53m44k'),
+                            });
+
+                            if (this.label != null) {
+                                // 基础自定义分享
+                                this.setData({
+                                    share_info: {
+                                        title: this.label.seo_title || this.label.name,
+                                        desc: this.label.seo_desc,
+                                        path: "/pages/plugins/label/detail/detail",
+                                        query: "id=" + this.label.id,
+                                    },
+                                });
+
+                                // 标题名称
+                                if ((this.label.name || null) != null) {
+                                    uni.setNavigationBarTitle({
+                                        title: this.label.name,
+                                    });
+                                }
+                            }
+
+                            // 获取列表数据
+                            this.get_data_list(1);
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+
+                        // 分享菜单处理
+                        app.globalData.page_share_handle(this.share_info);
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 获取数据列表
+            get_data_list(is_mandatory) {
+                // 是否存在标签数据
+                if ((this.label || null) == null) {
+                    uni.stopPullDownRefresh();
+                    return false;
+                }
+
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({ data_is_loading: 1 });
+
+                // 获取数据
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                        mask: true,
+                    });
+                }
+                uni.request({
+                    url: app.globalData.get_request_url("detailgoodslist", "index", "label"),
+                    method: "POST",
+                    data: {
+                        id: this.params.id || 0,
+                        page: this.data_page,
+                        ov: this.search_nav_sort_value,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            if (data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: data.total,
+                                    data_page_total: data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_is_loading: 0,
+                                });
+                                if (this.data_page <= 1) {
+                                    this.setData({
+                                        data_list: [],
+                                        data_bottom_line_status: false,
+                                    });
+                                }
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                                data_is_loading: 0,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 排序事件
+            nav_sort_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var temp_post_data = this.post_data;
+                var temp_search_nav_sort = this.search_nav_sort_list;
+                var temp_sort = temp_search_nav_sort[index]["sort"] == "desc" ? "asc" : "desc";
+                for (var i in temp_search_nav_sort) {
+                    if (i != index) {
+                        if (temp_search_nav_sort[i]["icon"] != null) {
+                            temp_search_nav_sort[i]["icon"] = "default";
+                        }
+                        temp_search_nav_sort[i]["sort"] = "desc";
+                    }
+                }
+                temp_search_nav_sort[index]["sort"] = temp_sort;
+                if (temp_search_nav_sort[index]["icon"] != null) {
+                    temp_search_nav_sort[index]["icon"] = temp_sort;
+                }
+                this.setData({
+                    search_nav_sort_value: temp_search_nav_sort[index]["field"] + "-" + temp_sort,
+                    search_nav_sort_list: temp_search_nav_sort,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 数据展示类型
+            data_show_type_event(e) {
+                this.setData({ data_show_type_value: this.data_show_type_value == 0 ? 1 : 0 });
+            },
+        },
+    };
+</script>
+<style>
+    @import "./detail.css";
+</style>
diff --git a/pages/plugins/magic/detail/detail.vue b/pages/plugins/magic/detail/detail.vue
new file mode 100644
index 0000000..76e6387
--- /dev/null
+++ b/pages/plugins/magic/detail/detail.vue
@@ -0,0 +1,168 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="(data || null) != null">
+            <view class="padding-horizontal-main padding-top-main">
+                <!-- 推荐商品 -->
+                <view v-if="(data.goods_list || null) != null && data.goods_list.length > 0">
+                    <view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                        <view class="title-left">
+                            <text class="text-wrapper title-left-border">{{ data.title }}</text>
+                            <text class="vice-name margin-left-lg cr-grey">{{ data.describe }}</text>
+                        </view>
+                    </view>
+                    <component-goods-list :propData="{ style_type: 1, goods_list: data.goods_list }" :propCurrencySymbol="currency_symbol"></component-goods-list>
+                </view>
+                <view v-else>
+                    <!-- 提示信息 -->
+                    <component-no-data propStatus="0" :propMsg="$t('detail.detail.5knxg6')"></component-no-data>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentGoodsList from '@/components/goods-list/goods-list';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                currency_symbol: app.globalData.currency_symbol(),
+                params: null,
+                user: null,
+                data_base: null,
+                data: null,
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentGoodsList,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 初始化配置
+            this.init_config();
+
+            // 获取数据
+            this.get_data();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        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');
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('detail', 'goods', 'magic'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_base: data.base || null,
+                                data: data.data || null,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: (data.data || null) != null && (data.data.goods_list || null) != null && data.data.goods_list.length > 0,
+                            });
+
+                            if ((this.data || null) != null) {
+                                // 基础自定义分享
+                                this.setData({
+                                    share_info: {
+                                        title: this.data.title,
+                                        desc: this.data.describe,
+                                        path: '/pages/plugins/magic/detail/detail',
+                                        query: 'id=' + this.params.id + '&ix=' + this.params.ix,
+                                    },
+                                });
+                                // 标题
+                                if ((this.data.title || null) != null) {
+                                    uni.setNavigationBarTitle({
+                                        title: this.data.title,
+                                    });
+                                }
+                            }
+                        } 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: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+        },
+    };
+</script>
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/plugins/membershiplevelvip/buy/buy.css b/pages/plugins/membershiplevelvip/buy/buy.css
new file mode 100644
index 0000000..c825851
--- /dev/null
+++ b/pages/plugins/membershiplevelvip/buy/buy.css
@@ -0,0 +1,64 @@
+/**
+* 导航
+*/
+.nav {
+    height: 80rpx;
+    line-height: 80rpx;
+}
+
+.nav.average-1 .item {
+    width: calc(100% - 80rpx);
+}
+
+.nav.average-2 .item {
+    width: calc(50% - 80rpx);
+}
+
+.nav.average-3 .item {
+    width: calc((100% / 3) - 80rpx);
+}
+
+/**
+ * 分割线
+ */
+.divider::before,
+.divider::after {
+    content: '';
+    width: 100rpx;
+    height: 2rpx;
+    background: #333333;
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+}
+
+.divider::before {
+    left: -120rpx;
+}
+
+.divider::after {
+    right: -120rpx;
+}
+
+/**
+* 内容
+*/
+.data-list .list {
+    width: calc((100% / 3) - 24rpx);
+}
+
+.data-list .list .item {
+    background: #F7F7F7;
+    border-radius: 8px 40px 8px 8px;
+    padding: 50rpx 32rpx 20rpx 32rpx;
+    border: 1px solid #F7F7F7;
+}
+
+.data-list .list .item.active {
+    border-color: #F1513C;
+    background-color: #FEF0E8;
+}
+
+.data-list .list .item .price {
+    margin-top: 16rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/membershiplevelvip/buy/buy.vue b/pages/plugins/membershiplevelvip/buy/buy.vue
new file mode 100644
index 0000000..fe9e46a
--- /dev/null
+++ b/pages/plugins/membershiplevelvip/buy/buy.vue
@@ -0,0 +1,312 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="(data_base || null) != null">
+            <view v-if="(data_list || null) != null && data_list.length > 0" class="page-bottom-fixed">
+                <!-- 导航 -->
+                <scroll-view class="nav scroll-view-horizontal bg-white oh tc" :class="data_list.length < 4 ? 'average-' + data_list.length : ''" scroll-x="true">
+                    <block v-for="(item, index) in data_list" :key="index">
+                        <view :class="'item dis-inline-block padding-left-xxl padding-right-xxl cr-black ' + (selected_tabs_index === index ? 'cr-main nav-active-line' : '')" @tap="tabs_event" :data-index="index">
+                            {{ item.name }}
+                        </view>
+                    </block>
+                </scroll-view>
+                <!-- 分割线 -->
+                <view class="tc margin-top-xxl spacing-mb">
+                    <text class="divider pr">{{$t('buy.buy.g7dk3f')}}</text>
+                </view>
+                <!-- 内容 -->
+                <view class="vip-content bg-white padding-vertical-main padding-horizontal-sm spacing-mb">
+                    <block v-for="(item, index) in data_list" :key="index">
+                        <block v-if="selected_tabs_index == index">
+                            <block v-if="(item.pay_period_rules || null) != null">
+                                <view class="data-list flex-row flex-wrap align-c">
+                                    <block v-for="(rules, ri) in item.pay_period_rules" :key="ri">
+                                        <view class="list padding-sm oh" @tap="content_event" :data-index="ri" :data-value="currency_symbol + rules.price + '/' + ((rules.number || null) == null ? $t('buy.buy.b3dyo7') : rules.value + rules.unit)">
+                                            <view class="item flex-col" :class="selected_content_index === ri ? 'active' : ''">
+                                                <view class="number single-text text-size-lg">
+                                                    <text class="fw-b">{{ (rules.number || null) == null ? $t('buy.buy.b3dyo7') : rules.value }}</text>
+                                                    <text v-if="(rules.unit || null) != null" class="margin-left-sm">{{ rules.unit }}</text>
+                                                </view>
+                                                <view v-if="(rules.desc || null) != null" class="desc margin-top-sm">{{ rules.desc }}</view>
+                                                <view class="price flex-row align-s">
+                                                    <text class="cr-red text-size-md pr top-lg margin-right-xs">{{ currency_symbol }}</text>
+                                                    <text class="fw-b cr-red text-size-xl single-text">{{ rules.price }}</text>
+                                                </view>
+                                            </view>
+                                        </view>
+                                    </block>
+                                    <view class="bottom-fixed" :style="bottom_fixed_style">
+                                        <view class="bottom-line-exclude">
+                                            <button class="item bg-main br-main cr-white round text-size" type="default" hover-class="none" @tap="submit_event" :disabled="submit_disabled_status">{{$t('buy.buy.0s1k23')}}{{ selected_tabs_value }}</button>
+                                        </view>
+                                    </view>
+                                </view>
+                            </block>
+                            <block v-else>
+                                <!-- 提示信息 -->
+                                <component-no-data propStatus="0" :propMsg="$t('buy.buy.5lr84j')"></component-no-data>
+                            </block>
+                        </block>
+                    </block>
+                </view>
+                <view class="all-order flex-row jc-sb align-c padding-main bg-white spacing-mb" data-value="/pages/plugins/membershiplevelvip/order/order" @tap="url_event">
+                    <view> <iconfont name="icon-kaitonghuiy-dingdan" propClass="margin-right-sm" color="#666"></iconfont>{{$t('buy.buy.ntm2z5')}}</view>
+                    <iconfont name="icon-arrow-right" size="24rpx" color="#666"></iconfont>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data propStatus="0" :propMsg="$t('buy.buy.5x86n3')"></component-no-data>
+            </view>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+        <!-- 支付组件 -->
+        <component-payment
+            :propPayUrl="pay_url"
+            :propQrcodeUrl="qrcode_url"
+            propPayDataKey="id"
+            :propPaymentList="payment_list"
+            :propTempPayValue="temp_pay_value"
+            :propTempPayIndex="temp_pay_index"
+            :propPaymentId="payment_id"
+            :propDefaultPaymentId="default_payment_id"
+            :propPayPrice="pay_price"
+            :propIsRedirectTo="true"
+            :propToFailPage="to_fail_page"
+            :propToAppointPage="to_appoint_page"
+            :propIsShowPayment="is_show_payment_popup"
+            @close-payment-popup="payment_popup_event_close"
+        ></component-payment>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentPayment from '@/components/payment/payment';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                bottom_fixed_style: '',
+                data_list: [],
+                data_base: null,
+                selected_tabs_index: 0,
+                selected_tabs_value: '',
+                selected_content_index: null,
+                submit_disabled_status: false,
+                currency_symbol: app.globalData.currency_symbol(),
+                // 支付弹窗参数
+                pay_url: '',
+                qrcode_url: '',
+                payment_list: [],
+                temp_pay_value: '',
+                temp_pay_index: 0,
+                payment_id: 0,
+                default_payment_id: 0,
+                is_show_payment_popup: false,
+                pay_price: 0,
+                // 支付失败跳转的页面
+                to_fail_page: '/pages/plugins/membershiplevelvip/order/order',
+                // 现金--跳转指定页面
+                to_appoint_page: '/pages/plugins/membershiplevelvip/order/order',
+            };
+        },
+        components: {
+            componentCommon,
+            componentNoData,
+            componentPayment
+        },
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 加载数据
+            this.init();
+        },
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data_list();
+        },
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.setData({
+                        pay_url: app.globalData.get_request_url('pay', 'buy', 'membershiplevelvip'),
+                        qrcode_url: app.globalData.get_request_url('paycheck', 'buy', 'membershiplevelvip'),
+                    });
+                    // 获取数据
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+            // 获取数据
+            get_data_list() {
+                if (this.data_list.length <= 0) {
+                    this.setData({
+                        data_list_loding_status: 1,
+                    });
+                }
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'buy', 'membershiplevelvip'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var status = (data.data || []).length > 0;
+                            this.setData({
+                                data_base: data.base || null,
+                                data_list: data.data || [],
+                                default_payment_id: data.default_payment_id || 0,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: status ? 3 : 0,
+                                data_bottom_line_status: status,
+                                payment_list: data.payment_list,
+                            });
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+            // tabs事件
+            tabs_event(e) {
+                this.setData({
+                    selected_tabs_index: e.currentTarget.dataset.index || 0,
+                    selected_content_index: null,
+                    selected_tabs_value: '',
+                    temp_pay_index: 0,
+                });
+            },
+            // 时长事件
+            content_event(e) {
+                this.setData({
+                    selected_content_index: e.currentTarget.dataset.index || 0,
+                    selected_tabs_value: e.currentTarget.dataset.value || '',
+                    temp_pay_index: e.currentTarget.dataset.index,
+                });
+            },
+            // 确认支付事件
+            submit_event(e) {
+                if (this.selected_tabs_index < 0 || this.selected_content_index === null) {
+                    app.globalData.showToast(this.$t('buy.buy.bmueac'));
+                    return false;
+                }
+                // 请求参数
+                var item = this.data_list[this.selected_tabs_index] || null;
+                if (item == null) {
+                    app.globalData.showToast(this.$t('buy.buy.64ml60'));
+                    return false;
+                }
+                var rules = (item['pay_period_rules'] || null) == null ? null : item['pay_period_rules'][this.selected_content_index] || null;
+                if (rules == null) {
+                    app.globalData.showToast(this.$t('buy.buy.64ml60'));
+                    return false;
+                }
+                // 请求生成支付订单
+                this.setData({
+                    submit_disabled_status: true,
+                });
+                uni.showLoading({
+                    title: this.$t('common.processing_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('create', 'buy', 'membershiplevelvip'),
+                    method: 'POST',
+                    data: {
+                        opening: item['id'] + '-' + rules['number'],
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        this.setData({
+                            submit_disabled_status: false,
+                        });
+                        if (res.data.code == 0) {
+                            this.setData({
+                                is_show_payment_popup: this.is_show_payment_popup ? false : true,
+                                temp_pay_value: res.data.data.id,
+                                pay_price: res.data.data.price,
+                                payment_id: res.data.data.payment_user_id,
+                            });
+                            uni.setStorageSync(app.globalData.data.cache_page_pay_key, {
+                                order_ids: res.data.data.id,
+                            });
+                        } else {
+                            if (app.globalData.is_login_check(res.data, this, 'submit_event')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        this.setData({
+                            submit_disabled_status: false,
+                        });
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 打开url
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 支付窗口关闭
+            payment_popup_event_close() {
+                this.setData({
+                    is_show_payment_popup: false,
+                });
+            }
+        }
+    };
+</script>
+<style scoped>
+    @import './buy.css';
+</style>
diff --git a/pages/plugins/membershiplevelvip/index/index.css b/pages/plugins/membershiplevelvip/index/index.css
new file mode 100644
index 0000000..96554e5
--- /dev/null
+++ b/pages/plugins/membershiplevelvip/index/index.css
@@ -0,0 +1,50 @@
+/**
+* banner
+*/
+.vip-bg {
+    width: calc(100% + 8rpx);
+    margin: 0 -4rpx;
+}
+
+.banner .title-img {
+    width: 476rpx;
+    margin-top: 64rpx;
+}
+
+.banner-title {
+    color: #f9d681;
+}
+
+.banner-buy {
+    background-size: 100%;
+    background-color: transparent;
+    border: 0;
+    color: #88651F !important;
+    width: 308rpx;
+    height: 94rpx;
+    line-height: 94rpx !important;
+    font-size: 44rpx;
+    box-sizing: content-box;
+}
+
+/**
+* 等级介绍
+*/
+.head-top {
+    padding-top: calc(94rpx + var(--status-bar-height) + 5px);
+    /* #ifdef H5 */
+    padding-top: 94rpx;
+    /* #endif */
+}
+
+.data-list .item {
+    width: calc(100% / 3);
+    margin-bottom: 20rpx;
+    color: #88651F;
+    padding: 0 20rpx;
+}
+
+.data-list .item image {
+    width: 130rpx;
+    height: 130rpx !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/membershiplevelvip/index/index.vue b/pages/plugins/membershiplevelvip/index/index.vue
new file mode 100644
index 0000000..f19d4b8
--- /dev/null
+++ b/pages/plugins/membershiplevelvip/index/index.vue
@@ -0,0 +1,181 @@
+<template>
+    <view :class="theme_view">
+        <component-nav-back></component-nav-back>
+        <view v-if="(data_base || null) != null" class="bg-white">
+            <view class="pr wh-auto oh">
+                <image :src="membership_level_vip + 'bg.png'" mode="widthFix" class="vip-bg"></image>
+                <view class="banner oh pa top-0 pa-w wh-auto head-top">
+                    <view class="tc">
+                        <image :src="membership_level_vip + 'title.png'" mode="widthFix" class="title-img"></image>
+                        <!-- 标题 -->
+                        <view v-if="(data_base.banner_top_title || null) != null" class="banner-title single-text text-size-lg margin-top-xxxl"> {{ data_base.banner_top_title }} </view>
+                        <!-- 购买按钮 -->
+                        <button data-value="/pages/plugins/membershiplevelvip/buy/buy" @tap="url_event" class="banner-buy fw-b round auto margin-top-xxxl" hover-class="none" :style="join_vip_btn">
+                            {{ data_base.banner_middle_name || $t('index.index.tbo22p') }}
+                        </button>
+                    </view>
+                </view>
+                <!-- 介绍列表 -->
+                <view v-if="(introduce_data || null) != null && introduce_data.length > 0" class="data-list oh flex-row jc-sa align-c">
+                    <block v-for="(item, index) in introduce_data" :key="index">
+                        <view class="item tc bg-white">
+                            <image class="dis-block auto" :src="item.images_url" mode="scaleToFill"></image>
+                            <view class="single-text text-size margin-top-main">{{ item.name }}</view>
+                            <view class="multi-text cr-grey-c text-size-xs margin-top-xs">{{ item.desc }}</view>
+                        </view>
+                    </block>
+                </view>
+                <!-- 富文本 -->
+                <view v-if="(data_base.banner_bottom_content || null) != null" class="padding-main spacing-mt">
+                    <view class="border-radius-main bg-white oh">
+                        <mp-html :content="data_base.banner_bottom_content" />
+                    </view>
+                </view>
+            </view>
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNavBack from '@/components/nav-back/nav-back';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    let membership_level_vip = app.globalData.get_static_url('membershiplevelvip', true);
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                membership_level_vip: membership_level_vip + 'app/',
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                introduce_data: [],
+                data_base: null,
+                default_images_data: null,
+                // 自定义分享信息
+                share_info: {},
+                join_vip_btn: 'background-image: url(' + membership_level_vip + 'app/join-vip-btn.png) !important;',
+            };
+        },
+        components: {
+            componentCommon,
+            componentNavBack,
+            componentNoData,
+            componentBottomLine,
+        },
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.init();
+        },
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+        methods: {
+            init() {
+                // 获取数据
+                this.get_data();
+            },
+
+            // 获取数据
+            get_data() {
+                if (this.introduce_data.length <= 0) {
+                    this.setData({
+                        data_list_loding_status: 1,
+                    });
+                }
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'index', 'membershiplevelvip'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_base: data.base || null,
+                                default_images_data: data.default_images_data || null,
+                                introduce_data: data.introduce_data || [],
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: true,
+                            });
+                            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/membershiplevelvip/index/index',
+                                        img: this.default_images_data.default_bg_images || this.default_images_data.default_logo || '',
+                                    },
+                                });
+
+                                // #ifndef MP-ALIPAY
+                                // 导航名称
+                                if ((this.data_base.application_name || null) != null) {
+                                    uni.setNavigationBarTitle({
+                                        title: this.data_base.application_name,
+                                    });
+                                }
+                                // #endif
+                            }
+                        } 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: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+
+            // 页面滚动监听
+            onPageScroll(res) {
+                uni.$emit('onPageScroll', res);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import './index.css';
+</style>
diff --git a/pages/plugins/membershiplevelvip/member-code/member-code.css b/pages/plugins/membershiplevelvip/member-code/member-code.css
new file mode 100644
index 0000000..2b4f3ae
--- /dev/null
+++ b/pages/plugins/membershiplevelvip/member-code/member-code.css
@@ -0,0 +1,12 @@
+.brcode {
+    width: 660rpx;
+    padding-top: 60rpx;
+}
+.qrcode {
+    width: 450rpx;
+    margin-top: 60rpx;
+    padding: 50rpx;
+}
+.bottom-fixed .btn {
+    width: 50%;
+}
\ No newline at end of file
diff --git a/pages/plugins/membershiplevelvip/member-code/member-code.vue b/pages/plugins/membershiplevelvip/member-code/member-code.vue
new file mode 100644
index 0000000..cc263af
--- /dev/null
+++ b/pages/plugins/membershiplevelvip/member-code/member-code.vue
@@ -0,0 +1,190 @@
+<template>
+    <view :class="theme_view">
+        <view class="scroll-box bg-white">
+            <!-- 主体内容 -->
+            <block v-if="data_list_loding_status == 3">
+                <!-- 条码 -->
+                <view class="brcode auto">
+                    <w-barcode :options="barcode"></w-barcode>
+                    <view class="fw-b tc margin-top text-size-lg">{{ member_code }}</view>
+                </view>
+
+                <!-- 二维码 -->
+                <view class="qrcode auto br radius">
+                    <w-qrcode :options="qrcode"></w-qrcode>
+                </view>
+
+                <!-- 提示信息 -->
+                <view class="cr-grey tc margin-top-xxxl">{{$t('member-code.member-code.oc4x18')}}</view>
+
+                <!-- 导航 -->
+                <view v-if="(plugins_wallet || null) != null" class="bottom-fixed" :style="bottom_fixed_style">
+                    <view class="bottom-line-exclude">
+                        <view class="bg-white br-grey-d round oh">
+                            <button type="default" class="btn bg-main cr-white round text-size fl br-0" size="mini">{{$t('member-code.member-code.26bu38')}}</button>
+                            <button type="default" class="btn bg-white round text-size fr br-0" size="mini" :data-value="'/pages/plugins/wallet/payment-code/payment-code?screen_brightness_value=' + screen_brightness_value" data-redirect="1" @tap="url_event">{{$t('member-code.member-code.x58gqu')}}</button>
+                        </view>
+                    </view>
+                </view>
+            </block>
+
+            <!-- 错误提示 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            <view v-if="is_to_login == 1" class="margin-top-lg tc">
+                <button type="default" class="bg-main br-main cr-white" size="mini" data-value="/pages/login/login" @tap="url_event">{{$t('member-code.member-code.yj6g3a')}}</button>
+            </view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                bottom_fixed_style: '',
+                is_to_login: 0,
+                screen_brightness_value: 0,
+                plugins_wallet: null,
+                user: null,
+                member_code: '',
+                barcode: {
+                    width: 660,
+                    height: 120,
+                    code: '',
+                },
+                qrcode: {
+                    code: '',
+                    size: 450,
+                },
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+        },
+
+        // 页面加载初始化
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 获取屏幕亮度
+            // #ifndef H5
+            var self = this;
+            if ((params || null) != null && (params.screen_brightness_value || null) == null) {
+                uni.getScreenBrightness({
+                    success: function (res) {
+                        self.setData({
+                            screen_brightness_value: res.value,
+                        });
+                    },
+                });
+            } else {
+                self.setData({
+                    screen_brightness_value: params.screen_brightness_value,
+                });
+            }
+            // #endif
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 初始化配置
+            this.init_config();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        methods: {
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    this.setData({
+                        plugins_wallet: app.globalData.get_config("plugins_base.wallet", null),
+                    });
+                } else {
+                    app.globalData.is_config(this, "init_config");
+                }
+            },
+
+            // 获取数据
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    if ((user.number_code || null) != null) {
+                        // 会员码数据
+                        var barcode = this.barcode;
+                        var qrcode = this.qrcode;
+                        barcode["code"] = user.number_code;
+                        qrcode["code"] = user.number_code;
+                        this.setData({
+                            data_list_loding_status: 3,
+                            is_to_login: 0,
+                            user: user,
+                            barcode: barcode,
+                            qrcode: qrcode,
+                            member_code: user.number_code,
+                        });
+
+                        // #ifndef H5
+                        // 设置屏幕亮度
+                        uni.setScreenBrightness({
+                            value: 1,
+                        });
+                        // #endif
+                    } else {
+                        this.setData({
+                            data_list_loding_status: 0,
+                            data_list_loding_msg: this.$t('member-code.member-code.kx4yk8'),
+                            is_to_login: 0,
+                        });
+                    }
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_list_loding_msg: this.$t('setup.setup.nwt4o1'),
+                        is_to_login: 1,
+                    });
+                }
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+        },
+
+        // 页面销毁时执行
+        onUnload: function () {
+            // #ifndef H5
+            // 恢复屏幕原始亮度
+            if (this.screen_brightness_value > 0) {
+                uni.setScreenBrightness({
+                    value: this.screen_brightness_value,
+                });
+            }
+            // #endif
+        },
+    };
+</script>
+<style>
+    @import "./member-code.css";
+</style>
diff --git a/pages/plugins/membershiplevelvip/order-detail/order-detail.vue b/pages/plugins/membershiplevelvip/order-detail/order-detail.vue
new file mode 100644
index 0000000..3a8cc1d
--- /dev/null
+++ b/pages/plugins/membershiplevelvip/order-detail/order-detail.vue
@@ -0,0 +1,140 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="detail != null">
+            <view class="padding-horizontal-main padding-top-main">
+                <view v-if="detail_list.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="panel-content oh">
+                        <view v-for="(item, index) in detail_list" :key="index" class="item br-b-dashed oh padding-vertical-main">
+                            <view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
+                            <view class="content fl br-l padding-left-main">{{ item.value }}</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                data_bottom_line_status: false,
+                detail: null,
+                detail_list: [],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("detail", "order", "membershiplevelvip"),
+                    method: "POST",
+                    data: {
+                        id: this.params.id,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                detail: data.data,
+                                detail_list: [
+                                    { name: this.$t('order-detail.order-detail.36op8f'), value: data.data.payment_user_order_no || "" },
+                                    { name: this.$t('order.order.vjfki8'), value: data.data.period_value + " " + data.data.period_unit || "" },
+                                    { name: this.$t('user-order-detail.user-order-detail.yxwu8n'), value: data.data.status_name || "" },
+                                    { name: this.$t('profit-detail.profit-detail.kn8yye'), value: data.data.settlement_status_name || "" },
+                                    { name: this.$t('order-detail.order-detail.rn4hhi'), value: data.data.type_name || "" },
+                                    { name: this.$t('order-detail.order-detail.x3ge6c'), value: data.data.price || "" },
+                                    { name: this.$t('user-order-detail.user-order-detail.516tlr'), value: data.data.pay_price <= 0 ? "" : data.data.pay_price || "" },
+                                    { name: this.$t('user-order-detail.user-order-detail.0e1sfs'), value: data.data.payment_name || "" },
+                                    { name: this.$t('user-order-detail.user-order-detail.h2c78h'), value: data.data.add_time || "" },
+                                    { name: this.$t('common.upd_time'), value: data.data.upd_time || "" },
+                                ],
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: "",
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "init")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+        },
+    };
+</script>
+<style></style>
diff --git a/pages/plugins/membershiplevelvip/order/order.css b/pages/plugins/membershiplevelvip/order/order.css
new file mode 100644
index 0000000..170b1f8
--- /dev/null
+++ b/pages/plugins/membershiplevelvip/order/order.css
@@ -0,0 +1,6 @@
+/*
+* 导航
+*/
+.nav-base .item {
+    width: 20%;
+}
\ No newline at end of file
diff --git a/pages/plugins/membershiplevelvip/order/order.vue b/pages/plugins/membershiplevelvip/order/order.vue
new file mode 100644
index 0000000..4c9a6e0
--- /dev/null
+++ b/pages/plugins/membershiplevelvip/order/order.vue
@@ -0,0 +1,472 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav-base bg-white">
+            <block v-for="(item, index) in nav_status_list" :key="index">
+                <view :class="'item fl tc ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+            </block>
+        </view>
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                    <view class="base oh br-b padding-bottom-main">
+                        <text class="cr-base">{{ item.add_time }}</text>
+                        <text class="fr cr-main">{{ item.status_name }}</text>
+                    </view>
+                    <view :data-value="'/pages/plugins/membershiplevelvip/order-detail/order-detail?id=' + item.id" @tap="url_event" class="content margin-top cp">
+                        <view v-for="(fv, fi) in content_list" :key="fi">
+                            <view class="single-text margin-top-xs">
+                                <text class="cr-grey margin-right-xl">{{ fv.name }}</text>
+                                <text class="cr-base">{{ item[fv.field] }}</text>
+                                <text v-if="(fv.unit || null) != null" class="cr-grey">{{ fv.unit }}</text>
+                                <text v-if="(item[fv.unit_field] || null) != null" class="cr-grey">{{ item[fv.unit_field] }}</text>
+                            </view>
+                        </view>
+                    </view>
+                    <view v-if="item.status == 0 || item.status == 2 || item.status == 3" class="item-operation tr br-t padding-top-main margin-top-main">
+                        <button v-if="item.status == 0" class="round bg-white cr-green br-green" type="default" size="mini" @tap="pay_event" :data-value="item.id" :data-price="item.price" :data-index="index" :data-payment="item.payment_id" hover-class="none">{{$t('order.order.1i873j')}}</button>
+                        <button v-if="item.status == 0" class="round bg-white cr-yellow br-yellow" type="default" size="mini" @tap="cancel_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('common.cancel')}}</button>
+                        <button v-if="item.status == 2 || item.status == 3" class="round bg-white cr-red br-red" type="default" size="mini" @tap="delete_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('common.del')}}</button>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+        <component-payment
+            ref="payment"
+            :propPayUrl="pay_url"
+            :propQrcodeUrl="qrcode_url"
+            propPayDataKey="id"
+            :propPaymentList="payment_list"
+            :propTempPayValue="temp_pay_value"
+            :propTempPayIndex="temp_pay_index"
+            :propPaymentId="payment_id"
+            :propDefaultPaymentId="default_payment_id"
+            :propPayPrice="pay_price"
+            :propIsShowPayment="is_show_payment_popup"
+            @close-payment-popup="payment_popup_event_close"
+            @pay-success="order_item_pay_success_handle"
+            :propNavDtatusIndex="nav_status_index"
+            @reset-event="reset_event"
+        ></component-payment>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentPayment from '@/components/payment/payment';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                // 支付弹窗参数
+                pay_url: '',
+                qrcode_url: '',
+                payment_list: [],
+                temp_pay_value: '',
+                temp_pay_index: 0,
+                payment_id: 0,
+                default_payment_id: 0,
+                is_show_payment_popup: false,
+                pay_price: 0,
+                nav_status_list: [
+                    {
+                        name: this.$t('common.all'),
+                        value: '-1',
+                    },
+                    {
+                        name: this.$t('order.order.pjb15r'),
+                        value: '0',
+                    },
+                    {
+                        name: this.$t('order.order.s8g966'),
+                        value: '1',
+                    },
+                    {
+                        name: this.$t('order.order.1k98tk'),
+                        value: '2',
+                    },
+                    {
+                        name: this.$t('order.order.6390gk'),
+                        value: '3',
+                    },
+                ],
+                nav_status_index: 0,
+                content_list: [
+                    {
+                        name: this.$t('order.order.vvxct1'),
+                        field: 'payment_user_order_no',
+                    },
+                    {
+                        name: this.$t('order.order.vjfki8'),
+                        field: 'period_value',
+                        unit_field: 'period_unit',
+                    },
+                    {
+                        name: this.$t('order-detail.order-detail.x3ge6c'),
+                        field: 'price',
+                    },
+                    {
+                        name: this.$t('user-order-detail.user-order-detail.516tlr'),
+                        field: 'pay_price',
+                    },
+                ],
+            };
+        },
+        components: {
+            componentCommon,
+            componentPayment,
+            componentNoData,
+            componentBottomLine,
+        },
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 是否指定状态
+            var nav_status_index = 0;
+            if ((params.status || null) != null) {
+                for (var i in this.nav_status_list) {
+                    if (this.nav_status_list[i]['value'] == params.status) {
+                        nav_status_index = i;
+                        break;
+                    }
+                }
+            }
+            this.setData({
+                params: params,
+                nav_status_index: nav_status_index,
+            });
+            this.init();
+        },
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.setData({
+                        pay_url: app.globalData.get_request_url('pay', 'buy', 'membershiplevelvip'),
+                        qrcode_url: app.globalData.get_request_url('paycheck', 'buy', 'membershiplevelvip'),
+                    });
+                    // 获取数据
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+                // 参数
+                var order_status = (this.nav_status_list[this.nav_status_index] || null) == null ? -1 : this.nav_status_list[this.nav_status_index]['value'];
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'order', 'membershiplevelvip'),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page,
+                        status: order_status,
+                        is_more: 1,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    payment_list: res.data.data.payment_list || [],
+                                    default_payment_id: res.data.data.default_payment_id || 0,
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+
+                                // 下订单支付处理
+                                var key = app.globalData.data.cache_page_pay_key;
+                                var pay_data = uni.getStorageSync(key) || null;
+                                if (pay_data != null && (pay_data.order_ids || null) != null && (pay_data.payment_id || null) != null) {
+                                    uni.removeStorageSync(key);
+                                    this.setData({
+                                        temp_pay_value: pay_data.order_ids,
+                                        payment_id: pay_data.payment_id,
+                                    });
+                                    if ((this.$refs.payment || null) != null) {
+                                        this.$refs.payment.pay_handle(pay_data.order_ids, pay_data.payment_id, this.payment_list);
+                                    }
+                                }
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 支付
+            pay_event(e) {
+                this.setData({
+                    is_show_payment_popup: true,
+                    temp_pay_value: e.currentTarget.dataset.value,
+                    temp_pay_index: e.currentTarget.dataset.index,
+                    pay_price: e.currentTarget.dataset.price,
+                    payment_id: e.currentTarget.dataset.payment || '',
+                });
+            },
+
+            // 支付弹窗关闭
+            payment_popup_event_close(e) {
+                this.setData({
+                    is_show_payment_popup: false,
+                });
+            },
+
+            // 重置列表数据
+            reset_event() {
+                this.get_data_list();
+            },
+
+            // 支付成功数据设置
+            order_item_pay_success_handle(data) {
+                var order_ids_arr = data.order_id.toString().split(',');
+                var temp_data_list = this.data_list;
+                for (var i in temp_data_list) {
+                    if (order_ids_arr.indexOf(temp_data_list[i]['id'].toString()) != -1) {
+                        temp_data_list[i]['pay_price'] = temp_data_list[i]['price'];
+                        temp_data_list[i]['status'] = 1;
+                        temp_data_list[i]['status_name'] = this.$t('order.order.s8g966');
+                    }
+                }
+                this.setData({
+                    data_list: temp_data_list,
+                });
+            },
+
+            // 取消
+            cancel_event(e) {
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('order.order.pn78ns'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('recommend-list.recommend-list.w9460o'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            // 参数
+                            var id = e.currentTarget.dataset.value;
+                            var index = e.currentTarget.dataset.index;
+                            // 加载loding
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text'),
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url('cancel', 'order', 'membershiplevelvip'),
+                                method: 'POST',
+                                data: {
+                                    id: id,
+                                },
+                                dataType: 'json',
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        var temp_data_list = this.data_list;
+                                        temp_data_list[index]['status'] = 2;
+                                        temp_data_list[index]['status_name'] = this.$t('order.order.1k98tk');
+                                        this.setData({
+                                            data_list: temp_data_list,
+                                        });
+                                        app.globalData.showToast(res.data.msg, 'success');
+                                    } else {
+                                        app.globalData.showToast(res.data.msg);
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 删除
+            delete_event(e) {
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('recommend-list.recommend-list.54d418'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('recommend-list.recommend-list.w9460o'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            // 参数
+                            var id = e.currentTarget.dataset.value;
+                            var index = e.currentTarget.dataset.index;
+                            // 加载loding
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text'),
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url('delete', 'order', 'membershiplevelvip'),
+                                method: 'POST',
+                                data: {
+                                    id: id,
+                                },
+                                dataType: 'json',
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        var temp_data_list = this.data_list;
+                                        temp_data_list.splice(index, 1);
+                                        this.setData({
+                                            data_list: temp_data_list,
+                                        });
+                                        if (temp_data_list.length == 0) {
+                                            this.setData({
+                                                data_list_loding_status: 0,
+                                                data_bottom_line_status: false,
+                                            });
+                                        }
+                                        app.globalData.showToast(res.data.msg, 'success');
+                                    } else {
+                                        app.globalData.showToast(res.data.msg);
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_status_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import './order.css';
+</style>
diff --git a/pages/plugins/membershiplevelvip/poster/poster.css b/pages/plugins/membershiplevelvip/poster/poster.css
new file mode 100644
index 0000000..8eb220a
--- /dev/null
+++ b/pages/plugins/membershiplevelvip/poster/poster.css
@@ -0,0 +1,7 @@
+.share .title {
+    border-style: solid;
+    border-width: 0 0 0 3px;
+}
+.submit-double button {
+    width: 48%;
+}
\ No newline at end of file
diff --git a/pages/plugins/membershiplevelvip/poster/poster.vue b/pages/plugins/membershiplevelvip/poster/poster.vue
new file mode 100644
index 0000000..6c62e2c
--- /dev/null
+++ b/pages/plugins/membershiplevelvip/poster/poster.vue
@@ -0,0 +1,162 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="user_share_qrode != null || user_share_url != null" class="padding-main">
+            <!-- 二维码 -->
+            <view v-if="user_share_qrode != null" class="share qrcode padding-main border-radius-main bg-white spacing-mb">
+                <view class="title border-color-main padding-left-lg text-size fw-b">{{$t('poster.poster.9y4bwq')}}</view>
+                <view class="cr-grey br-b padding-vertical-main">{{$t('poster.poster.h212v8')}}</view>
+                <view class="margin-top-lg">
+                    <image :src="user_share_qrode" class="wh-auto dis-block radius" mode="widthFix"></image>
+                </view>
+                <view class="margin-top-lg">
+                    <button class="dis-block wh-auto bg-white cr-green br-green round" type="default" size="mini" hover-class="none" @tap="images_show_event" :data-value="user_share_qrode">{{$t('poster.poster.j3qv45')}}</button>
+                </view>
+            </view>
+
+            <!-- 链接 -->
+            <view v-if="user_share_url != null" class="share url padding-main border-radius-main bg-white spacing-mb">
+                <view class="title border-color-main padding-left-lg text-size fw-b">{{$t('poster.poster.r534xd')}}</view>
+                <view class="cr-grey br-b padding-vertical-main">{{$t('poster.poster.vn36y7')}}</view>
+                <view class="cr-main text-size margin-top-lg">{{ user_share_url }}</view>
+                <view class="margin-top-lg">
+                    <button class="dis-block wh-auto bg-white cr-green br-green round" type="default" size="mini" hover-class="none" @tap="url_event" :data-value="user_share_url">{{$t('poster.poster.673605')}}</button>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: this.$t('common.loading_in_text'),
+                data_bottom_line_status: false,
+                user_share_qrode: null,
+                user_share_url: null,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 加载数据
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("index", "poster", "membershiplevelvip"),
+                    method: "POST",
+                    data: {},
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                user_share_qrode: data.user_share_qrode || null,
+                                user_share_url: data.user_share_url || null,
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: "",
+                            });
+
+                            // 是否全部没数据
+                            if (this.user_share_qrode == null && this.user_share_url == null) {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_bottom_line_status: false,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "init")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 图片查看事件
+            images_show_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value != null) {
+                    uni.previewImage({
+                        current: value,
+                        urls: [value],
+                    });
+                } else {
+                    app.globalData.showToast(this.$t('poster.poster.eu3j21'));
+                }
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.text_copy_event(e);
+            },
+        },
+    };
+</script>
+<style>
+    @import "./poster.css";
+</style>
diff --git a/pages/plugins/membershiplevelvip/profit-detail/profit-detail.vue b/pages/plugins/membershiplevelvip/profit-detail/profit-detail.vue
new file mode 100644
index 0000000..4128a49
--- /dev/null
+++ b/pages/plugins/membershiplevelvip/profit-detail/profit-detail.vue
@@ -0,0 +1,137 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="detail != null">
+            <view class="padding-horizontal-main padding-top-main">
+                <view v-if="detail_list.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="panel-content oh">
+                        <view v-for="(item, index) in detail_list" :key="index" class="item br-b-dashed oh padding-vertical-main">
+                            <view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
+                            <view class="content fl br-l padding-left-main">{{ item.value }}</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                data_bottom_line_status: false,
+                detail: null,
+                detail_list: [],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("detail", "profit", "membershiplevelvip"),
+                    method: "POST",
+                    data: {
+                        id: this.params.id,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                detail: data.data,
+                                detail_list: [
+                                    { name: this.$t('order-detail.order-detail.x3ge6c'), value: data.data.total_price || "" },
+                                    { name: this.$t('profit.profit.7y47sb'), value: data.data.profit_price || "" },
+                                    { name: this.$t('profit.profit.6a7t71'), value: data.data.level_name || "" },
+                                    { name: this.$t('profit-detail.profit-detail.kn8yye'), value: data.data.status_name || "" },
+                                    { name: this.$t('profit-detail.profit-detail.3jg81h'), value: data.data.commission_rules || "" },
+                                    { name: this.$t('user-order-detail.user-order-detail.h2c78h'), value: data.data.add_time || "" },
+                                    { name: this.$t('common.upd_time'), value: data.data.upd_time || "" },
+                                ],
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: "",
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "init")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+        },
+    };
+</script>
+<style></style>
diff --git a/pages/plugins/membershiplevelvip/profit/profit.css b/pages/plugins/membershiplevelvip/profit/profit.css
new file mode 100644
index 0000000..3f3dbac
--- /dev/null
+++ b/pages/plugins/membershiplevelvip/profit/profit.css
@@ -0,0 +1,6 @@
+/*
+* 导航
+*/
+.nav-base .item {
+    width: 25%;
+}
\ No newline at end of file
diff --git a/pages/plugins/membershiplevelvip/profit/profit.vue b/pages/plugins/membershiplevelvip/profit/profit.vue
new file mode 100644
index 0000000..382bef4
--- /dev/null
+++ b/pages/plugins/membershiplevelvip/profit/profit.vue
@@ -0,0 +1,260 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav-base bg-white">
+            <view v-for="(item, index) in nav_status_list" :key="index">
+                <view :class="'item fl tc ' + (nav_status_index == index ? 'cr-main' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+            </view>
+        </view>
+
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                    <view class="base oh br-b padding-bottom-main">
+                        <text class="cr-base">{{ item.add_time }}</text>
+                        <text class="fr cr-main">{{ item.status_name }}</text>
+                    </view>
+                    <view :data-value="'/pages/plugins/membershiplevelvip/profit-detail/profit-detail?id=' + item.id" @tap="url_event" class="content margin-top cp">
+                        <view v-for="(fv, fi) in content_list" :key="fi">
+                            <view class="single-text margin-top-xs">
+                                <text class="cr-grey margin-right-xl">{{ fv.name }}</text>
+                                <text class="cr-base">{{ item[fv.field] }}</text>
+                                <text v-if="(fv.unit || null) != null" class="cr-grey">{{ fv.unit }}</text>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                nav_status_list: [
+                    { name: this.$t('common.all'), value: "-1" },
+                    { name: this.$t('profit.profit.67o785'), value: "0" },
+                    { name: this.$t('profit.profit.l5knxu'), value: "1" },
+                    { name: this.$t('detail.detail.32171c'), value: "2" },
+                ],
+                nav_status_index: 0,
+                content_list: [
+                    { name: this.$t('order-detail.order-detail.x3ge6c'), field: "total_price" },
+                    { name: this.$t('profit.profit.7y47sb'), field: "profit_price" },
+                    { name: this.$t('profit.profit.6a7t71'), field: "level_name" },
+                ],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 是否指定状态
+            var nav_status_index = 0;
+            if ((params.status || null) != null) {
+                for (var i in this.nav_status_list) {
+                    if (this.nav_status_list[i]["value"] == params.status) {
+                        nav_status_index = i;
+                        break;
+                    }
+                }
+            }
+            this.setData({
+                params: params,
+                nav_status_index: nav_status_index,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 参数
+                var status = (this.nav_status_list[this.nav_status_index] || null) == null ? -1 : this.nav_status_list[this.nav_status_index]["value"]; // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("index", "profit", "membershiplevelvip"),
+                    method: "POST",
+                    data: {
+                        page: this.data_page,
+                        status: status,
+                        is_more: 1,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_status_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import "./profit.css";
+</style>
diff --git a/pages/plugins/membershiplevelvip/team/team.css b/pages/plugins/membershiplevelvip/team/team.css
new file mode 100644
index 0000000..a078c42
--- /dev/null
+++ b/pages/plugins/membershiplevelvip/team/team.css
@@ -0,0 +1,7 @@
+/*
+* 列表
+*/
+.data-list .item .base .avatar {
+    width: 40rpx;
+    height: 40rpx !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/membershiplevelvip/team/team.vue b/pages/plugins/membershiplevelvip/team/team.vue
new file mode 100644
index 0000000..b484b5d
--- /dev/null
+++ b/pages/plugins/membershiplevelvip/team/team.vue
@@ -0,0 +1,231 @@
+<template>
+    <view :class="theme_view">
+        <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                    <view class="base oh br-b padding-bottom-main">
+                        <image class="avatar dis-block fl circle" :src="item.avatar" mode="widthFix" @tap="avatar_event" :data-value="item.avatar"></image>
+                        <text class="cr-base margin-left-sm">{{ item.user_name_view || "" }}</text>
+                        <text class="cr-base fr">{{ item.add_time }}</text>
+                    </view>
+                    <view class="content margin-top">
+                        <block v-for="(fv, fi) in content_list" :key="fi">
+                            <view class="single-text margin-top-xs">
+                                <text class="cr-grey margin-right-xl">{{ fv.name }}</text>
+                                <text class="cr-base">{{ item[fv.field] }}</text>
+                                <text v-if="(fv.unit || null) != null" class="cr-grey">{{ fv.unit }}</text>
+                            </view>
+                        </block>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                content_list: [
+                    { name: this.$t('promotion-user.promotion-user.32bf15'), field: "order_total" },
+                    { name: this.$t('promotion-user.promotion-user.8n4tr3'), field: "find_order_total" },
+                    { name: this.$t('promotion-user.promotion-user.3l1187'), field: "referrer_count" },
+                    { name: this.$t('team.team.6h2l64'), field: "add_time" },
+                ],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("index", "team", "membershiplevelvip"),
+                    method: "POST",
+                    data: {
+                        page: this.data_page,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 头像查看
+            avatar_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value != null) {
+                    uni.previewImage({
+                        current: value,
+                        urls: [value],
+                    });
+                } else {
+                    app.globalData.showToast(this.$t('order.order.p3scy0'));
+                }
+            },
+        },
+    };
+</script>
+<style>
+    @import "./team.css";
+</style>
diff --git a/pages/plugins/membershiplevelvip/user/user.css b/pages/plugins/membershiplevelvip/user/user.css
new file mode 100644
index 0000000..af99e60
--- /dev/null
+++ b/pages/plugins/membershiplevelvip/user/user.css
@@ -0,0 +1,104 @@
+/*
+* 头部
+*/
+.head-item image {
+    width: 116rpx;
+    height: 116rpx !important;
+}
+
+.head-base .level-icon {
+    width: 30rpx;
+    height: 30rpx !important;
+    left: 16rpx;
+    top: 50%;
+    transform: translateY(-50%);
+}
+
+.vip-btn {
+    right: 0;
+    top: 50%;
+    transform: translateY(-50%);
+}
+
+.submit-buy {
+    /* height: 52rpx;
+    line-height: 52rpx; */
+    padding: 0 44rpx 0 24rpx;
+    background-color: rgba(0, 0, 0, 0.15) !important;
+    border-radius: 200rpx 0 0 200rpx;
+}
+
+.submit-buy .right-icon {
+    top: 64%;
+    /* #ifdef H5 */
+    top: 50%;
+    /* #endif */
+    transform: translateY(-50%);
+}
+
+.vip-badge {
+    height: 44rpx;
+    line-height: 44rpx;
+    padding: 0 16rpx 0 51rpx;
+    color: #FFAF36;
+}
+
+/*
+* 推广客户
+*/
+.promotion .item {
+    padding: 28rpx 20rpx;
+}
+
+.promotion .item:first-child {
+    background-color: #EAFEF7;
+}
+
+.promotion .item:last-child {
+    background-color: #EBF7FF;
+}
+
+.promotion .item .num {
+    font-size: 48rpx;
+}
+
+.promotion image {
+    width: 68rpx;
+    height: 68rpx !important;
+}
+
+.rebate .item .price {
+    font-size: 44rpx;
+}
+
+/*
+* 导航
+*/
+.nav .item {
+    padding: 32rpx 20rpx;
+}
+
+.nav .item image {
+    width: 100rpx;
+    height: 100rpx;
+}
+
+/*
+* 提示信息
+*/
+.tips-container .tips-item {
+    padding: 0 10rpx;
+}
+
+.tips-container .not-opening-vip-desc {
+    background: #def2fd;
+    border: 1px solid #cfeeff;
+    color: #1490d2;
+    padding: 10rpx;
+    font-size: 26rpx;
+    border-radius: 2px;
+}
+
+.uni-noticebar {
+    margin: 0 !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/membershiplevelvip/user/user.vue b/pages/plugins/membershiplevelvip/user/user.vue
new file mode 100644
index 0000000..e6f4f85
--- /dev/null
+++ b/pages/plugins/membershiplevelvip/user/user.vue
@@ -0,0 +1,359 @@
+<template>
+    <view :class="theme_view">
+        <component-nav-back propColor="#333"></component-nav-back>
+        <view v-if="(data_base || null) != null" class="weixin-nav-padding-top">
+            <view class="padding-top-xxxl">
+                <!-- 头部背景 -->
+                <image :src="membershiplevelvip_static_url + 'title-bg.png'" mode="widthFix" class="pa top-0 bg-img wh-auto" />
+                <view class="pr padding-top-main">
+                    <view class="padding-top-xxxl oh">
+                        <!-- 头部 -->
+                        <view class="head-box padding-main oh pr">
+                            <view class="head-item flex-row align-c">
+                                <image class="dis-block circle" @tap="preview_event" @error="user_avatar_error" :src="avatar" mode="widthFix"></image>
+                                <view class="head-name padding-left-main">
+                                    <text class="text-size cr-black fw-b">{{ nickname }}</text>
+                                    <view class="head-base margin-top-sm">
+                                        <!-- 已开通会员 -->
+                                        <block v-if="(user_vip || null) != null">
+                                            <!-- 付费购买 -->
+                                            <block v-if="(user_vip.user_vip_model || null) == 'pay'">
+                                                <view v-if="(user_vip || null) != null" class="single-text vip-badge round bg-black pr text-size-xss">
+                                                    <image v-if="(user_vip.icon || null) != null" class="level-icon pa" :src="user_vip.icon" mode="widthFix"></image>
+                                                    <text v-if="(user_vip.name || null) != null">{{ user_vip.level_name }}</text>
+                                                    <!-- 判断会员永久 -->
+                                                    <block v-if="(user_vip.is_permanent || 0) == 1">
+                                                        <text class="padding-horizontal-xs">|</text>
+                                                        <text>{{ user_vip.permanent_value }}{{ user_vip.permanent_unit }}</text>
+                                                    </block>
+                                                    <block v-else>
+                                                        <block v-if="(user_vip.surplus_time_number || 0) !== 0">
+                                                            <text class="padding-horizontal-xs">|</text>
+                                                            <text>{{ user_vip.surplus_time_number }}{{ user_vip.surplus_time_unit }}</text>
+                                                        </block>
+                                                    </block>
+                                                </view>
+                                            </block>
+                                            <block v-else>
+                                                <view v-if="(user_vip || null) != null" class="single-text vip-badge round bg-black pr text-size-xss">
+                                                    <image v-if="(user_vip.icon || null) != null" class="level-icon pa" :src="user_vip.icon" mode="widthFix"></image>
+                                                    <text v-if="(user_vip.name || null) != null">{{ user_vip.level_name }}</text>
+                                                </view>
+                                            </block>
+                                        </block>
+                                    </view>
+                                </view>
+                            </view>
+                            <!-- 已开通会员 -->
+                            <view class="pa vip-btn flex-row align-c">
+                                <text data-value="/pages/plugins/membershiplevelvip/member-code/member-code" @tap="url_event" class="cp">
+                                    <iconfont name="icon-qrcode" size="44rpx" color="#fff" propClass="padding-right-main pr bottom-md"></iconfont>
+                                </text>
+                                <block v-if="(user_vip || null) != null">
+                                    <!-- 判断会员永久 -->
+                                    <block v-if="(user_vip.is_permanent || 0) !== 1">
+                                        <!-- 会员已过期或未开通 -->
+                                        <block v-if="(user_vip.surplus_time_number || 0) == 0">
+                                            <button v-if="(data_base.is_user_buy || null) == 1" data-value="/pages/plugins/membershiplevelvip/buy/buy" @tap="url_event" class="submit-buy cr-white pr" type="default" size="mini" hover-class="none">{{$t('user.user.n4orgk')}}<iconfont name="icon-arrow-right" size="18rpx" propClass="pa right-icon"></iconfont></button>
+                                        </block>
+                                        <block v-else>
+                                            <block v-if="(user_vip.is_supported_renew || null) == null || user_vip.is_supported_renew != 1">
+                                                <block v-if="(data_base.is_supported_renew_old_order || null) == 1">
+                                                    <button size="mini" type="default" hover-class="none" class="submit-buy cr-white pr" @tap="uservip_renew_event" :disabled="submit_disabled_status">{{$t('user.user.k614v7')}}<iconfont name="icon-arrow-right" size="18rpx" propClass="pa right-icon"></iconfont>
+                                                    </button>
+                                                </block>
+                                                <block v-else>
+                                                    <block v-if="(data_base || null) != null && (data_base.is_user_buy || 0) == 1">
+                                                        <button data-value="/pages/plugins/membershiplevelvip/buy/buy" @tap="url_event" class="submit-buy cr-white pr" type="default" size="mini" hover-class="none">{{$t('user.user.65cc6z')}}<iconfont name="icon-arrow-right" size="18rpx" propClass="pa right-icon"></iconfont></button>
+                                                    </block>
+                                                </block>
+                                            </block>
+                                        </block>
+                                    </block>
+                                </block>
+                                <!-- 未开通会员 -->
+                                <block v-else>
+                                    <block v-if="(data_base || null) != null && (data_base.is_user_buy || 0) == 1">
+                                        <button data-value="/pages/plugins/membershiplevelvip/buy/buy" @tap="url_event" class="submit-buy cr-white pr" type="default" size="mini" hover-class="none">{{$t('user.user.n4orgk')}}<iconfont name="icon-arrow-right" size="18rpx" propClass="pa right-icon"></iconfont></button>
+                                    </block>
+                                </block>
+                            </view>
+                        </view>
+                    </view>
+
+                    <!-- 会员中心通知 -->
+                    <view v-if="(user_vip || null) != null && (data_base.user_vip_center_notice || null) != null && data_base.user_vip_center_notice.length > 0" class="padding-horizontal-main">
+                        <uni-notice-bar class="padding-0 margin-0" show-icon scrollable :text="data_base.user_vip_center_notice.join('')" background-color="transparent" color="#666" />
+                    </view>
+
+                    <view v-if="statistics_data !== null" class="padding-horizontal-main spacing-mt">
+                        <!-- 推广客户 -->
+                        <view class="promotion padding-sm border-radius-main bg-white pr spacing-mb">
+                            <view class="title-left-border text-size fw-b padding-vertical-sm padding-horizontal-main margin-left-sm">{{$t('user.user.76dcx6')}}</view>
+                            <view class="flex-row jc-sa align-c">
+                                <block v-for="(item, index) in statistics_data.user_total" :key="index">
+                                    <view class="flex-width-half">
+                                        <view class="item border-radius-main margin-sm flex-row jc-c align-c">
+                                            <image :src="item.icon" mode="widthFix" class="circle" />
+                                            <view class="flex-1 flex-width padding-left-main">
+                                                <view class="single-text margin-top-sm">
+                                                    <text class="num fw-b">{{ item.value }}</text>
+                                                    <text class="cr-grey-9 text-size-xs">{{$t('user.user.rjye50')}}</text>
+                                                </view>
+                                                <view class="cr-base text-size-xs single-text">{{ item.name }}</view>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </block>
+                            </view>
+                        </view>
+
+                        <!-- 返利概况 -->
+                        <view class="rebate profit-container padding-main border-radius-main bg-white">
+                            <view class="title-left-border text-size fw-b padding-vertical-sm padding-horizontal-main margin-left-sm">{{$t('user.user.981200')}}</view>
+                            <view class="oh tc flex-row jc-sa align-c">
+                                <block v-for="(item, index) in statistics_data.user_profit" :key="index">
+                                    <view class="item padding-main flex-1" :class="index + 1 === statistics_data.user_profit.length ? '' : 'divider-r-f5'">
+                                        <view class="single-text">
+                                            <text>
+                                                {{ item.first }}
+                                            </text>
+                                            <text class="fw-b price">
+                                                {{ item.value }}
+                                            </text>
+                                        </view>
+                                        <view class="cr-base text-size-xs margin-top-xs">{{ item.name }}</view>
+                                    </view>
+                                </block>
+                            </view>
+                        </view>
+                    </view>
+
+                    <!-- 导航 -->
+                    <view v-if="nav_list.length > 0" class="nav oh flex-row flex-wrap padding-sm">
+                        <block v-for="(item, index) in nav_list" :key="index">
+                            <view class="flex-width-half">
+                                <view class="item bg-white border-radius-main margin-sm">
+                                    <view :data-value="item.url" @tap="url_event" class="flex-row align-c cp">
+                                        <image :src="item.icon" mode="scaleToFill" class="dis-block"></image>
+                                        <view class="padding-left-main text-size fw-b flex-1 flex-width single-text">{{ item.title }}</view>
+                                    </view>
+                                </view>
+                            </view>
+                        </block>
+                    </view>
+                    <!-- 会员中心通知 -->
+                    <view v-if="(data_base.not_opening_vip_desc || null) != null && data_base.not_opening_vip_desc.length > 0" class="padding-horizontal-main padding-bottom-lg">
+                        <uni-notice-bar class="padding-0" show-icon scrollable :text="data_base.not_opening_vip_desc.join('')" background-color="transparent" color="#666" />
+                    </view>
+                </view>
+            </view>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNavBack from '@/components/nav-back/nav-back';
+    import componentNoData from '@/components/no-data/no-data';
+    var membershiplevelvip_static_url = app.globalData.get_static_url('membershiplevelvip', true) + 'app/';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                membershiplevelvip_static_url: membershiplevelvip_static_url,
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_base: null,
+                user_vip: null,
+                nav_list: [],
+                avatar: app.globalData.data.default_user_head_src,
+                nickname: this.$t('login.login.6yfr9g'),
+                submit_disabled_status: false,
+                // 推广客户，反力概况
+                statistics_data: null,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNavBack,
+            componentNoData,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        methods: {
+            init(e) {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                    this.set_user_base(user);
+                }
+            },
+            // 设置用户基础信息
+            set_user_base(user) {
+                if ((user.avatar || null) != null) {
+                    this.setData({ avatar: user.avatar });
+                }
+                if ((user.user_name_view || null) != null) {
+                    this.setData({ nickname: user.user_name_view });
+                }
+            },
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'vip', 'membershiplevelvip'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_base: data.base || null,
+                                user_vip: data.user_vip || null,
+                                nav_list: data.nav_list || [],
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: false,
+                                statistics_data: data.statistics_data || null,
+                            });
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 头像查看
+            preview_event() {
+                if (app.globalData.data.default_user_head_src != this.avatar) {
+                    uni.previewImage({
+                        current: this.avatar,
+                        urls: [this.avatar],
+                    });
+                }
+            },
+
+            // 头像加载错误
+            user_avatar_error(e) {
+                this.setData({
+                    avatar: app.globalData.data.default_user_head_src,
+                });
+            },
+
+            // 连续开通会员事件
+            uservip_renew_event(e) {
+                var self = this;
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('user.user.95s1ez'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('common.not_yet'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            // 请求生成支付订单
+                            self.setData({
+                                submit_disabled_status: true,
+                            });
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text'),
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url('renew', 'buy', 'membershiplevelvip'),
+                                method: 'POST',
+                                data: {},
+                                dataType: 'json',
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    self.setData({
+                                        submit_disabled_status: false,
+                                    });
+                                    if (res.data.code == 0) {
+                                        uni.setStorageSync(app.globalData.data.cache_page_pay_key, res.data.data.id);
+                                        app.globalData.url_open('/pages/plugins/membershiplevelvip/order/order', true);
+                                    } else {
+                                        if (app.globalData.is_login_check(res.data, self, 'uservip_renew_event')) {
+                                            app.globalData.showToast(res.data.msg);
+                                        }
+                                    }
+                                },
+                                fail: () => {
+                                    self.setData({
+                                        submit_disabled_status: false,
+                                    });
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 页面滚动监听
+            onPageScroll(res) {
+                uni.$emit('onPageScroll', res);
+            },
+        },
+    };
+</script>
+<style scoped>
+    @import './user.css';
+</style>
diff --git a/pages/plugins/ordergoodsform/order/order.css b/pages/plugins/ordergoodsform/order/order.css
new file mode 100644
index 0000000..1ab6523
--- /dev/null
+++ b/pages/plugins/ordergoodsform/order/order.css
@@ -0,0 +1,14 @@
+/*
+* 商品信息
+*/
+.goods .goods-base {
+    min-height: 160rpx;
+    margin-left: 180rpx;
+}
+.goods .goods-item:last-child {
+    border-bottom: 0;
+}
+.goods .goods-image {
+    width: 160rpx;
+    height: 160rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/ordergoodsform/order/order.vue b/pages/plugins/ordergoodsform/order/order.vue
new file mode 100644
index 0000000..f0f168f
--- /dev/null
+++ b/pages/plugins/ordergoodsform/order/order.vue
@@ -0,0 +1,156 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="data != null && data.length > 0">
+            <view class="padding-horizontal-main padding-top-main">
+                <!-- 商品列表 -->
+                <view class="goods bg-white padding-main border-radius-main spacing-mb">
+                    <view v-for="(item, index) in data" :key="index" :class="'goods-item oh padding-main '+(index > 0 ? 'br-t-dashed' : '')">
+                        <!-- 订单主体内容 -->
+                        <view :data-value="item.goods_url" @tap="url_event" class="cp">
+                            <image class="goods-image fl radius" :src="item.images" mode="aspectFill"></image>
+                            <view class="goods-base pr">
+                                <view class="multi-text">{{ item.title }}</view>
+                                <view v-if="item.spec != null" class="margin-top-xs cr-grey">{{ item.spec_text }}</view>
+                                <view class="margin-top-xs">
+                                    <text class="fw-b">{{ item.currency_data.currency_symbol }}{{ item.price }}</text>
+                                    <text class="margin-left-sm">x{{ item.buy_number }}</text>
+                                </view>
+                            </view>
+                        </view>
+                        <!-- 订单商品表单 -->
+                        <view v-if="(item.form_data || null) != null && item.form_data.length > 0" class="goods-item-ordergoodsform">
+                            <component-buy-ordergoodsform ref="buy_ordergoodsform" :propData="item.form_data" :propIsRead="true"></component-buy-ordergoodsform>
+                        </view>
+                        <view v-else class="text-size-xs cr-grey">{{$t('order.order.93j3zq')}}</view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+    import componentBuyOrdergoodsform from '@/components/buy-ordergoodsform/buy-ordergoodsform';
+
+    var common_static_url = app.globalData.get_static_url("common");
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                data_bottom_line_status: false,
+                data: [],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentBuyOrdergoodsform
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            // 获取数据
+            init() {
+                uni.showLoading({
+                    title: this.$t('common.loading_in_text'),
+                });
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("order", "goods", "ordergoodsform"),
+                    method: "POST",
+                    data: this.params,
+                    dataType: "json",
+                    success: (res) => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data || [];
+                            this.setData({
+                                data: data,
+                                data_list_loding_status: data.length == 0 ? 0 : 3,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "init")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import "./order.css";
+</style>
\ No newline at end of file
diff --git a/pages/plugins/orderresources/orderannex/orderannex.css b/pages/plugins/orderresources/orderannex/orderannex.css
new file mode 100644
index 0000000..3bcc6eb
--- /dev/null
+++ b/pages/plugins/orderresources/orderannex/orderannex.css
@@ -0,0 +1,18 @@
+.images-data-list .item {
+    gap: 40rpx 20rpx;
+}
+.images-data-list .item-content {
+    width: calc(25% - 21rpx);
+    height: 200rpx;
+}
+.images-data-list .item .image,
+.video-data-list .item .video {
+    height: calc(100% - 40rpx);
+}
+.video-data-list .item {
+    gap: 50rpx 20rpx;
+}
+.video-data-list .item-content {
+    width: 100%;
+    height: 440rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/orderresources/orderannex/orderannex.vue b/pages/plugins/orderresources/orderannex/orderannex.vue
new file mode 100644
index 0000000..b77f5a6
--- /dev/null
+++ b/pages/plugins/orderresources/orderannex/orderannex.vue
@@ -0,0 +1,169 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="(data || null) != null && ((data.images_data || null) != null || (data.video_data || null) != null || (data.file_data || null) != null || (data.note || null) != null)">
+            <!-- 图片 -->
+            <view v-if="(data.images_data || null) != null" class="images-data-list padding-vertical-main padding-left-main margin-bottom-lg">
+                <view class="fw-b text-size-sm margin-bottom padding-bottom-sm br-b">{{$t('common.image')}}</view>
+                <view class="item flex-row flex-wrap align-s gap-10">
+                    <view v-for="(item, index) in data.images_data" :key="index" class="item-content">
+                        <image :src="item" mode="aspectFill" class="image radius wh-auto" :data-value="item" @tap="image_show_event"></image>
+                        <view class="tc br-green cr-green round text-size-xs padding-vertical-xs" :data-value="item" @tap="text_copy_event">{{$t('common.copy_link')}}</view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 视频 -->
+            <view v-if="(data.video_data || null) != null" class="video-data-list padding-main margin-bottom-lg">
+                <view class="fw-b text-size-sm margin-bottom padding-bottom-sm br-b">{{$t('common.video')}}</view>
+                <view class="item flex-row flex-wrap align-s gap-10">
+                    <view v-for="(item, index) in data.video_data" :key="index" class="item-content">
+                        <video :src="item" class="video radius wh-auto"></video>
+                        <view class="tc br-green cr-green round text-size-xs padding-vertical-xs" :data-value="item" @tap="text_copy_event">{{$t('common.copy_link')}}</view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 文件 -->
+            <view v-if="(data.file_data || null) != null" class="file-data-list padding-main margin-bottom-lg">
+                <view class="fw-b text-size-sm margin-bottom padding-bottom-sm br-b">{{$t('common.file')}}</view>
+                <view class="item flex-row flex-wrap align-s gap-10">
+                    <view v-for="(item, index) in data.file_data" :key="index" class="item-content">
+                        <text :src="item.url">{{item.title}}</text>
+                        <text class="tc br-green cr-green round text-size-xs padding-vertical-xs padding-horizontal-sm margin-left-sm" :data-value="item.url" @tap="text_copy_event">{{$t('common.copy_link')}}</text>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 备注 -->
+            <view v-if="(data.note || null) != null" class="file-data-list padding-main margin-bottom-lg">
+                <view class="fw-b text-size-sm margin-bottom padding-bottom-sm br-b">{{$t('common.note')}}</view>
+                <view>{{data.note}}</view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </block>
+        <block v-else>
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                params: null,
+                data: null
+            };
+        },
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine
+        },
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params)
+            });
+            this.init();
+        },
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取公共数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'orderannex', 'orderresources'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data: data.data || null,
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: '',
+                                data_bottom_line_status: true,
+                                data_page: 1,
+                            });
+                            this.get_data_list();
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+
+            // 图片查看
+            image_show_event(e) {
+                app.globalData.image_show_event(e, this.data.images_data);
+            },
+
+            // 文本复制
+            text_copy_event(e) {
+                app.globalData.text_copy_event(e);
+            }
+        }
+    };
+</script>
+<style>
+    @import './orderannex.css';
+</style>
\ No newline at end of file
diff --git a/pages/plugins/points/index/index.css b/pages/plugins/points/index/index.css
new file mode 100644
index 0000000..59d6f2f
--- /dev/null
+++ b/pages/plugins/points/index/index.css
@@ -0,0 +1,85 @@
+/**
+* 顶部
+*/
+.points-content {
+    padding-top: 350rpx;
+}
+
+.points-user {
+    padding: 28rpx;
+}
+
+.points-user .avatar {
+    width: 100rpx;
+    height: 100rpx;
+}
+
+.points-user .share-submit {
+    width: 112rpx;
+    height: 52rpx;
+    line-height: 52rpx;
+    padding: 0;
+    background: #D8D8D8 linear-gradient(93deg, #FF9747 0%, #FF6E01 100%);
+    border-radius: 200rpx 0 0 200rpx;
+    top: 54rpx;
+    right: 0;
+}
+
+.points-integral {
+    padding: 28rpx 28rpx 0 28rpx;
+}
+
+.points-integral .item .list {
+    border-bottom: 2rpx solid #eee;
+    padding: 30rpx 0;
+}
+
+.points-integral .item .list:last-of-type {
+    border: 0;
+}
+
+/**
+ * 积分规则
+ */
+.rule-btn {
+    top: 140rpx;
+    width: 148rpx;
+    height: 52rpx;
+    padding: 0;
+    line-height: 52rpx;
+    background: rgba(0, 0, 0, 0.3);
+    border-radius: 200rpx 0 0 200rpx;
+}
+
+.rule {
+    padding: 56rpx 24rpx;
+    max-height: 50vh;
+}
+
+.rule .item {
+    padding-bottom: 100rpx;
+    max-height: calc(50vh - 164rpx);
+}
+
+.rule button {
+    margin: 20rpx 70rpx 42rpx 70rpx;
+    height: 80rpx;
+    line-height: 80rpx;
+}
+
+/**
+* 媒体查询
+*/
+@media only screen and (min-width:960px) {
+    .points-content {
+        /* #ifdef H5 */
+        padding-top: 51%;
+        /* #endif */
+    }
+
+    .rule-btn {
+        /* #ifdef H5 */
+        top: 11%;
+        /* #endif */
+    }
+}
\ No newline at end of file
diff --git a/pages/plugins/points/index/index.vue b/pages/plugins/points/index/index.vue
new file mode 100644
index 0000000..8ba7ca6
--- /dev/null
+++ b/pages/plugins/points/index/index.vue
@@ -0,0 +1,363 @@
+<template>
+    <view :class="theme_view">
+        <component-nav-back :propName="$t('index.index.t26j9z')"></component-nav-back>
+        <view v-if="(data_base || null) != null" class="weixin-nav-padding-top">
+            <view class="padding-top-xxxl">
+                <!-- 广告图片 -->
+                <view class="pa top-0 bg-img wh-auto">
+                    <block v-if="(data_base.right_images || null) != null">
+                        <image class="wh-auto advertisement" :src="points_static_url + 'integral-bg.png'" mode="widthFix" :data-value="data_base.right_images_url || ''" @tap="url_event"></image>
+                    </block>
+                    <block v-else>
+                        <image class="wh-auto advertisement" :src="points_static_url + 'integral-bg.png'" mode="widthFix" :data-value="data_base.right_images_url || ''" @tap="url_event"></image>
+                    </block>
+                </view>
+                <view class="pr padding-top-main">
+                    <view class="padding-horizontal-main points-content pr">
+                        <!-- 顶部 -->
+                        <view class="border-radius-main bg-white pr spacing-mb">
+                            <view class="points-user">
+                                <view class="flex-row">
+                                    <block v-if="(user || null) == null">
+                                        <image class="avatar dis-block circle" @tap="preview_event" :src="avatar_default" mode="widthFix"></image>
+                                        <view class="padding-left-main">
+                                            <view class="login-submit text-size fw-b" type="default" size="mini" @tap="login_event">{{$t('login.login.zy8tc4')}}</view>
+                                            <view class="desc margin-top-sm cr-grey-9">{{$t('index.index.z88r5s')}}</view>
+                                        </view>
+                                    </block>
+                                    <block v-else>
+                                        <image class="avatar dis-block circle" @tap="preview_event" :src="user.avatar || avatar_default" mode="widthFix"></image>
+                                        <view class="padding-left-main">
+                                            <view class="text-size fw-b">{{ user.user_name_view }}</view>
+                                            <view class="desc margin-top-sm cr-grey">
+                                                <text>{{$t('index.index.b46kge')}}</text>
+                                                <text class="cr-black fw-b padding-horizontal-xs">{{ user_integral.integral || 0 }}</text>
+                                                <text>{{$t('index.index.t26j9z')}}</text>
+                                            </view>
+                                        </view>
+                                    </block>
+                                </view>
+                                <!-- 分享 -->
+                                <button class="share-submit pa tc cr-white text-size-md" type="default" size="mini" @tap="share_event">{{$t('common.share')}}</button>
+                            </view>
+                            <block v-if="(data_base.is_home_points_record || 0) == 1 && (user || null) !== null">
+                                <view v-if="integral_list.length > 0" class="points-integral br-t-dashed">
+                                    <component-title :propTitle="$t('index.index.i73nwk')" propMoreUrl="/pages/user-integral/user-integral"></component-title>
+                                    <view class="item">
+                                        <view v-for="(item, index) in integral_list" class="list" :key="index">
+                                            <view class="flex-row jc-sb align-c">
+                                                <view class="cr-grey-9">{{$t('index.index.srd2ch')}}<text class="cr-black fw-b padding-left-sm">{{ item.original_integral }}</text>
+                                                    <text class="padding-horizontal-sm">/</text>{{$t('goods-category.goods-category.5p4ksj')}}<text class="cr-black fw-b padding-left-sm">{{ item.new_integral }}</text>
+                                                </view>
+                                                <view class="cr-grey-9">{{ item.add_time_time }}</view>
+                                            </view>
+                                            <view class="flex-row jc-sb align-c margin-top-main">
+                                                <view>{{ item.msg }}</view>
+                                                <view class="cr-main text-size fw-b" :class="item.type == 1 ? 'cr-green' : 'cr-red'">{{ item.type == 1 ? '+' : '-' }} {{ item.operation_integral }}</view>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </view>
+                                <block v-else>
+                                    <!-- 提示信息 -->
+                                    <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg" propLoadingLogoTop="26%"></component-no-data>
+                                </block>
+                            </block>
+                        </view>
+
+                        <!-- 公告信息 -->
+                        <button v-if="(data_base.points_desc || null) != null && data_base.points_desc.length > 0" class="rule-btn pa right-0 tc cr-white text-size-md" @tap="quick_open_event">{{$t('index.index.u5642g')}}</button>
+
+                        <!-- 商品兑换 -->
+                        <view v-if="(data_base.goods_exchange_data || null) != null && data_base.goods_exchange_data.length > 0">
+                            <component-goods-list :propData="{ style_type: 1, title: $t('index.index.f3l1xt'), url: '/pages/goods-search/goods-search', goods_list: data_base.goods_exchange_data }" propMoreUrlKey="url" :propCurrencySymbol="currency_symbol" :propGridBtnConfig="gridBtnConfig" :propIsOpenGridBtnSet="isOpenGridBtnSet"></component-goods-list>
+                        </view>
+
+                        <!-- 积分明细和商品兑换都没有的时候展示无数据提示 -->
+                        <block v-if="integral_list.length == 0 && (data_base.is_home_points_record || 0) != 1 && ((data_base.goods_exchange_data || null) === null || data_base.goods_exchange_data.length == 0)">
+                            <!-- 提示信息 -->
+                            <component-no-data :propStatus="0"></component-no-data>
+                        </block>
+                        <block v-else>
+                            <!-- 结尾 -->
+                            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+                        </block>
+                    </view>
+
+                    <!-- 积分规则弹窗 -->
+                    <component-popup v-if="(data_base.points_desc || null) != null && data_base.points_desc.length > 0" :propShow="popup_status" :propIsBar="propIsBar" propPosition="bottom" @onclose="quick_close_event">
+                        <view class="rule">
+                            <view class="cr-black text-size-md fw-b margin-bottom-main tc">{{$t('index.index.u5642g')}}</view>
+                            <scroll-view :scroll-y="true" class="item">
+                                <view v-for="(item, index) in data_base.points_desc" :key="index" class="cr-grey text-size-md">{{ item }}</view>
+                            </scroll-view>
+                            <button type="default" class="bg-main cr-white round text-size-md pa bottom-0 left-0 right-0" @tap="quick_close_event">{{$t('index.index.qbi72m')}}</button>
+                        </view>
+                    </component-popup>
+                </view>
+            </view>
+
+            <!-- 分享 -->
+            <component-share-popup ref="share"></component-share-popup>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNavBack from '@/components/nav-back/nav-back';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentGoodsList from '@/components/goods-list/goods-list';
+    import componentPopup from '@/components/popup/popup';
+    import componentTitle from '@/components/title/title';
+    import componentSharePopup from '@/components/share-popup/share-popup';
+    var points_static_url = app.globalData.get_static_url('points', true);
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                points_static_url: points_static_url,
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                currency_symbol: app.globalData.currency_symbol(),
+                params: null,
+                user: null,
+                data_base: null,
+                user_integral: null,
+                avatar_default: app.globalData.data.default_user_head_src,
+                // 自定义分享信息
+                share_info: {},
+                // 配置商品列表按钮
+                isOpenGridBtnSet: true,
+                gridBtnConfig: {
+                    name: this.$t('index.index.4v5nq5'),
+                    bg_color: app.globalData.get_theme_color(),
+                    padding: '8rpx 16rpx',
+                    border_radius: '8rpx',
+                },
+                // 规则弹窗
+                popup_status: false,
+                propIsBar: false,
+                // 积分明细
+                integral_list: [],
+            };
+        },
+        components: {
+            componentCommon,
+            componentNavBack,
+            componentNoData,
+            componentBottomLine,
+            componentGoodsList,
+            componentPopup,
+            componentTitle,
+            componentSharePopup
+        },
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+        },
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 用户信息
+            this.setData({
+                user: app.globalData.get_user_cache_info(),
+            });
+
+            // 初始化配置
+            this.init_config();
+
+            // 获取数据
+            this.get_data();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+        // 下拉刷新
+        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');
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'index', 'points'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_base: data.base || null,
+                                user_integral: data.user_integral || null,
+                            });
+                            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/points/index/index',
+                                        img: this.data_base.right_images,
+                                    },
+                                });
+
+                                // #ifndef MP-ALIPAY
+                                // 导航名称
+                                if ((this.data_base.application_name || null) != null) {
+                                    uni.setNavigationBarTitle({
+                                        title: this.data_base.application_name,
+                                    });
+                                }
+                                // #endif
+                            }
+                            
+                            // 已登录则获取积分明细
+                            if(this.user != null && (this.data_base || null) != null && parseInt(this.data_base.is_home_points_record || 0) == 1) {
+                                this.get_integral_data_list();
+                            } else {
+                                this.setData({
+                                    data_list_loding_msg: '',
+                                    data_list_loding_status: 3,
+                                    data_bottom_line_status: true,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                        }
+                        // 分享菜单处理
+                        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: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+
+            // 立即登录
+            login_event() {
+                // 获取用户信息
+                this.setData({
+                    user: app.globalData.get_user_info(this, 'login_event') || null,
+                });
+                // 获取积分明细
+                if(this.user != null) {
+                    this.get_integral_data_list();
+                }
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 头像查看
+            preview_event() {
+                if (app.globalData.data.default_user_head_src != this.user.avatar) {
+                    uni.previewImage({
+                        current: this.user.avatar,
+                        urls: [this.user.avatar],
+                    });
+                }
+            },
+
+            // 获取积分数据
+            get_integral_data_list(is_mandatory) {
+                if((this.data_base || null) != null && parseInt(this.data_base.is_home_points_record || 0) == 1) {
+                    uni.request({
+                        url: app.globalData.get_request_url('index', 'userintegral'),
+                        method: 'POST',
+                        data: {},
+                        dataType: 'json',
+                        success: (res) => {
+                            var integral_list = (res.data.code == 0 && res.data.data.data.length > 0) ? (res.data.data.data.length > 4 ? res.data.data.data.splice(0, 4) : res.data.data.data) : [];
+                            this.setData({
+                                integral_list: integral_list,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: true,
+                            });
+                        },
+                        fail: () => {
+                            this.setData({
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: true,
+                            });
+                        },
+                    });
+                }
+            },
+
+            // 弹层开启
+            quick_open_event(e) {
+                this.setData({
+                    popup_status: true,
+                });
+            },
+
+            // 弹层关闭
+            quick_close_event(e) {
+                this.setData({
+                    popup_status: false,
+                });
+            },
+
+            // 页面滚动监听
+            onPageScroll(res) {
+                uni.$emit('onPageScroll', res);
+            },
+
+            // 分享开启弹层
+            share_event(e) {
+                if ((this.$refs.share || null) != null) {
+                    this.$refs.share.init({
+                        share_info: this.share_info
+                    });
+                }
+            }
+        },
+    };
+</script>
+<style>
+    @import './index.css';
+</style>
diff --git a/pages/plugins/points/scan/scan.css b/pages/plugins/points/scan/scan.css
new file mode 100644
index 0000000..bbf88f5
--- /dev/null
+++ b/pages/plugins/points/scan/scan.css
@@ -0,0 +1,25 @@
+/**
+ * 基础
+ */
+.page-content {
+    background: #fff;
+}
+.scan-button {
+    background: linear-gradient( 270deg, #F1E6C1 0%, #DBC583 100%);
+    max-width: 300rpx;
+}
+.scan-button text {
+    color: #CC2121;
+}
+/**
+ * 扫码提示页面则使用黄色背景
+ */
+.page-content.page-bottom-fixed {
+    background: #FEEEC8;
+}
+/**
+ * 登录和扫码按钮增加页面底部间距
+ */
+.page-bottom-fixed {
+    padding-bottom: 100rpx !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/points/scan/scan.vue b/pages/plugins/points/scan/scan.vue
new file mode 100644
index 0000000..6be6de6
--- /dev/null
+++ b/pages/plugins/points/scan/scan.vue
@@ -0,0 +1,195 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data || null) != null" :class="'page-content min-ht '+((user == null || data.status == -10000) ? 'page-bottom-fixed' : '')">
+            <block v-if="data.status == -10000">
+                <!-- 顶部banner -->
+                <image v-if="(data_base.scan_top_banner || null) != null" :src="data_base.scan_top_banner" mode="widthFix" class="dis-block wh-auto auto"></image>
+                <!-- 底部图片 -->
+                <image v-if="(data_base.scan_bottom_images || null) != null" :src="data_base.scan_bottom_images" mode="widthFix" class="dis-block wh-auto auto"></image>
+                <!-- 扫码 -->
+                <!-- #ifndef H5 -->
+                <view v-if="user != null" class="pf left-0 bottom-xxxxl wh-auto tc padding-horizontal-main bs-bb">
+                    <view class="bottom-line-exclude">
+                        <button type="default" class="scan-button text-size-sm round" @tap="scan_event">
+                            <view class="va-m dis-inline-block margin-right-xs">
+                                <iconfont name="icon-scan" size="28rpx" propClass="lh-il va-m" color="#CC2121"></iconfont>
+                            </view>
+                            <text class="va-m">{{$t('common.scan_name')}}</text>
+                        </button>
+                    </view>
+                </view>
+                <!-- #endif -->
+                <!-- 结尾 -->
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            </block>
+            <block v-else>
+                <!-- 领取成功 -->
+                <block v-if="data.status == 0">
+                    <image v-if="(data_base.scan_success_images || null) != null" :src="data_base.scan_success_images" mode="widthFix" class="dis-block wh-auto auto"></image>
+                    <view class="margin-vertical-xxxl tc">{{data.msg}}</view>
+                </block>
+                <!-- 领取失败 -->
+                <block v-else-if="data.status == -100">
+                    <image v-if="(data_base.scan_fail_images || null) != null" :src="data_base.scan_fail_images" mode="widthFix" class="dis-block wh-auto auto"></image>
+                    <view class="margin-vertical-xxxl tc">{{data.msg}}</view>
+                </block>
+                <!-- 其他错误 -->
+                <block v-else>
+                    <component-no-data propStatus="0" :propMsg="data.msg"></component-no-data>
+                </block>
+            </block>
+            <!-- 未登录 -->
+            <view v-if="user == null" class="pf left-0 bottom-xxxxl wh-auto tc padding-horizontal-main bs-bb">
+                <view class="bottom-line-exclude">
+                    <button type="default" class="bg-main br-main cr-white text-size-sm round" @tap="login_event">{{$t('pages.login')}}</button>
+                </view>
+            </view>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                params: null,
+                user: null,
+                data_base: null,
+                data: null,
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 用户信息
+            this.setData({
+                user: app.globalData.get_user_cache_info(),
+            });
+
+            // 获取数据
+            this.get_data();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        methods: {
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'scan', 'points'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_base: data.base || null,
+                                data: data.data || null,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: (data.data || null) != null,
+                            });
+
+                            if ((this.data_base || null) != null) {
+                                // 基础自定义分享
+                                this.setData({
+                                    share_info: {
+                                        title: this.$t('pages.plugins-points-scan'),
+                                        path: '/pages/plugins/points/scan/scan'
+                                    }
+                                });
+                            }
+                        } 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: () => {
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 登录事件
+            login_event() {
+                var user = app.globalData.get_user_info(this, 'login_event');
+                this.setData({
+                    user: user || null,
+                });
+            },
+
+            // 扫码事件
+            scan_event() {
+                var self = this;
+                uni.scanCode({
+                    success: function (res) {
+                        if (res.result !== '') {
+                            var arr = ['/points-scan-index-id-', 'plugins/index/pluginsname/points/pluginscontrol/scan/pluginsaction/index/id/'];
+                            var ret = app.globalData.web_url_value_mate(res.result, arr);
+                            if (ret.status == 1 && ret.value != null) {
+                                var temp = self.params;
+                                temp['id'] = ret.value;
+                                self.setData({
+                                    params: temp
+                                });
+                                self.get_data();
+                            }
+                        }
+                    }
+                });
+            }
+        }
+    };
+</script>
+<style>
+    @import './scan.css';
+</style>
\ No newline at end of file
diff --git a/pages/plugins/realstore/batchorder-list/batchorder-list.css b/pages/plugins/realstore/batchorder-list/batchorder-list.css
new file mode 100644
index 0000000..170b1f8
--- /dev/null
+++ b/pages/plugins/realstore/batchorder-list/batchorder-list.css
@@ -0,0 +1,6 @@
+/*
+* 导航
+*/
+.nav-base .item {
+    width: 20%;
+}
\ No newline at end of file
diff --git a/pages/plugins/realstore/batchorder-list/batchorder-list.vue b/pages/plugins/realstore/batchorder-list/batchorder-list.vue
new file mode 100644
index 0000000..5ff454a
--- /dev/null
+++ b/pages/plugins/realstore/batchorder-list/batchorder-list.vue
@@ -0,0 +1,273 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav-base bg-white">
+            <block v-for="(item, index) in nav_status_list" :key="index">
+                <view v-if="nav_status_index == index" class="item fl tc cr-main nav-active-line" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+                <view v-else class="item fl tc" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+            </block>
+        </view>
+
+        <!-- 数据列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="list-item padding-horizontal-main padding-top-main border-radius-main bg-white oh spacing-mb">
+                    <view class="item-base oh br-b padding-bottom-main">
+                        <text class="fl cr-base">{{ item.add_time }}</text>
+                        <text class="fr cr-red"
+                            >{{ item.status_name }}<text v-if="(item.is_under_line_text || null) != null">（{{ item.is_under_line_text }}）</text></text
+                        >
+                    </view>
+                    <view class="br-b padding-vertical-main">
+                        <view class="cr-base">{{ item.name }}</view>
+                        <view v-if="(item.describe || null) != null" class="cr-grey margin-top-xs">{{ item.describe }}</view>
+                    </view>
+                    <block v-if="(item.detail_data || null) != null && item.detail_data.length > 0">
+                        <view v-for="(detail, di) in item.detail_data" :key="di" class="br-b-dashed oh padding-vertical-main">
+                            <block v-for="(fv, fi) in content_list" :key="fi">
+                                <view class="single-text margin-top-xs">
+                                    <text class="cr-grey margin-right-xl">{{ fv.name }}</text>
+                                    <text class="cr-base">{{ detail[fv.field] }}</text>
+                                    <text v-if="(fv.unit || null) != null" class="cr-grey">{{ fv.unit }}</text>
+                                </view>
+                            </block>
+                        </view>
+                    </block>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                nav_status_list: [
+                    { name: this.$t('common.all'), value: "-1" },
+                    { name: this.$t('profit.profit.3c7zmg'), value: "0" },
+                    { name: this.$t('batchorder-list.batchorder-list.25sh5e'), value: "1" },
+                    { name: this.$t('order.order.15lr5l'), value: "2" },
+                    { name: this.$t('order.order.6390gk'), value: "3" },
+                ],
+                nav_status_index: 0,
+                content_list: [
+                    { name: this.$t('form.form.xy87t8'), field: "describe" },
+                    { name: this.$t('common.note'), field: "note" },
+                    { name: this.$t('buy.buy.s7rr5s'), field: "upd_time" },
+                    { name: this.$t('invoice-detail.invoice-detail.rrfex6'), field: "status_name" },
+                ],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 是否指定状态
+            var nav_status_index = 0;
+            if ((params.status || null) != null) {
+                for (var i in this.nav_status_list) {
+                    if (this.nav_status_list[i]["value"] == params.status) {
+                        nav_status_index = i;
+                        break;
+                    }
+                }
+            }
+            this.setData({
+                params: params,
+                nav_status_index: nav_status_index,
+            });
+
+            // 数据加载
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            // 获取数据
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 参数
+                var status = (this.nav_status_list[this.nav_status_index] || null) == null ? -1 : this.nav_status_list[this.nav_status_index]["value"];
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("index", "batchorder", "realstore"),
+                    method: "POST",
+                    data: {
+                        page: this.data_page,
+                        status: status,
+                        oid: this.params.oid || 0,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_status_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+
+                // 重新拉取数据
+                this.get_data_list(1);
+            },
+        },
+    };
+</script>
+<style>
+    @import "./batchorder-list.css";
+</style>
diff --git a/pages/plugins/realstore/check/check.vue b/pages/plugins/realstore/check/check.vue
new file mode 100644
index 0000000..78c1fd2
--- /dev/null
+++ b/pages/plugins/realstore/check/check.vue
@@ -0,0 +1,157 @@
+<template>
+    <view :class="theme_view">
+        <view class="padding-main">
+            <form @submit="form_submit" class="form-container">
+                <view class="border-radius-main bg-white padding-main padding-bottom-xxxxl spacing-mb">
+                    <view class="title fw-b text-size margin-vertical-xxxl">{{$t('common.verification_text')}}</view>
+                    <view class="flex-row align-c padding-bottom-xl">
+                        <!-- #ifndef H5 -->
+                        <view class="margin-right" @tap="scan_event">
+                            <uni-icons type="scan" size="56rpx" color="#666"></uni-icons>
+                        </view>
+                        <!-- #endif -->
+                        <input type="text" class="wh-auto check-value" :placeholder="$t('common.verification_message')" placeholder-class="cr-grey-c" :value="check_value" @input="check_event" />
+                    </view>
+                </view>
+                <view class="padding-main">
+                    <button type="default" form-type="submit" hover-class="none" class="br-main bg-main cr-white round text-size-lg" :disabled="form_submit_loading">{{$t('common.confirm')}}</button>
+                </view>
+                <view class="padding-lg margin-top-xl text-size-lg tc">
+                    <text v-if="(error_msg || null) != null" class="cr-red">{{error_msg}}</text>
+                    <text v-if="(success_msg || null) != null" class="cr-green">{{success_msg}}</text>
+                </view>
+            </form>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                form_submit_loading: false,
+                check_value: '',
+                error_msg: '',
+                success_msg: ''
+            };
+        },
+        components: {
+            componentCommon
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        methods: {
+            // 获取数据
+            init() {
+                app.globalData.get_user_info(this, "init");
+            },
+
+            // 输入事件
+            check_event(e) {
+                this.setData({
+                    check_value: e.detail.value
+                });
+            },
+
+            // 扫码事件
+            scan_event(e) {
+                var self = this;
+                uni.scanCode({
+                	success: function (res) {
+                        if((res.result || null) != null) {
+                            self.setData({
+                                check_value: res.result
+                            });
+                            self.form_submit();
+                        }
+                	}
+                });
+            },
+
+            // 表单提交
+            form_submit() {
+                this.setData({
+                    error_msg: '',
+                    success_msg: ''
+                });
+                var form_data = {
+                    extraction_code: this.check_value
+                }
+                var validation = [
+                    { fields: 'extraction_code', msg: this.$t('common.verification_message') }
+                ];
+                if (app.globalData.fields_check(form_data, validation)) {
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    this.setData({
+                        form_submit_loading: true
+                    });
+                    var temp_code = this.check_value;
+                    uni.request({
+                        url: app.globalData.get_request_url('verification', 'adminorderallot', 'realstore'),
+                        method: 'POST',
+                        data: form_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                this.setData({
+                                    form_submit_loading: false,
+                                    check_value: '',
+                                    error_msg: '',
+                                    success_msg: res.data.msg+'（'+temp_code+'）',
+                                });
+                            } else {
+                                if (app.globalData.is_login_check(res.data, this, 'form_submit')) {
+                                    this.setData({
+                                        form_submit_loading: false,
+                                        error_msg: res.data.msg+'（'+temp_code+'）',
+                                        success_msg: '',
+                                    });
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_loading: false,
+                                error_msg: this.$t('common.internet_error_tips')+'（'+temp_code+'）',
+                                success_msg: '',
+                            });
+                        },
+                    });
+                }
+            }
+        }
+    };
+</script>
+<style scoped>
+    input.check-value {
+        height: 100rpx;
+        line-height: 100rpx;
+        font-size: 44rpx;
+    }
+</style>
\ No newline at end of file
diff --git a/pages/plugins/realstore/detail/detail.css b/pages/plugins/realstore/detail/detail.css
new file mode 100644
index 0000000..c7a61c2
--- /dev/null
+++ b/pages/plugins/realstore/detail/detail.css
@@ -0,0 +1,163 @@
+page {
+    background: #fff;
+}
+
+/**
+ * 头部内容
+ */
+.header-content {
+    margin-top: 20rpx;
+    box-shadow: 0 0 8px rgb(0 0 0 / 6%);
+    min-height: 242rpx;
+}
+.header-content .address-content {
+    max-width: calc(100% - 100rpx);
+}
+.header-content .icon-list {
+    right: 20rpx;
+    bottom: 20rpx;
+}
+.header-content .icon-list .icon-item {
+    width: 50rpx;
+    height: 50rpx;
+    line-height: 50rpx;
+}
+.header-content .icon-list .icon-item.red {
+    background-color: rgba(226, 44, 8, 0.08);
+}
+.header-content .icon-list .icon-item.green {
+    background-color: #EEF9E9;
+}
+.header-content .icon-item .badge-icon {
+    top: -10px;
+    right: 2px;
+}
+.header-content .icon-list .icon-item:not(:last-child) {
+    margin-right: 15rpx;
+}
+.header-content .logo {
+    width: 100rpx;
+}
+.header-content .base-right .title-length-limit {
+    max-width: calc(100% - 100rpx);
+}
+.header-content .base-right .title-length-limit .title-content.switch {
+    max-width: calc(100% - 44rpx);
+}
+.header-content .base-right .use-type-icon {
+    border-top-left-radius: 8rpx;
+    border-bottom-left-radius: 8rpx;
+    right: 0;
+    padding: 5rpx 10rpx 5rpx 20rpx;
+}
+
+/**
+ * 桌码
+ */
+.tablecode {
+    background: rgb(255 255 255 / 60%);
+    padding: 2rpx 20rpx;
+    /* #ifdef MP-ALIPAY || MP-TOUTIAO */
+    margin-top: 15rpx;
+    /* #endif */
+}
+
+/**
+* 左侧导航
+*/
+.left-content-actual {
+    padding-bottom: 160rpx;
+}
+.left-content {
+    width: 186rpx;
+}
+.left-content .item {
+    height: 80rpx;
+    line-height: 80rpx;
+    padding: 0 10rpx;
+    overflow: hidden;
+}
+.left-content .badge-icon {
+    top: -16rpx;
+    right: 26rpx;
+}
+
+/**
+*  右侧内容
+*/
+.right-content-actual {
+    padding-bottom: calc(145rpx + env(safe-area-inset-bottom));
+}
+.right-content-actual.base-mode-goods {
+    padding-bottom: calc(40rpx + env(safe-area-inset-bottom));
+}
+.goods-list-top-nav {
+    position: sticky;
+    top: 0;
+    right: 0;
+    z-index: 3;
+}
+.nav-sort-content .sort-item {
+    height: 80rpx;
+    line-height: 80rpx;
+    width: 20%;
+}
+.nav-sort-content .sort-item .sort-icon {
+    width: 26rpx;
+    height: 26rpx !important;
+}
+.goods-list .goods-img {
+    width: 160rpx;
+    height: 160rpx !important;
+}
+.goods-list .goods-base-content {
+    min-height: 100rpx;
+}
+.goods-list .goods-base .simple-desc {
+    line-height: 30rpx;
+    min-height: 30rpx;
+    max-height: 58rpx;
+}
+.goods-list .goods-base .sales-price {
+    width: calc(100% - 140rpx);
+}
+.goods-list .goods-base .buy-number {
+    min-width: 32rpx;
+}
+.goods-list .goods-item.item-highlight {
+    box-shadow: 0rpx 8rpx 12rpx 0px rgba(0, 0, 0, 0.06);
+    background: #F7FBF6 !important;
+}
+
+/**
+ * 独立模式下底部操作导航
+ */
+.button-list {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.button-list .item {
+    height: 70rpx;
+    padding: 0 40rpx;
+}
+.button-list .button-left {
+    display: flex;
+    width: 50%;
+    justify-content: space-evenly;
+}
+.button-list .button-right {
+    display: flex;
+    width: 50%;
+}
+.button-list .button-right button {
+    line-height: 70rpx;
+    padding: 0;
+}
+
+/**
+ * 阴影效果
+ */
+.box-shadow {
+    box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.05);
+}
\ No newline at end of file
diff --git a/pages/plugins/realstore/detail/detail.vue b/pages/plugins/realstore/detail/detail.vue
new file mode 100644
index 0000000..b193c92
--- /dev/null
+++ b/pages/plugins/realstore/detail/detail.vue
@@ -0,0 +1,1110 @@
+<template>
+    <view :class="theme_view">
+        <view class="pr">
+            <block v-if="(info || null) != null">
+                <!-- 头部背景 -->
+                <image :src="info.banner" mode="widthFix" class="header-bg wh-auto pa top-0 left-0 right-0" />
+                <!-- 头部 -->
+                <view class="header pr z-i">
+                    <component-nav-back :propIsShowBack="is_realstore_top_nav_back == 1" :propFixed="false" propColor="#333">
+                        <template slot="right" :class="is_top_search_width ? 'top-search-width' : 'flex-1 flex-width'">
+                            <view v-if="is_base_mode != 1" :class="'va-m wh-auto top-nav-search '+(is_realstore_top_nav_back == 1 ? 'padding-left-main' : '')">
+                                <block v-if="client_type == 'h5'">
+                                    <component-search @onsearch="search_button_event" :propIsRequired="false" propIconColor="#333" propPlaceholderClass="cr-grey-c" :propPlaceholder="$t('detail.detail.q42ger')" propBgColor="#fff"></component-search>
+                                </block>
+                                <block v-else>
+                                    <component-search
+                                        @onsearch="search_button_event"
+                                        @onicon="search_icon_event"
+                                        :propIsIconOnEvent="is_realstore_top_search_scan == 1"
+                                        :propIsOnEvent="true"
+                                        :propIsRequired="false"
+                                        :propIcon="is_realstore_top_search_scan == 1 ? 'icon-scan' : 'icon-qiandao-yixuan'"
+                                        propPlaceholderClass="cr-grey-c"
+                                        propBgColor="#fff"
+                                        propIconColor="#333"
+                                        :propPlaceholder="$t('detail.detail.q42ger')"
+                                    ></component-search>
+                                </block>
+                            </view>
+                        </template>
+                        <template slot="content">
+                            <!-- 桌码 -->
+                            <view v-if="(tablecode || null) != null" class="tablecode dis-inline-block margin-left-main round cr-red"> {{ tablecode.name }}({{ tablecode.code }}) </view>
+                        </template>
+                    </component-nav-back>
+                </view>
+                <view class="pr">
+                    <view class="header-top pr">
+                        <!-- 头部基础内容 -->
+                        <view class="header-content padding-horizontal-main">
+                            <view class="padding-main border-radius-main bg-white pr z-i-deep">
+                                <view class="base flex-row">
+                                    <!-- 基础内容 -->
+                                    <image :src="info.logo" mode="widthFix" class="logo border-radius-sm fl br" :data-value="info.logo" @tap="image_show_event"></image>
+                                    <view class="base-right padding-left-sm flex-1 flex-width">
+                                        <view v-if="is_base_mode != 1 && (info.buy_use_type_list || null) != null && info.buy_use_type_list.length > 0" class="use-type-icon pa text-size-xs cr-white bg-main tl" @tap="buy_use_type_event">
+                                            <text class="va-m margin-right-xs">{{ info.buy_use_type_list[buy_use_type_active_index]['name'] }}</text>
+                                            <view class="dis-inline-block va-m pr">
+                                                <iconfont name="icon-arrow-bottom" size="24rpx" color="#fff"></iconfont>
+                                            </view>
+                                        </view>
+                                        <view :class="'title ' + (is_base_mode != 1 && (info.buy_use_type_list || null) != null && info.buy_use_type_list.length > 0 ? 'title-length-limit' : '')" @tap="realstore_switch_event">
+                                            <view class="dis-inline-block va-m single-text title-content" :class="is_realstore_switch == 1 ? 'switch' : ''">
+                                                <text v-if="(info.alias || null) != null" class="va-m title-icon border-radius-sm br-main cr-main text-size-xs padding-left-sm padding-right-sm margin-right-xs">{{ info.alias }}</text>
+                                                <text class="va-m fw-b text-size">{{ info.name }}</text>
+                                            </view>
+                                            <view v-if="is_realstore_switch == 1" class="dis-inline-block va-m margin-left-xs">
+                                                <iconfont name="icon-transfer" size="36rpx" color="#666"></iconfont>
+                                            </view>
+                                        </view>
+                                        <view class="margin-top-xs text-size-xss cr-grey tl">
+                                            <view v-if="(info.status_info.time || null) != null">{{$t('detail.detail.dor2v9')}}{{ info.status_info.time }}</view>
+                                            <view v-if="(info.distance || null) != null">{{$t('extraction-address.extraction-address.42v8tv')}}{{ info.distance }}</view>
+                                        </view>
+                                    </view>
+                                </view>
+                                <view class="margin-top-sm cp br-t-dashed padding-top-sm">
+                                    <view class="flex-row jc-sb align-c">
+                                        <!-- 地址 -->
+                                        <view class="flex-row align-c flex-1 flex-width">
+                                            <iconfont name="icon-map-address" size="28rpx" propClass="pr top-xs"></iconfont>
+                                            <view class="address-content single-text cr-base margin-left-xs text-size-sm" :data-value="info.province_name + info.city_name + info.county_name + info.address" @tap="text_copy_event">
+                                                {{ info.province_name }}{{ info.city_name }}{{ info.county_name }}{{ info.address }}
+                                            </view>
+                                            <!-- #ifndef MP-KUAISHOU -->
+                                            <view v-if="info.lat != 0 && info.lng != 0" class="dis-inline-block tc cp border-radius-sm text-size-xss cr-green br-green padding-horizontal-xs margin-left-xs" @tap="address_map_event">{{$t('detail.detail.688i26')}}</view>
+                                            <!-- #endif -->
+                                        </view>
+                                        <!-- 右侧操作 -->
+                                        <view class="icon-list margin-left-main">
+                                            <view v-if="(data_base || null) != null && is_service_info == 1" class="icon-item green cr-green border-radius-sm dis-inline-block tc cp" @tap="popup_service_open_event">
+                                                <iconfont name="icon-mendian-kefu" size="26rpx"></iconfont>
+                                            </view>
+                                            <view :class="'icon-item red border-radius-sm dis-inline-block tc cp pr ' + (favor_info.status == 1 ? 'cr-red' : 'cr-grey-9')" @tap="favor_event">
+                                                <iconfont name="icon-mendian-sc" size="26rpx"></iconfont>
+                                                <view class="badge-icon pa">
+                                                    <component-badge :propNumber="favor_info.count"></component-badge>
+                                                </view>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+
+                    <!-- 门店基础模式 -->
+                    <view v-if="is_base_mode == 1 && is_base_mode_show_type == 2" class="nav-base bg-white fw-b margin-bottom-sm margin-top-sm">
+                        <block v-for="(item, index) in nav_base_list" :key="index">
+                            <view v-if="nav_base_index == index" class="item fl tc padding-horizontal-main cr-main nav-active-line" :data-index="index" @tap="nav_base_event">{{ item.name }}</view>
+                            <view v-else class="item fl tc padding-horizontal-main" :data-index="index" @tap="nav_base_event">{{ item.name }}</view>
+                        </block>
+                    </view>
+                    <!-- 门店基础模式 - 商品 -->
+                    <view v-if="is_base_mode == 1 && (is_base_mode_show_type == 0 || (is_base_mode_show_type == 2 && nav_base_index == 0))" class="padding-horizontal-main border-radius-main bg-white">
+                        <view v-if="is_base_mode_show_type == 0" class="padding-top-sm margin-bottom-sm margin-top-main">
+                            <view class="fw-b title-left-border">{{$t('goods-detail.goods-detail.dfge45')}}</view>
+                        </view>
+                        <scroll-view :scroll-y="true" class="cr-base text-size-sm" :style="content_style">
+                            <view class="right-content-actual base-mode-goods">
+                                <mp-html :content="info.describe" />
+                            </view>
+                        </scroll-view>
+                    </view>
+                    <block v-if="is_base_mode == 0 || (is_base_mode_show_type == 1 || (is_base_mode_show_type == 2 && nav_base_index == 1))">
+                        <!-- 左侧分类和右侧商品 -->
+                        <view class="content oh bg-white pr flex-row jc-sb" :style="content_style">
+                            <!-- 左侧 -->
+                            <scroll-view :scroll-y="true" class="left-content ht-auto bg-base">
+                                <view class="left-content-actual text-size-sm">
+                                    <view :class="'item tc cr-base cp ' + (nav_active_index == -1 ? 'bg-white cr-main nav-left-border fw-b' : '')" :data-index="-1" :data-itemindex="-1" @tap="nav_event">{{$t('common.all')}}</view>
+                                    <block v-if="(goods_category || null) != null && goods_category.length > 0">
+                                        <block v-for="(item, index) in goods_category" :key="index">
+                                            <view :class="'item tc cr-base pr cp ' + (nav_active_index == index ? 'bg-white cr-main nav-left-border fw-b' : '')" :data-index="index" :data-itemindex="-1" @tap="nav_event">
+                                                <text>{{ item.name }}</text>
+                                                <view v-if="(item.buy_number || 0) > 0" class="badge-icon pa">
+                                                    <component-badge :propNumber="item.buy_number"></component-badge>
+                                                </view>
+                                            </view>
+                                        </block>
+                                    </block>
+                                </view>
+                            </scroll-view>
+                            <!-- 右侧 -->
+                            <scroll-view :scroll-y="true" class="right-content ht-auto goods-list flex-1 flex-width" :scroll-top="scroll_top" @scroll="scroll_event" @scrolltolower="scroll_lower" lower-threshold="60">
+                                <view :class="'right-content-actual pr '+(is_base_mode == 1 ? 'base-mode-goods' : '')">
+                                    <!-- 操作导航 -->
+                                    <view class="goods-list-top-nav bg-white">
+                                        <!-- 排序 -->
+                                        <view class="nav-sort-content oh">
+                                            <block v-for="(item, index) in search_nav_sort_list" :key="index">
+                                                <view class="sort-item tc fl cp" :data-index="index" @tap="nav_sort_event">
+                                                    <text class="cr-base va-m text-size-sm">{{item.name}}</text>
+                                                    <image v-if="(item.icon || null) != null" class="sort-icon va-m" :src="common_static_url + 'sort-' + item.icon + '-icon.png'" mode="aspectFill"></image>
+                                                </view>
+                                            </block>
+                                        </view>
+                                        <!-- 二级分类 -->
+                                        <view v-if="(goods_category || null) != null && goods_category.length > 0 && nav_active_index != -1 && (goods_category[nav_active_index]['items'] || null) != null && goods_category[nav_active_index]['items'].length > 0" class="word-list scroll-view-horizontal padding-horizontal-main padding-bottom-main">
+                                            <scroll-view :scroll-x="true" :scroll-with-animation="true" :scroll-into-view="'two-nav-item-' + nav_active_item_index">
+                                                <view :class="'word-icon dis-inline-block text-size-sm round padding-top-xs padding-bottom-xs padding-left padding-right ' + (nav_active_item_index == -1 ? 'bg-main-light br-main-light cr-main' : 'br-grey cr-grey')" :data-index="nav_active_index" :data-itemindex="-1" @tap="nav_event">{{$t('common.all')}}</view>
+                                                <block v-for="(cv, ci) in goods_category[nav_active_index]['items']" :key="ci">
+                                                    <view :class="'word-icon dis-inline-block text-size-xs round padding-top-xs padding-bottom-xs padding-left padding-right ' + (nav_active_item_index != -1 && nav_active_item_index == ci ? 'bg-main-light br-main-light cr-main' : 'br-grey cr-grey')" :id="'two-nav-item-' + ci" :data-index="nav_active_index" :data-itemindex="ci" @tap="nav_event">{{ cv.name }}</view>
+                                                </block>
+                                            </scroll-view>
+                                        </view>
+                                    </view>
+                                    <!-- 右侧商品列表 -->
+                                    <block v-if="(data_list || null) != null && data_list.length > 0">
+                                        <block v-for="(item, index) in data_list" :key="index">
+                                            <view :class="'goods-item bg-white padding-main border-radius-main oh spacing-mb '+((item.is_highlight || 0) == 1 ? 'item-highlight' : '')">
+                                                <view :data-index="index" @tap="goods_event">
+                                                    <view class="flex-row jc-sb">
+                                                        <image :src="item.images" mode="widthFix" class="goods-img radius fl br"></image>
+                                                        <view class="goods-base flex-1 flex-width padding-left-sm flex-col jc-sb">
+                                                            <view class="goods-base-content">
+                                                                <view class="goods-title text-size-md multi-text fw-b">{{ item.title }}</view>
+                                                                <view v-if="(item.simple_desc || null) != null" class="simple-desc cr-grey-9 text-size-xs margin-top-xs single-text">{{ item.simple_desc }}</view>
+                                                            </view>
+                                                            <view class="margin-top-sm oh flex-row jc-sb align-c">
+                                                                <view class="single-text sales-price va-b va-m">
+                                                                    <text class="text-size-xss">{{ item.show_price_symbol }}</text>
+                                                                    <text class="text-size">{{ item.min_price }}</text>
+                                                                    <text class="text-size-xss cr-grey">{{ item.show_price_unit }}</text>
+                                                                </view>
+                                                                <view v-if="is_base_mode != 1" class="tc flex-row align-c">
+                                                                    <block v-if="(item.is_error || 0) == 0">
+                                                                        <view v-if="(item.buy_number || 0) > 0" class="cp pr top-sm" :data-index="index" data-type="0" @tap.stop="buy_number_event">
+                                                                            <iconfont name="icon-cart-dec" size="48rpx" :color="theme_color"></iconfont>
+                                                                        </view>
+                                                                        <view v-if="(item.buy_number || 0) > 0" class="buy-number cr-black text-size-sm padding-left-xs padding-right-xs">
+                                                                            {{ item.buy_number }}
+                                                                        </view>
+                                                                        <view class="cp pr top-sm" :data-index="index" data-type="1" @tap.stop="buy_number_event">
+                                                                            <iconfont name="icon-cart-inc" size="48rpx" :color="theme_color"></iconfont>
+                                                                        </view>
+                                                                    </block>
+                                                                    <block v-else>
+                                                                        <text class="cr-grey-c text-size-xs">{{ item.is_error_msg }}</text>
+                                                                    </block>
+                                                                </view>
+                                                            </view>
+                                                        </view>
+                                                    </view>
+                                                </view>
+                                            </view>
+                                        </block>
+                                    </block>
+                                    <block v-else>
+                                        <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg" :propBackBtn="false"></component-no-data>
+                                    </block>
+                                </view>
+                            </scroll-view>
+                        </view>
+
+                        <!-- 商品购买 -->
+                        <component-goods-buy ref="goods_buy" :propCurrencySymbol="currency_symbol" v-on:CartSuccessEvent="goods_spec_cart_back_event"></component-goods-buy>
+                    </block>
+
+                    <!-- 基础模式底部导航 -->
+                    <view v-if="is_base_mode == 1" class="plugins-realstore-detail-base-mode-nav z-i-deep bg-white pf left-0 bottom-0 wh-auto padding-main bs-bb br-top-shadow">
+                        <view class="bottom-line-exclude button-list">
+                            <view :class="'button-left tc '+(is_service_info == 1 ? '' : 'wh-auto')">
+                                <!-- #ifndef MP-KUAISHOU -->
+                                <view v-if="info.lat != 0 && info.lng != 0" propClass="item" @tap="address_map_event">
+                                    <view>
+                                        <iconfont name="icon-map-navigator" class="lh-sm" size="26rpx"></iconfont>
+                                    </view>
+                                    <view class="cr-base text-size-md">{{$t('detail.detail.688i26')}}</view>
+                                </view>
+                                <!-- #endif -->
+                                <view class="item" @tap="share_event">
+                                    <view>
+                                        <iconfont name="icon-share-square" propClass="lh-sm" size="26rpx"></iconfont>
+                                    </view>
+                                    <view class="cr-base text-size-md">{{$t('common.share')}}</view>
+                                </view>
+                            </view>
+                            <view v-if="is_service_info == 1" class="button-right">
+                                <button type="default" class="item br-main bg-main cr-white round text-size-md dis-block wh-auto" @tap="popup_service_open_event">{{$t('cart.cart.31h34v')}}</button>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </block>
+            <block v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </block>
+        </view>
+
+        <!-- 门店购物车 -->
+        <component-realstore-cart ref="realstore_cart" :propIsBaseMode="is_base_mode == 1" :propCurrencySymbol="currency_symbol" :propStatus="is_cart_nav" v-on:CartSuccessEvent="goods_opt_cart_back_event" v-on:BuyTypeSwitchEvent="buy_type_switch_event" v-on:CartDataBackEvent="cart_data_back_event"></component-realstore-cart>
+
+        <!-- 客服弹窗 -->
+        <component-popup :propShow="popup_service_status" propPosition="bottom" @onclose="popup_service_close_event">
+            <view class="padding-top-main bg-white">
+                <view class="padding-horizontal-main">
+                    <view class="close oh">
+                        <view class="fr" @tap.stop="popup_service_close_event">
+                            <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                        </view>
+                    </view>
+                </view>
+                <view class="popup-service-container">
+                    <view v-if="(info || null) != null && (data_base || null) != null && is_service_info == 1" class="header-service">
+                        <view v-if="(info.chat_info || null) != null" class="item padding-main single-text">
+                            <text class="va-m">{{$t('detail.detail.r4124d')}}</text>
+                            <view class="dis-inline-block chat-info cp" @tap="chat_event">
+                                <image class="dis-inline-block va-m" :src="info.chat_info.icon" mode="scaleToFill"></image>
+                                <text class="margin-left-sm va-m cr-blue" :data-value="info.chat_info.chat_url">{{ info.chat_info.name }}</text>
+                            </view>
+                        </view>
+                        <block v-if="(info.service_data || null) != null">
+                            <view v-if="(info.service_data.service_qq || null) != null" class="item padding-main br-t-f9 single-text">
+                                <text>Q Q：</text>
+                                <text class="cp" @tap="text_copy_event" :data-value="info.service_data.service_qq">{{ info.service_data.service_qq }}</text>
+                            </view>
+                            <view v-if="(info.service_data.service_tel || null) != null" class="item padding-main br-t-f9 single-text">
+                                <text>{{$t('order.order.7dxbm5')}}</text>
+                                <text class="cp" @tap="tel_event" :data-value="info.service_data.service_tel">{{ info.service_data.service_tel }}</text>
+                            </view>
+                            <view v-if="(info.service_data.service_weixin_qrcode || null) != null || (info.service_data.service_line_qrcode || null) != null" class="oh qrcode tc br-t-f9 padding-top-main">
+                                <view v-if="(info.service_data.service_weixin_qrcode || null) != null" class="item padding-bottom-lg dis-inline-block">
+                                    <image class="radius cp" :src="info.service_data.service_weixin_qrcode" mode="scaleToFill" @tap="image_show_event" :data-value="info.service_data.service_weixin_qrcode"></image>
+                                    <view>{{$t('detail.detail.54k10s')}}</view>
+                                </view>
+                                <view v-if="(info.service_data.service_line_qrcode || null) != null" class="item padding-bottom-lg dis-inline-block">
+                                    <image class="radius cp" :src="info.service_data.service_line_qrcode" mode="scaleToFill" @tap="image_show_event" :data-value="info.service_data.service_line_qrcode"></image>
+                                    <view>{{$t('detail.detail.vj4nom')}}</view>
+                                </view>
+                            </view>
+                        </block>
+                    </view>
+                </view>
+            </view>
+        </component-popup>
+
+        <!-- 分享弹窗 -->
+        <component-share-popup ref="share"></component-share-popup>
+
+        <!-- 公共 -->
+        <component-common ref="common" @onFooterHeight="footer_height_value_event" :propIsFooterSeat="false"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNavBack from '@/components/nav-back/nav-back';
+    import componentGoodsBuy from '@/components/goods-buy/goods-buy';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentSearch from '@/components/search/search';
+    import componentBadge from '@/components/badge/badge';
+    import componentPopup from '@/components/popup/popup';
+    import componentRealstoreCart from '@/components/realstore-cart/realstore-cart';
+    import componentSharePopup from '@/components/share-popup/share-popup';
+
+    var common_static_url = app.globalData.get_static_url('common');
+    var status_bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: app.globalData.get_theme_color(),
+                status_bar_height: status_bar_height,
+                common_static_url: common_static_url,
+                client_type: app.globalData.application_client_type(),
+                currency_symbol: app.globalData.currency_symbol(),
+                is_top_search_width: false,
+                // #ifdef MP-WEIXIN || MP-QQ || MP-ALIPAY || MP-BAIDU || MP-KUAISHOU || APP
+                is_top_search_width: true,
+                // #endif
+                content_style: '',
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_is_loading: 0,
+                is_base_mode: 0,
+                is_base_mode_show_type: 0,
+                is_cart_nav: false,
+                params: null,
+                is_first: 1,
+                scroll_top: 0,
+                scroll_top_old: 0,
+                info: null,
+                goods_category: [],
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                cart: null,
+                data_base: null,
+                favor_user: [],
+                tablecode: null,
+                search_keywords_value: '',
+                nav_active_index: -1,
+                nav_active_item_index: -1,
+                popup_service_status: false,
+                // 基础导航
+                nav_base_index: 0,
+                nav_base_list: [
+                    { name: this.$t('goods-detail.goods-detail.dfge45'), value: 0 },
+                    { name: this.$t('goods-detail.goods-detail.567uhg'), value: 1 },
+                ],
+                // 下单类型
+                buy_use_type_active_index: 0,
+                // 排序导航
+                search_nav_sort_index: 0,
+                search_nav_sort_list: [{
+                		name: this.$t('goods-category.goods-category.x69aow'),
+                		field: 'default',
+                		sort: 'asc',
+                		icon: null
+                	},
+                	{
+                		name: this.$t('goods-category.goods-category.at5p35'),
+                		field: 'sales_count',
+                		sort: 'asc',
+                		icon: 'default'
+                	},
+                	{
+                		name: this.$t('goods-category.goods-category.283ot0'),
+                		field: 'access_count',
+                		sort: 'asc',
+                		icon: 'default'
+                	},
+                	{
+                		name: this.$t('goods-category.goods-category.g2u3lf'),
+                		field: 'min_price',
+                		sort: 'asc',
+                		icon: 'default'
+                	},
+                	{
+                		name: this.$t('goods-category.goods-category.5p4ksj'),
+                		field: 'id',
+                		sort: 'asc',
+                		icon: 'default'
+                	}
+                ],
+                // 收藏信息
+                favor_info: {
+                    text: this.$t('goods-detail.goods-detail.dco1sc'),
+                    status: 0,
+                    count: 0,
+                },
+                // 门店客服信息展示
+                is_service_info: 0,
+                // 是否支持门店切换
+                is_realstore_switch: 0,
+                // 自定义分享信息
+                share_info: {},
+                // 是否单页预览
+                is_single_page: app.globalData.is_current_single_page() || 0,
+                // 顶部导航返回按钮
+                is_realstore_top_nav_back: app.globalData.data.is_realstore_top_nav_back || 0,
+                // #ifdef MP-TOUTIAO
+                is_realstore_top_nav_back : 0,
+                // #endif
+                is_realstore_top_search_scan: app.globalData.data.is_realstore_top_search_scan || 0,
+                // 底部菜单高度
+                footer_height_value: 0,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNavBack,
+            componentGoodsBuy,
+            componentNoData,
+            componentSearch,
+            componentBadge,
+            componentPopup,
+            componentRealstoreCart,
+            componentSharePopup
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            params = app.globalData.launch_params_handle(params);
+            // 是否指定门店id
+            var realstore_id = app.globalData.data.plugins_realstore_id || null;
+            if(realstore_id != null) {
+                params['id'] = realstore_id;
+            }
+            this.setData({
+                params: params,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 门店选择初始化
+            this.realstore_choice_init();
+
+            // 初始化配置
+            this.init_config();
+
+            // 获取数据
+            var self = this;
+            setTimeout(function() {
+                self.get_detail_init();
+            }, 100);
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+                data_list_loding_status: (this.data_list_loding_status == 2) ? 1 : this.data_list_loding_status
+            });
+            this.reset_scroll();
+            this.get_detail_init();
+        },
+
+        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');
+                }
+            },
+
+            // 门店选择初始化
+            realstore_choice_init() {
+                var key = app.globalData.data.cache_realstore_detail_choice_key;
+                var res = uni.getStorageSync(key) || null;
+                if(res != null && (res.data || null) != null && res.status == 1) {
+                    uni.setStorageSync(key, {
+                        data: res.data,
+                        status: 0
+                    });
+                    this.setData({
+                        params: {...this.params, ...{id: res.data.id}},
+                        info: res.data,
+                        is_first: 1,
+                        data_list: [],
+                        data_total: 0,
+                        data_page: 1,
+                        data_page_total: 0,
+                        data_is_loading: 0,
+                        data_list_loding_status: 1,
+                        data_bottom_line_status: false
+                    });
+                    this.source_goods_remove();
+                    this.reset_scroll();
+                }
+            },
+
+            // 获取数据-初始化
+            get_detail_init(params = {}) {
+                // 网络检查
+                if((params || null) == null || (params.loading || 0) == 0) {
+                    app.globalData.network_type_handle(this, 'get_detail_init');
+                    return false;
+                }
+
+                // 请求数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'detail', 'realstore'),
+                    method: 'POST',
+                    data: this.$refs.realstore_cart.request_params_merge(
+                        {
+                            id: ((this.info || null) == null) ? (this.params.id || 0) : (this.info.id || 0),
+                        }, 'init'),
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            // 门店数据
+                            var data = res.data.data;
+                            // 基础配置
+                            var data_base = data.base || {};
+
+                            this.setData({
+                                is_service_info: parseInt(data_base.is_service_info || 0),
+                                is_realstore_switch: parseInt(data_base.is_realstore_switch || 0),
+                                is_base_mode: parseInt(data.is_base_mode || 0),
+                                is_base_mode_show_type: parseInt(data.is_base_mode_show_type || 0),
+                                is_cart_nav: true,
+                                data_base: data_base,
+                                info: data.info || null,
+                                goods_category: data.goods_category || [],
+                                favor_user: data.favor_user || [],
+                                tablecode: data.tablecode || null
+                            });
+                            
+                            // 样式处理
+                            this.content_actual_size_handle();
+
+                            // 收藏处理
+                            if ((this.info || null) != null) {
+                                // 收藏信息
+                                var status = this.favor_user.indexOf(this.info.id) != -1 ? 1 : 0;
+                                this.setData({
+                                    favor_info: {
+                                        count: this.info.favor_count || 0,
+                                        status: status,
+                                        text: (status == 1 ? this.$t('goods-detail.goods-detail.by7052') : '') + this.$t('goods-detail.goods-detail.dco1sc'),
+                                    },
+                                });
+
+                                // #ifndef MP-ALIPAY
+                                // 标题名称
+                                uni.setNavigationBarTitle({
+                                    title: this.info.name,
+                                });
+                                // #endif
+
+                                // 基础自定义分享
+                                this.setData({
+                                    share_info: {
+                                        title: this.info.seo_title || this.info.name,
+                                        desc: this.info.seo_desc || this.info.describe,
+                                        path: '/pages/plugins/realstore/detail/detail',
+                                        query: 'id=' + this.info.id,
+                                        img: this.info.share_images || this.info.logo,
+                                    },
+                                });
+
+                                // 是否基础模式
+                                if(this.is_base_mode != 1) {
+                                    // 获取购物车数据
+                                    this.get_cart_data();
+                                }
+
+                                // 下单类型索引
+                                var type_data = this.buy_use_type_data();
+                                this.setData({
+                                    buy_use_type_active_index: type_data.active_index,
+                                });
+
+                                // 获取数据、仅首次调用，获取列表接口
+                                if (this.is_first == 1) {
+                                    // 是否基础模式
+                                    if(this.is_base_mode != 1 || this.is_base_mode_show_type != 0) {
+                                        this.get_data_list();
+                                    }
+                                    // 非首次记录
+                                    this.setData({
+                                        is_first: 0,
+                                    });
+                                }
+                            }
+                        } else {
+                            this.setData({
+                                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_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 获取数据-商品列表
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                });
+
+                // 请求参数
+                var post_data = {
+                    id: this.info.id || 0,
+                    page: this.data_page,
+                    keywords: this.search_keywords_value,
+                };
+                // 分类id
+                var temp_category = this.goods_category;
+                if (this.nav_active_item_index != -1) {
+                    post_data['category_id'] = temp_category[this.nav_active_index]['items'][this.nav_active_item_index]['id'];
+                } else {
+                    post_data['category_id'] = this.nav_active_index == -1 ? 0 : temp_category[this.nav_active_index]['id'];
+                }
+                // 排序
+                var temp_index = this.search_nav_sort_index;
+                var temp_search_nav_sort = this.search_nav_sort_list;
+                post_data['order_by_type'] = temp_search_nav_sort[temp_index]['sort'] == 'desc' ? 'asc' : 'desc';
+                post_data['order_by_field'] = temp_search_nav_sort[temp_index]['field'];
+                // 指定商品
+                if((this.params.source_goods_id || null) != null) {
+                    post_data['source_goods_id'] = this.params.source_goods_id;
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('datalist', 'detail', 'realstore'),
+                    method: 'POST',
+                    data: this.$refs.realstore_cart.request_params_merge(post_data, 'data'),
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            // 列表数据处理
+                            if (data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: data.total,
+                                    data_page_total: data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_is_loading: 0,
+                                });
+                                if (this.data_page <= 1) {
+                                    this.setData({
+                                        data_list: [],
+                                        data_bottom_line_status: false,
+                                    });
+                                }
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                                data_is_loading: 0,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 样式处理
+            content_actual_size_handle() {
+                // 基础模式内容高度处理
+                var value = 0;
+                if(this.is_base_mode == 1) {
+                    value = (this.is_base_mode_show_type == 1) ? 110 : 220;
+                }
+                // 内容高度
+                value += (this.client_type == 'h5') ? 370 : 352;
+                // 桌码
+                if(this.tablecode != null) {
+                    value += 44;
+                }
+
+                // 减去内容高度、底部菜单高度
+                this.setData({
+                    content_style: 'height: calc(100vh - '+value+'rpx - '+(this.status_bar_height+this.footer_height_value)+'px);',
+                });
+            },
+
+            // 收藏事件
+            favor_event(e) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                var user = app.globalData.get_user_info(this, 'favor_event');
+                if (user != false) {
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('reversal', 'favor', 'realstore'),
+                        method: 'POST',
+                        data: {
+                            id: this.info.id,
+                        },
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                this.setData({
+                                    favor_info: res.data.data,
+                                });
+                                app.globalData.showToast(res.data.msg, 'success');
+                            } else {
+                                if (app.globalData.is_login_check(res.data, this, 'favor_event')) {
+                                    app.globalData.showToast(res.data.msg);
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 列表数据操作
+            buy_number_event(e) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                var user = app.globalData.get_user_info(this, 'buy_number_event', e);
+                if (user != false) {
+                    var index = e.currentTarget.dataset.index;
+                    var type = parseInt(e.currentTarget.dataset.type) || 0;
+                    var temp_goods = this.data_list[index];
+                    // 是否存在多规格
+                    if ((temp_goods.is_exist_many_spec || 0) != 0) {
+                        // 是否购物车中操作
+                        if (type == 0) {
+                            this.$refs.realstore_cart.cart_event(true);
+                            app.globalData.showToast(this.$t('goods-category.goods-category.gy7y0w'));
+                        } else {
+                            if ((this.$refs.goods_buy || null) != null) {
+                                var buy_params = this.params;
+                                var type_data = this.buy_use_type_data();
+                                buy_params['buy_event_type'] = 'cart';
+                                buy_params['buy_use_type_data_index'] = type_data.data_index;
+                                buy_params['realstore_id'] = this.info.id;
+                                this.$refs.goods_buy.init(temp_goods, buy_params);
+                            }
+                        }
+                        return false;
+                    }
+
+                    // 数据操作处理
+                    this.buy_number_event_handle(e, type, temp_goods);
+                }
+            },
+
+            // 多规格加入购物车成功回调
+            goods_spec_cart_back_event(params) {
+                // 重新获取购物车数据
+                this.get_cart_data();
+                // 更新列表数据处理
+                this.cart_data_list_handle(params, 1);
+            },
+
+            // 购物车操作成功回调
+            goods_opt_cart_back_event(params) {
+                // 更新列表数据处理
+                this.cart_data_list_handle(params);
+            },
+
+            // 购物车数据获取成功回调
+            cart_data_back_event(params) {
+                var temp_data_list = this.data_list;
+                if (temp_data_list.length > 0) {
+                    for (var i in temp_data_list) {
+                        // 非追加则赋值0
+                        temp_data_list[i]['buy_number'] = 0;
+                        // 对应商品叠加数量
+                        if((params || null) != null && (params.data || null) != null && params.data.length > 0) {
+                            for (var x in params.data) {
+                                if (params.data[x]['goods_id'] == temp_data_list[i]['id']) {
+                                    temp_data_list[i]['buy_number'] += parseInt(params.data[x]['stock'] || 0);
+                                }
+                            }
+                        }
+                    }
+                    this.setData({
+                        data_list: temp_data_list,
+                    });
+                }
+            },
+
+            // 更新列表数据处理
+            // params 操作数据
+            // is_append 是否追加数据（0否、1是）
+            cart_data_list_handle(params, is_append = 0) {
+                var temp_data_list = this.data_list;
+                if (temp_data_list.length > 0) {
+                    for (var i in temp_data_list) {
+                        // 非追加则赋值0
+                        if(is_append == 0 && (params.type || null) != 'save') {
+                            temp_data_list[i]['buy_number'] = 0;
+                        }
+                        // 对应商品叠加数量
+                        if (params.goods_id == temp_data_list[i]['id']) {
+                            temp_data_list[i]['buy_number'] += parseInt(params.stock || 0);
+                        }
+                    }
+                    this.setData({
+                        data_list: temp_data_list,
+                    });
+                }
+            },
+
+            // 获取购物车数据
+            get_cart_data() {
+                this.$refs.realstore_cart.init({...{source: 'realstore', base: this.data_base, info: this.info}, ...this.params});
+            },
+
+            // 列表数量事件处理
+            buy_number_event_handle(e, type, goods, spec = '') {
+                // 调用门店购物车方法处理
+                this.$refs.realstore_cart.goods_opt_handle(type, goods, spec, 'buy_number', e);
+            },
+
+            // 搜索事件
+            search_button_event(e) {
+                this.setData({
+                    search_keywords_value: e || '',
+                    data_page: 1,
+                });
+                this.source_goods_remove();
+                this.reset_scroll();
+                this.get_data_list(1);
+            },
+
+            // 搜索icon扫码事件、扫码商品id实现加入购物车
+            search_icon_event(e) {
+                this.$refs.realstore_cart.search_icon_handle(e);
+            },
+
+            // 剪切板
+            text_copy_event(e) {
+                app.globalData.text_copy_event(e);
+            },
+
+            // 地图查看
+            address_map_event(e) {
+                var info = this.info || {};
+                if (info.lat == 0 || info.lng == 0) {
+                    app.globalData.showToast(this.$t('user-order-detail.user-order-detail.i876o3'));
+                    return false;
+                }
+                var address = (info.province_name || '') + (info.city_name || '') + (info.county_name || '') + (info.address || '');
+                app.globalData.open_location(info.lng, info.lat, info.name, address);
+            },
+
+            // 电话
+            tel_event(e) {
+                app.globalData.call_tel(e);
+            },
+
+            // 图片预览
+            image_show_event(e) {
+                app.globalData.image_show_event(e);
+            },
+
+            // 进入客服系统
+            chat_event() {
+                app.globalData.chat_entry_handle(this.info.chat_info.chat_url);
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_active_index: e.currentTarget.dataset.index,
+                    nav_active_item_index: e.currentTarget.dataset.itemindex,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.source_goods_remove();
+                this.reset_scroll();
+                this.get_data_list(1);
+            },
+
+            // 重置滑动位置
+            reset_scroll() {
+                this.setData({
+                    scroll_top: this.scroll_top_old,
+                });
+                this.$nextTick(() => {
+                    this.setData({
+                        scroll_top: 0,
+                    });
+                });
+            },
+
+            // 滑动事件位置记录
+            scroll_event(e) {
+                this.setData({
+                    scroll_top_old: e.detail.scrollTop,
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 排序事件
+            nav_sort_event(e) {
+            	var index = e.currentTarget.dataset.index || 0;
+            	var temp_search_nav_sort = this.search_nav_sort_list;
+            	var temp_sort = temp_search_nav_sort[index]['sort'] == 'desc' ? 'asc' : 'desc';
+            	for (var i in temp_search_nav_sort) {
+            		if (i != index) {
+            			if (temp_search_nav_sort[i]['icon'] != null) {
+            				temp_search_nav_sort[i]['icon'] = 'default';
+            			}
+            			temp_search_nav_sort[i]['sort'] = 'desc';
+            		}
+            	}
+            	temp_search_nav_sort[index]['sort'] = temp_sort;
+            	if (temp_search_nav_sort[index]['icon'] != null) {
+            		temp_search_nav_sort[index]['icon'] = temp_sort;
+            	}
+
+            	this.setData({
+            		search_nav_sort_index: index,
+            		search_nav_sort_list: temp_search_nav_sort,
+            		data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+            	});
+                this.source_goods_remove();
+                this.reset_scroll();
+            	this.get_data_list(1);
+            },
+
+            // 来源商品清空
+            source_goods_remove() {
+                // 存在参数指定来源商品id则清空
+                if((this.params.source_goods_id || null) != null) {
+                    var temp_params = this.params;
+                    delete temp_params['source_goods_id'];
+                    this.setData({
+                        params: temp_params
+                    });
+                }
+            },
+
+            // 使用类型事件
+            buy_use_type_event(e) {
+                this.$refs.realstore_cart.buy_use_type_event();
+            },
+
+            // 下单类型切换事件回调
+            buy_type_switch_event(params) {
+                this.setData({
+                    buy_use_type_active_index: params.buy_use_type_active_index,
+                    data_page: 1,
+                });
+                this.reset_scroll();
+                this.get_data_list(1);
+            },
+
+            // 获取使用类型数据索引、默认在店0
+            buy_use_type_data() {
+                return this.$refs.realstore_cart.buy_use_type_data();
+            },
+
+            // 商品事件
+            goods_event(e) {
+                // 是否可以打开商品页面
+                if(app.globalData.data.is_realstore_forbid_to_goods_detail != 1) {
+                    // 商品数据缓存处理
+                    var goods = this.data_list[e.currentTarget.dataset.index];
+                    app.globalData.goods_data_cache_handle(goods.id, goods);
+
+                    // 调用公共打开url地址
+                    var type_data = this.buy_use_type_data();
+                    var url = '/pages/goods-detail/goods-detail?id=' + goods.id + '&is_opt_back=1&buy_use_type_data_index=' + type_data.data_index + '&realstore_id=' + this.info.id;
+                    app.globalData.url_open(url);
+                }
+            },
+
+            // 门店切换事件
+            realstore_switch_event (e) {
+                if(this.is_realstore_switch == 1) {
+                    app.globalData.url_open('/pages/plugins/realstore/search/search?is_choice_mode=1&show_type_mode=1');
+                }
+            },
+
+            // 开启客服弹层
+            popup_service_open_event(e) {
+                this.setData({
+                    popup_service_status: true,
+                });
+            },
+
+            // 关闭客服弹层
+            popup_service_close_event(e) {
+                this.setData({
+                    popup_service_status: false,
+                });
+            },
+
+            // 分享开启弹层
+            share_event(e) {
+                if ((this.$refs.share || null) != null) {
+                    this.$refs.share.init({
+                        share_info: this.share_info
+                    });
+                }
+            },
+
+            // 基础导航事件
+            nav_base_event(e) {
+                this.setData({
+                    nav_base_index: e.currentTarget.dataset.index,
+                });
+            },
+
+            // 底部菜单高度
+            footer_height_value_event(value) {
+                this.setData({
+                    footer_height_value: value
+                });
+                this.content_actual_size_handle();
+            }
+        },
+    };
+</script>
+<style>
+    @import './detail.css';
+</style>
diff --git a/pages/plugins/realstore/favor/favor.css b/pages/plugins/realstore/favor/favor.css
new file mode 100644
index 0000000..59b5e28
--- /dev/null
+++ b/pages/plugins/realstore/favor/favor.css
@@ -0,0 +1,8 @@
+.base {
+    min-height: 140rpx;
+    margin-left: 160rpx;
+}
+.logo {
+    width: 140rpx;
+    height: 140rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/realstore/favor/favor.vue b/pages/plugins/realstore/favor/favor.vue
new file mode 100644
index 0000000..cb3c3f1
--- /dev/null
+++ b/pages/plugins/realstore/favor/favor.vue
@@ -0,0 +1,262 @@
+<template>
+    <view :class="theme_view">
+        <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="padding-main border-radius-main oh bg-white spacing-mb">
+                    <view :data-value="'/pages/plugins/realstore/detail/detail?id=' + item.realstore_info.id" @tap="url_event" class="cp">
+                        <image class="logo fl radius" :src="item.realstore_info.logo" mode="aspectFill"></image>
+                        <view class="base">
+                            <view class="single-text fw-b">{{item.realstore_info.name}}</view>
+                            <view class="multi-text cr-grey margin-top-sm">{{item.realstore_info.describe}}</view>
+                        </view>
+                    </view>
+                    <button class="br-yellow cr-yellow bg-white fr round" type="default" size="mini" @tap="cancel_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('common.cancel')}}</button>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            // 获取数据
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+                
+                // 是否加载中
+                if(this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1
+                });
+                
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+                
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("index", "favor", "realstore"),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page
+                    },
+                    dataType: 'json',
+                    success: res => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0
+                                });
+                                
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total)
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_is_loading: 0
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    }
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 取消
+            cancel_event(e) {
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('order.order.pn78ns'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('recommend-list.recommend-list.w9460o'),
+                    success: result => {
+                        if (result.confirm) {
+                            // 参数
+                            var id = e.currentTarget.dataset.value;
+                            var index = e.currentTarget.dataset.index;
+                            
+                            // 加载loding
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text')
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url("delete", "favor", "realstore"),
+                                method: 'POST',
+                                data: {
+                                    ids: id
+                                },
+                                dataType: 'json',
+                                success: res => {
+                                    uni.hideLoading();
+
+                                    if (res.data.code == 0) {
+                                        var temp_data_list = this.data_list;
+                                        temp_data_list.splice(index, 1);
+                                        this.setData({
+                                            data_list: temp_data_list
+                                        });
+                                        if (temp_data_list.length == 0) {
+                                            this.setData({
+                                                data_list_loding_status: 0,
+                                                data_bottom_line_status: false
+                                            });
+                                        }
+                                        app.globalData.showToast(res.data.msg, 'success');
+                                    } else {
+                                        if (app.globalData.is_login_check(res.data)) {
+                                            app.globalData.showToast(res.data.msg);
+                                        } else {
+                                            app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                        }
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                }
+                            });
+                        }
+                    }
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        }
+    };
+</script>
+<style>
+    @import './favor.css';
+</style>
\ No newline at end of file
diff --git a/pages/plugins/realstore/frequencycard-list/frequencycard-list.css b/pages/plugins/realstore/frequencycard-list/frequencycard-list.css
new file mode 100644
index 0000000..170b1f8
--- /dev/null
+++ b/pages/plugins/realstore/frequencycard-list/frequencycard-list.css
@@ -0,0 +1,6 @@
+/*
+* 导航
+*/
+.nav-base .item {
+    width: 20%;
+}
\ No newline at end of file
diff --git a/pages/plugins/realstore/frequencycard-list/frequencycard-list.vue b/pages/plugins/realstore/frequencycard-list/frequencycard-list.vue
new file mode 100644
index 0000000..a0b9aa2
--- /dev/null
+++ b/pages/plugins/realstore/frequencycard-list/frequencycard-list.vue
@@ -0,0 +1,279 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav-base bg-white">
+            <block v-for="(item, index) in nav_status_list" :key="index">
+                <view v-if="nav_status_index == index" class="item fl tc cr-main nav-active-line" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+                <view v-else class="item fl tc" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+            </block>
+        </view>
+
+        <!-- 数据列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="list-item padding-horizontal-main padding-top-main border-radius-main bg-white oh spacing-mb">
+                    <view class="item-base oh br-b padding-bottom-main">
+                        <text class="fl cr-base">{{ item.add_time }}</text>
+                        <text class="fr cr-red"
+                            >{{ item.status_name }}<text v-if="(item.is_under_line_text || null) != null">（{{ item.is_under_line_text }}）</text></text
+                        >
+                    </view>
+                    <view class="br-b padding-vertical-main">
+                        <view class="cr-base">{{ item.name }}</view>
+                        <view v-if="(item.describe || null) != null" class="cr-grey margin-top-xs">{{ item.describe }}</view>
+                    </view>
+                    <view class="padding-vertical-main">
+                        <block v-for="(fv, fi) in content_list" :key="fi">
+                            <view class="single-text margin-top-xs">
+                                <text class="cr-grey margin-right-xl">{{ fv.name }}</text>
+                                <text class="cr-base">{{ item[fv.field] }}</text>
+                                <text v-if="(fv.unit || null) != null" class="cr-grey">{{ fv.unit }}</text>
+                            </view>
+                        </block>
+                    </view>
+                    <view class="item-operation tr br-t padding-vertical-main">
+                        <button class="round bg-white cr-green br-green" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/realstore/frequencycard-used/frequencycard-used?cuid=' + item.id" hover-class="none">{{$t('frequencycard-list.frequencycard-list.cgy327')}}</button>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                nav_status_list: [
+                    { name: this.$t('common.all'), value: "-1" },
+                    { name: this.$t('frequencycard-list.frequencycard-list.954ewh'), value: "0" },
+                    { name: this.$t('frequencycard-list.frequencycard-list.8x98g7'), value: "1" },
+                    { name: this.$t('frequencycard-list.frequencycard-list.5n3ums'), value: "2" },
+                    { name: this.$t('frequencycard-list.frequencycard-list.n36x3w'), value: "3" },
+                ],
+                nav_status_index: 0,
+                content_list: [
+                    { name: this.$t('frequencycard-list.frequencycard-list.cx75t7'), field: "valid_number", unit: this.$t('buy.buy.0pgsrm') },
+                    { name: this.$t('frequencycard-list.frequencycard-list.3m1w12'), field: "use_number", unit: this.$t('buy.buy.0pgsrm') },
+                    { name: this.$t('frequencycard-list.frequencycard-list.89t8am'), field: "start_time" },
+                    { name: this.$t('team.team.iee9bp'), field: "end_time" },
+                ],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 是否指定状态
+            var nav_status_index = 0;
+            if ((params.status || null) != null) {
+                for (var i in this.nav_status_list) {
+                    if (this.nav_status_list[i]["value"] == params.status) {
+                        nav_status_index = i;
+                        break;
+                    }
+                }
+            }
+            this.setData({
+                params: params,
+                nav_status_index: nav_status_index,
+            });
+
+            // 数据加载
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            // 获取数据
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 参数
+                var status = (this.nav_status_list[this.nav_status_index] || null) == null ? -1 : this.nav_status_list[this.nav_status_index]["value"];
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("index", "frequencycard", "realstore"),
+                    method: "POST",
+                    data: {
+                        page: this.data_page,
+                        status: status,
+                        oid: this.params.oid || 0,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_status_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+
+                // 重新拉取数据
+                this.get_data_list(1);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+        },
+    };
+</script>
+<style>
+    @import "./frequencycard-list.css";
+</style>
diff --git a/pages/plugins/realstore/frequencycard-used/frequencycard-used.vue b/pages/plugins/realstore/frequencycard-used/frequencycard-used.vue
new file mode 100644
index 0000000..13e1f6b
--- /dev/null
+++ b/pages/plugins/realstore/frequencycard-used/frequencycard-used.vue
@@ -0,0 +1,217 @@
+<template>
+    <view :class="theme_view">
+        <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="list-item padding-horizontal-main padding-top-main border-radius-main bg-white oh spacing-mb">
+                    <view class="item-base oh br-b padding-bottom-main">
+                        <text class="fl cr-base">{{ item.add_time }}</text>
+                    </view>
+                    <view class="padding-vertical-main">
+                        <block v-for="(fv, fi) in content_list" :key="fi">
+                            <view class="single-text margin-top-xs">
+                                <text class="cr-grey margin-right-xl">{{ fv.name }}</text>
+                                <text class="cr-base">{{ item[fv.field] }}</text>
+                                <text v-if="(fv.unit || null) != null" class="cr-grey">{{ fv.unit }}</text>
+                            </view>
+                        </block>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                content_list: [
+                    { name: this.$t('frequencycard-used.frequencycard-used.538686'), field: "dec_number", unit: this.$t('buy.buy.0pgsrm') },
+                    { name: this.$t('frequencycard-used.frequencycard-used.xjmepo'), field: "msg" },
+                    { name: this.$t('frequencycard-used.frequencycard-used.aod4pc'), field: "operate_name" },
+                    { name: this.$t('common.use_time'), field: "use_time" },
+                ],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+
+            // 数据加载
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            // 获取数据
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("usedlist", "frequencycard", "realstore"),
+                    method: "POST",
+                    data: {
+                        page: this.data_page,
+                        cuid: this.params.cuid || 0,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+        },
+    };
+</script>
+<style></style>
diff --git a/pages/plugins/realstore/index/index.css b/pages/plugins/realstore/index/index.css
new file mode 100644
index 0000000..753de30
--- /dev/null
+++ b/pages/plugins/realstore/index/index.css
@@ -0,0 +1,76 @@
+/**
+* 头部
+*/
+page {
+    background-color: #F7EDE1;
+}
+
+/**
+* 位置和搜索
+*/
+.nav-location {
+    line-height: 95rpx;
+}
+.nav-location .icon-arrow-down {
+    top: 34rpx;
+}
+.nav-search {
+    margin-top: 80rpx;
+}
+
+/**
+* 位置选择提示
+*/
+.choice-location-tips {
+    background: rgba(0, 0, 0, 0.6);
+    top: 0;
+    left: 0;
+    z-index: 2;
+}
+
+.choice-location-tips .content {
+    margin-top: 30%;
+    width: 520rpx;
+}
+
+.choice-location-tips .content .close {
+    top: 20rpx;
+    right: 20rpx;
+}
+
+/**
+ * 已选门店
+ */
+.user-choice-realstore .logo {
+    width: 100rpx;
+}
+.user-choice-realstore .address-content {
+    max-width: calc(100% - 100rpx);
+}
+.user-choice-realstore .checked {
+    top: 0;
+    right: 0;
+    width: 50rpx;
+    height: 38rpx;
+    border-bottom-left-radius: 100rpx;
+}
+
+
+/**
+* 媒体查询
+*/
+@media only screen and (min-width:960px) {
+    .realstore-nav-bg {
+        /* #ifdef H5 */
+        background-size: cover;
+        /* #endif */
+    }
+}
+
+@media only screen and (max-width:960px) {
+    .realstore-nav-bg {
+        /* #ifdef H5 */
+        background-size: auto 100%;
+        /* #endif */
+    }
+}
\ No newline at end of file
diff --git a/pages/plugins/realstore/index/index.vue b/pages/plugins/realstore/index/index.vue
new file mode 100644
index 0000000..91c05b5
--- /dev/null
+++ b/pages/plugins/realstore/index/index.vue
@@ -0,0 +1,461 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="(data_base || null) != null">
+            <!-- 强制选择一个门店模式 -->
+            <view v-if="is_force_choice_realstore == 1" class="padding-main tc">
+                <!-- 位置展示 -->
+                <component-choice-location ref="choice_location" propBaseColor="#333" @onBack="user_back_choice_location"></component-choice-location>
+                <!-- 提示信息 -->
+                <view class="padding-bottom-xxxxl margin-top-sm">
+                    <block v-if="(user_choice_realstore || null) == null">
+                        <image :src="not_choice_realstore_images" class="dis-block wh-auto" mode="widthFix"></image>
+                        <view v-if="(data_base.home_not_choice_realstore_msg || null) != null" class="cr-grey margin-top-xl">{{data_base.home_not_choice_realstore_msg}}</view>
+                        <view class="padding-horizontal-xxxl">
+                            <button type="default" class="bg-main br-main cr-white text-size-sm margin-top-xxl round" hover-class="none" @tap="realstore_choice_event">{{$t('realstore-cart.realstore-cart.87tty2')}}</button>
+                        </view>
+                    </block>
+                    <!-- 已选择的门店 -->
+                    <block v-else>
+                        <view class="padding-main border-radius-main bg-white br-main pr oh tl user-choice-realstore">
+                            <view class="checked pa bg-main lh-sm tc padding-top-xs padding-left-xs">
+                                <iconfont name="icon-checked" size="32rpx" color="#fff"></iconfont>
+                            </view>
+                            <view class="base flex-row oh">
+                                <!-- 基础内容 -->
+                                <image :src="user_choice_realstore.logo" mode="widthFix" class="logo circle fl br"></image>
+                                <view class="base-right padding-left-sm flex-1 flex-width">
+                                    <view class="padding-right-lg">
+                                        <view class="single-text dis-inline-block va-m">
+                                            <text v-if="(user_choice_realstore.alias || null) != null" class="va-m border-radius-sm br-main cr-main text-size-xs padding-left-sm padding-right-sm margin-right-xs">{{ user_choice_realstore.alias }}</text>
+                                            <text class="va-m fw-b text-size">{{ user_choice_realstore.name }}</text>
+                                        </view>
+                                    </view>
+                                    <!-- 地址 -->
+                                    <view class="flex-row align-s align-c margin-top-sm">
+                                        <iconfont name="icon-map-address" size="28rpx" propClass="pr top-xs"></iconfont>
+                                        <view class="address-content single-text cr-base margin-left-xs text-size-sm" :data-value="user_choice_realstore.province_name + user_choice_realstore.city_name + user_choice_realstore.county_name + user_choice_realstore.address" @tap="text_copy_event">
+                                            {{ user_choice_realstore.province_name }}{{ user_choice_realstore.city_name }}{{ user_choice_realstore.county_name }}{{ user_choice_realstore.address }}
+                                        </view>
+                                        <!-- #ifndef MP-KUAISHOU -->
+                                        <view v-if="user_choice_realstore.lat != 0 && user_choice_realstore.lng != 0" class="tc cp border-radius-sm text-size-xss cr-green br-green padding-horizontal-xs margin-left-xs" @tap="address_map_event">{{$t('detail.detail.688i26')}}</view>
+                                        <!-- #endif -->
+                                    </view>
+                                </view>
+                            </view>
+                            <view class="pr margin-top">
+                                <view class="text-size-xs cr-grey">
+                                    <view v-if="(user_choice_realstore.status_info.time || null) != null">{{$t('detail.detail.dor2v9')}}{{ user_choice_realstore.status_info.time }}</view>
+                                    <view v-if="(user_choice_realstore.distance || null) != null">{{$t('extraction-address.extraction-address.42v8tv')}}{{ user_choice_realstore.distance }}</view>
+                                </view>
+                                <button type="default" size="mini" class="bg-main-light br-main cr-main text-size-xss round pa bottom-0 right-0" hover-class="none" :data-value="user_choice_realstore.url" @tap="url_event">{{$t('realstore-cart.realstore-cart.r67uyg')}}</button>
+                            </view>
+                        </view>
+                        <view v-if="(data_base.home_already_choice_realstore_msg || null) != null" class="cr-grey margin-top-xl">{{data_base.home_already_choice_realstore_msg}}</view>
+                        <view class="padding-horizontal-xxxl">
+                            <button type="default" class="bg-main br-main cr-white text-size-sm margin-top-xxl round" hover-class="none" @tap="realstore_choice_event">{{$t('realstore-cart.realstore-cart.76rfgh')}}</button>
+                        </view>
+                    </block>
+                </view>
+            </view>
+            <block v-else>
+                <view class="realstore-nav-bg">
+                    <!-- 背景图片 -->
+                    <image :src="plugins_static_url + 'title-bg'+(screen_width > 960 ? '-pc' : '')+'.png'" mode="widthFix" class="wh-auto pa bg-img" />
+                    <!-- 顶部 -->
+                    <view class="spacing-mb pr z-i cr-white">
+                        <!-- 位置展示 -->
+                        <view class="nav-location single-text dis-inline-block bs-bb pr padding-left-main padding-right-xl margin-top">
+                            <component-choice-location ref="choice_location" @onBack="user_back_choice_location"></component-choice-location>
+                        </view>
+                    </view>
+                    <!-- 搜索 -->
+                    <view class="nav-search padding-main">
+                        <component-search @onsearch="search_button_event" :propIsOnEvent="true" :propIsRequired="false" :propPlaceholder="$t('index.index.c5273j')" propPlaceholderClass="cr-grey-c"></component-search>
+                    </view>
+                </view>
+
+                <!-- 轮播 -->
+                <view v-if="slider_list.length > 0" class="padding-horizontal-main">
+                    <component-banner :propData="slider_list"></component-banner>
+                </view>
+
+                <!-- 图标 -->
+                <view v-if="icon_list.length > 0" class="padding-horizontal-main spacing-mb">
+                    <view class="bg-white border-radius-main">
+                        <component-icon-nav :propData="{...{data: icon_list}, ...{random: random_value}}"></component-icon-nav>
+                    </view>
+                </view>
+            </block>
+
+            <!-- 列表 -->
+            <block v-if="data_list.length > 0">
+                <view class="padding-horizontal-main">
+                    <!-- 导航 -->
+                    <component-title :propTitle="data_base.home_data_list_title || $t('index.index.1vf378')" :propMoreUrl="'/pages/plugins/realstore/search/search'+(is_force_choice_realstore == 1 ? '?is_choice_mode=1&choice_mode_back_type=realstore-detail&is_open_realstore_redirect=0' : '')"></component-title>
+                    <!-- 数据列表 -->
+                    <component-realstore-list :propData="{data: data_list}" :propFavorUser="favor_user" :propIsChoice="is_force_choice_realstore == 1" propIsChoiceBackType="realstore-detail" :propIsOpenRealstoreRedirect="false"></component-realstore-list>
+                </view>
+                <!-- 结尾 -->
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            </block>
+
+            <!-- 位置选择提示 -->
+            <view v-if="location_tips_close_status && (data_base.is_home_choice_location || 0) == 1 && ((data_base.home_choice_location_images || null) != null || (data_base.home_choice_location_msg || null) != null)" class="choice-location-tips pf wh-auto ht-auto tc bs-bb">
+                <view class="content bg-white auto padding-xxxl pr radius">
+                    <view v-if="(data_base.is_home_choice_location_force || 0) == 0" class="close oh pa">
+                        <view @tap="location_tips_close_event">
+                            <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                        </view>
+                    </view>
+                    <view class="padding-lg">
+                        <image v-if="(data_base.home_choice_location_images || null) != null" class="icon max-w" :src="data_base.home_choice_location_images" mode="widthFix"></image>
+                        <view v-if="(data_base.home_choice_location_msg || null) != null" class="cr-base margin-top-lg">{{ data_base.home_choice_location_msg }}</view>
+                        <button type="default" class="bg-main br-main cr-white text-size-sm margin-top-xxl round" hover-class="none" @tap="choose_user_location_event">{{$t('index.index.t3d917')}}</button>
+                    </view>
+                </view>
+            </view>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentSearch from '@/components/search/search';
+    import componentBanner from '@/components/slider/slider';
+    import componentIconNav from '@/components/icon-nav/icon-nav';
+    import componentRealstoreList from '@/components/realstore-list/realstore-list';
+    import componentTitle from '@/components/title/title';
+    import componentChoiceLocation from '@/components/choice-location/choice-location';
+    var plugins_static_url = app.globalData.get_static_url('realstore', true);
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                plugins_static_url: plugins_static_url,
+                screen_width: parseInt(app.globalData.get_system_info('windowWidth', 0, true)),
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                params: null,
+                is_first: 1,
+                data_base: null,
+                search_keywords_value: '',
+                favor_user: [],
+                slider_list: [],
+                icon_list: [],
+                data_list: [],
+                // 用户选择的门店
+                not_choice_realstore_images: plugins_static_url+'app/index/not-choice-realstore-images.png',
+                user_choice_realstore: null,
+                // 强制选择门店
+                is_force_choice_realstore: 0,
+                // 强制自动选择第一个门店
+                is_force_auto_choice_realstore: 0,
+                // 强制自动选择第一个门店的最低距离条件
+                force_auto_choice_realstore_distance: 0,
+                // 用户位置信息
+                user_location: {},
+                location_tips_close_status: false,
+                // 自定义分享信息
+                share_info: {},
+                // 增加随机数，避免无法监听数据列表内部数据更新
+                random_value: 0,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentSearch,
+            componentBanner,
+            componentIconNav,
+            componentRealstoreList,
+            componentTitle,
+            componentChoiceLocation
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+            
+            // #ifdef H5
+            // 监听屏幕宽度和高度变化
+            window.addEventListener('resize', this.handle_resize, true);
+            // #endif
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 门店选择初始化
+            this.realstore_choice_init();
+
+            // 用户位置初始化
+            this.user_location_init();
+
+            // 数据加载
+            this.get_data();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            if(this.data_list_loding_status === 1) {
+                uni.stopPullDownRefresh();
+            } else {
+                this.get_data();
+            }
+        },
+
+        // 页面销毁时执行
+        onUnload: function () {
+            // #ifdef H5
+            window.removeEventListener('resize', this.handle_resize);
+            // #endif
+        },
+
+        methods: {
+            // 初始化
+            get_data(params = {}) {
+                // 网络检查
+                if((params || null) == null || (params.loading || 0) == 0) {
+                    app.globalData.network_type_handle(this, 'get_data', params);
+                    return false;
+                }
+
+                // 请求数据
+                var lng = 0;
+                var lat = 0;
+                if ((this.user_location || null) != null) {
+                    lng = this.user_location.lng || 0;
+                    lat = this.user_location.lat || 0;
+                }
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'index', 'realstore'),
+                    method: 'POST',
+                    data: {
+                        lng: lng,
+                        lat: lat,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var data_list = data.data_list || [];
+                            var data_base = data.base || {};
+                            this.setData({
+                                random_value: Math.random(),
+                                data_base: data.base || null,
+                                favor_user: data.favor_user || [],
+                                slider_list: data.slider_list || [],
+                                icon_list: data.icon_list || [],
+                                data_list: data_list,
+                                not_choice_realstore_images: data_base.home_not_choice_realstore_images || this.not_choice_realstore_images,
+                                is_force_choice_realstore: parseInt(data_base.is_home_force_choice_one_realstore_mode || 0),
+                                is_force_auto_choice_realstore: parseInt(data_base.is_home_force_choice_one_realstore_mode_auto_lately_realstore || 0),
+                                force_auto_choice_realstore_distance: parseFloat(data_base.home_force_choice_one_realstore_mode_auto_lately_distance || 0),
+                                data_list_loding_status: data_list.length > 0 ? 3 : 0,
+                                data_bottom_line_status: true,
+                            });
+
+                            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/realstore/index/index',
+                                    },
+                                });
+
+                                // 导航名称
+                                if ((this.data_base.application_name || null) != null) {
+                                    uni.setNavigationBarTitle({
+                                        title: this.data_base.application_name,
+                                    });
+                                }
+
+                                // 非首次
+                                if(this.is_first == 1) {
+                                    // 是否自动获取用户当前位置、如果系统已经开启获取位置则这里不调用
+                                    if(app.globalData.data.get_user_location_status != 1 && parseInt(this.data_base.is_home_auto_user_location || 0) == 1) {
+                                        app.globalData.get_user_location(this, 'user_back_auto_location', true);
+                                    }
+
+                                    // 自动选择第一个门店、不存在已选择的门店
+                                    if((this.user_choice_realstore || null) == null && this.data_list.length > 0 && this.is_force_choice_realstore == 1 && this.is_force_auto_choice_realstore == 1) {
+                                        var status = true;
+                                        var temp_realstore = this.data_list[0];
+                                        // 最低条件，自动选择第一个最低距离设置、不存在门店位置数据 或 位置值大于最低值则不选择
+                                        if(this.force_auto_choice_realstore_distance > 0) {
+                                            if(temp_realstore.distance_value === undefined || temp_realstore.distance_value > this.force_auto_choice_realstore_distance) {
+                                                status = false;
+                                            }
+                                        }
+                                        if(status) {
+                                            // 自动进入门店则不显示提示位置选择弹窗
+                                            this.setData({
+                                                location_tips_close_status: false
+                                            });
+                                            // 存储门店缓存
+                                            uni.setStorageSync(app.globalData.data.cache_realstore_detail_choice_key, {
+                                                data: temp_realstore,
+                                                status: 0
+                                            });
+                                            // 进入门店页面
+                                            app.globalData.url_open(temp_realstore.url);
+                                        }
+                                    }
+                                }
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                        }
+
+                        // 首次状态记录
+                        this.setData({
+                            is_first: 0,
+                        });
+
+                        // 分享菜单处理
+                        app.globalData.page_share_handle(this.share_info);
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+
+            // 搜索事件
+            search_button_event(e) {
+                var params = (e || null) == null ? '' : '?keywords=' + e;
+                app.globalData.url_open('/pages/plugins/realstore/search/search' + params);
+            },
+
+            // 选择地理位置
+            choose_user_location_event(e) {
+                if ((this.$refs.choice_location || null) != null) {
+                    this.$refs.choice_location.choose_user_location();
+                }
+            },
+
+            // 自动获取用户位置回调
+            user_back_auto_location(e) {
+                // 位置数据更新
+                if ((this.$refs.choice_location || null) != null) {
+                    this.$refs.choice_location.init();
+                }
+                // 设置状态为首次
+                this.setData({
+                    is_first: 1,
+                });
+                // 设置位置数据，重新获取数据
+                this.user_back_choice_location(e);
+            },
+
+            // 选择用户地理位置回调
+            user_back_choice_location(e) {
+                // 设置数据
+                this.setData({
+                    user_location: e,
+                    location_tips_close_status: e.status != 1
+                });
+                // 重新获取数据
+                this.get_data();
+            },
+
+            // 门店选择初始化
+            realstore_choice_init() {
+                var key = app.globalData.data.cache_realstore_detail_choice_key;
+                var res = uni.getStorageSync(key) || null;
+                if(res != null && (res.data || null) != null) {
+                    this.setData({
+                        user_choice_realstore: res.data
+                    });
+                }
+            },
+
+            // 地址信息初始化
+            user_location_init() {
+                var res = app.globalData.choice_user_location_init();
+                this.setData({
+                    user_location: res,
+                    location_tips_close_status: res.status != 1
+                });
+            },
+
+            // 地址选择提示关闭事件
+            location_tips_close_event(e) {
+                this.setData({
+                    location_tips_close_status: false,
+                });
+            },
+            
+            // 页面宽度变化监听
+            handle_resize() {
+                // #ifdef H5
+                this.setData({
+                    screen_width: window.innerWidth,
+                });
+                // #endif
+            },
+
+            // 门店选择事件
+            realstore_choice_event(e) {
+                app.globalData.url_open('/pages/plugins/realstore/search/search?is_choice_mode=1&choice_mode_back_type=realstore-detail&show_type_mode=1');
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 剪切板
+            text_copy_event(e) {
+                app.globalData.text_copy_event(e);
+            },
+
+            // 地图查看
+            address_map_event(e) {
+                var info = this.user_choice_realstore || {};
+                if (info.lat == 0 || info.lng == 0) {
+                    app.globalData.showToast(this.$t('user-order-detail.user-order-detail.i876o3'));
+                    return false;
+                }
+                var address = (info.province_name || '') + (info.city_name || '') + (info.county_name || '') + (info.address || '');
+                app.globalData.open_location(info.lng, info.lat, info.name, address);
+            },
+        },
+    };
+</script>
+<style>
+    @import './index.css';
+</style>
diff --git a/pages/plugins/realstore/orderallot-detail/orderallot-detail.css b/pages/plugins/realstore/orderallot-detail/orderallot-detail.css
new file mode 100644
index 0000000..01917bc
--- /dev/null
+++ b/pages/plugins/realstore/orderallot-detail/orderallot-detail.css
@@ -0,0 +1,73 @@
+/*
+* 地址信息
+*/
+.address-base,
+.address-detail {
+    padding: 10rpx 0;
+}
+.address-detail .icon {
+    width: 30rpx;
+    height: 35rpx !important;
+}
+.address-detail .text {
+    width: calc(100% - 40rpx);
+}
+.address-detail .text {
+    line-height: 36rpx;
+}
+.no-address {
+    height: 85rpx;
+    line-height: 85rpx;
+}
+.address-alias,
+.address-map-submit {
+    padding: 0 15rpx;
+    line-height: 40rpx;
+}
+.address-map-submit {
+    
+}
+
+/*
+* 商品信息
+*/
+.goods-base {
+    min-height: 160rpx;
+    margin-left: 180rpx;
+}
+.goods .goods-item:last-child {
+    border-bottom: 0;
+}
+.goods-image {
+    width: 160rpx;
+    height: 160rpx;
+}
+.orderaftersale-btn-text {
+    right: 0;
+    bottom: 0;
+    z-index: 1;
+}
+
+/*
+* 虚拟销售信息
+*/
+.site-fictitious .panel-content .tips-value {
+    color: #f37b1d;
+    background-color: #fff2e9;
+    border-color: #ffebdb;
+}
+.site-fictitious .panel-content .left-image {
+    width: 80rpx;
+    height: 80rpx;
+}
+.site-fictitious .panel-content .right-value {
+    width: calc(100% - 100rpx);
+}
+
+/*
+* 自提信息
+*/
+.site-extraction .panel-content .qrcode {
+    width: 260rpx;
+    height: 260rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/realstore/orderallot-detail/orderallot-detail.vue b/pages/plugins/realstore/orderallot-detail/orderallot-detail.vue
new file mode 100644
index 0000000..098926a
--- /dev/null
+++ b/pages/plugins/realstore/orderallot-detail/orderallot-detail.vue
@@ -0,0 +1,274 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="detail != null">
+            <view class="padding-horizontal-main padding-top-main">
+                <!-- 地址 -->
+                <view v-if="(detail.order_type == 0 || detail.order_type == 1 || detail.order_type == 2) && (detail.address_data || null) != null" class="address bg-white padding-horizontal-main padding-top-main border-radius-main spacing-mb">
+                    <view class="address-base oh">
+                        <text v-if="(detail.address_data.alias || null) != null" class="address-alias round br-main cr-main bg-white margin-right-sm">{{ detail.address_data.alias }}</text>
+                        <text>{{ detail.address_data.name }}</text>
+                        <text class="fr">{{ detail.address_data.tel }}</text>
+                    </view>
+                    <view class="address-detail oh margin-bottom-main">
+                        <image class="icon fl" :src="common_static_url + 'map-icon.png'" mode="widthFix"></image>
+                        <view class="text fr">
+                            <text>{{ detail.address_data.province_name }}{{ detail.address_data.city_name }}{{ detail.address_data.county_name }}{{ detail.address_data.address }}</text>
+                            <text v-if="detail.order_model == 2 && (detail.address_data.lng || 0) != 0 && (detail.address_data.lat || (0 && detail.address_data.lng != 0 && detail.address_data.lat != 0)) != 0" class="address-map-submit cr-base br round bg-white margin-left-sm text-size-xs" @tap="address_map_event">{{$t('user-order-detail.user-order-detail.7lp6gw')}}</text>
+                        </view>
+                    </view>
+                    <view class="address-divider spacing-mb"></view>
+                </view>
+
+                <!-- 商品列表 -->
+                <view class="goods bg-white padding-main border-radius-main spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.7f8p26')}}</view>
+                    <view v-for="(item, index) in detail.items" :key="index" class="goods-item br-b-dashed oh padding-main">
+                        <view :data-value="item.goods_url" @tap="url_event" class="cp">
+                            <image class="goods-image fl radius" :src="item.images" mode="aspectFill"></image>
+                            <view class="goods-base pr">
+                                <view class="multi-text">{{ item.title }}</view>
+                                <view v-if="item.spec != null" class="margin-top-sm">
+                                    <block v-for="(sv, si) in item.spec" :key="si">
+                                        <text v-if="si > 0" class="cr-grey padding-left-xs padding-right-xs">;</text>
+                                        <text class="cr-grey">{{ sv.value }}</text>
+                                    </block>
+                                </view>
+                                <view class="margin-top-sm">
+                                    <text class="fw-b">{{ detail.currency_data.currency_symbol }}{{ item.price }}</text>
+                                    <text class="margin-left-sm">x{{ item.buy_number }}</text>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="padding-top-main tr cr-base text-size">
+                        <text>{{$t('user-order-detail.user-order-detail.423rmr')}}<text class="fw-b">{{ detail.buy_number_count }}</text>{{$t('user-order-detail.user-order-detail.41ty94')}}<text class="sales-price margin-right-xs">{{ detail.currency_data.currency_symbol }}{{ detail.total_price }}</text></text>
+                    </view>
+                </view>
+
+                <!-- 虚拟销售数据 -->
+                <view v-if="(site_fictitious || null) != null" class="site-fictitious panel-item padding-horizontal-main padding-top-main border-radius-main bg-white spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{ site_fictitious.title || item.fictitious_goods_title }}</view>
+                    <view class="panel-content oh padding-top-main">
+                        <view v-if="(site_fictitious.tips || null) != null" class="tips-value radius padding-main margin-bottom-main">
+                            <mp-html :content="site_fictitious.tips" />
+                        </view>
+                        <view v-for="(item, index) in detail.items" :key="index" class="item br-b-dashed oh padding-bottom-main margin-bottom-main">
+                            <image class="left-image br fl radius" :src="item.images" mode="aspectFill"></image>
+                            <view class="right-value fr">
+                                <view v-if="(item.spec_text || null) != null" class="text-grey padding-bottom-xs margin-bottom-xs br-b-f9 text-size-xs">{{item.spec_text}}</view>
+                                <mp-html v-if="(item.fictitious_goods_value || null) != null" :content="item.fictitious_goods_value" />
+                                <text v-else class="cr-grey">{{$t('user-order-detail.user-order-detail.7xtnjt')}}</text>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 自提信息 -->
+                <view v-if="(detail.extraction_data || null) != null" class="site-extraction panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.7dikfm')}}</view>
+                    <view class="panel-content oh padding-top-main">
+                        <view>
+                            <text>{{$t('user-order-detail.user-order-detail.o38952')}}</text>
+                            <text class="radius bg-green cr-white padding-left-sm padding-right-sm">{{ detail.extraction_data.code || $t("user-order-detail.user-order-detail.hpq62x") }}</text>
+                        </view>
+                        <image v-if="(detail.extraction_data.images || null) != null" class="qrcode br radius margin-top-lg" :src="detail.extraction_data.images" mode="aspectFill"></image>
+                    </view>
+                </view>
+
+                <!-- 订单基础数据 -->
+                <view v-if="detail_list.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.0f26j2')}}</view>
+                    <view class="panel-content oh">
+                        <view v-for="(item, index) in detail_list" :key="index" class="item br-b-dashed oh padding-vertical-main">
+                            <view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
+                            <view v-if="(item.is_copy || 0) == 1" class="content fl br-l padding-left-main" :data-value="item.value" @tap="text_copy_event">
+                                <text>{{ item.value }}</text>
+                                <text class="bg-white br-green cr-green round padding-horizontal-sm text-size-xs margin-left-sm">{{$t('common.copy')}}</text>
+                            </view>
+                            <view v-else class="content fl br-l padding-left-main">{{ item.value }}</view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 快递信息 -->
+                <view v-if="(detail.express_data || null) != null && detail.express_data.length > 0" class="express-data panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.0876xf')}}</view>
+                    <view class="panel-content">
+                        <view v-for="(item, index) in detail.express_data" :key="index" class="item br-b-dashed oh padding-vertical-main">
+                            <view class="item oh padding-vertical-main">
+                                <view class="title fl padding-right-main cr-grey">{{$t('user-order-detail.user-order-detail.12d445')}}</view>
+                                <view class="content fl br-l padding-left-main" :data-value="item.express_name" @tap="text_copy_event">{{item.express_name}}</view>
+                            </view>
+                            <view class="item oh padding-vertical-main">
+                                <view class="title fl padding-right-main cr-grey">{{$t('user-order-detail.user-order-detail.2byl8l')}}</view>
+                                <view class="content fl br-l padding-left-main" :data-value="item.express_number" @tap="text_copy_event">
+                                    <text>{{item.express_number}}</text>
+                                    <text class="bg-white br-green cr-green round padding-horizontal-sm text-size-xs margin-left-sm">{{$t('common.copy')}}</text>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    var common_static_url = app.globalData.get_static_url("common");
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                data_bottom_line_status: false,
+                detail: null,
+                detail_list: [],
+                site_fictitious: null,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            // 获取数据
+            init() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("detail", "orderallot", "realstore"),
+                    method: "POST",
+                    data: {
+                        id: this.params.id,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                detail: data.data,
+                                detail_list: [
+                                    { name: this.$t('orderallot-detail.orderallot-detail.81jvw1'), value: data.data.order_type_name || '' },
+                                    { name: this.$t('user-order-detail.user-order-detail.n18sd2'), value: data.data.order_allot_no || '', is_copy: 1 },
+                                    { name: this.$t('user-order-detail.user-order-detail.yxwu8n'), value: data.data.status_name || '' },
+                                    { name: this.$t('user-order-detail.user-order-detail.2y7l13'), value: data.data.total_price || '' },
+                                    { name: this.$t('user-order-detail.user-order-detail.h2c78h'), value: data.data.add_time || '' },
+                                    { name: this.$t('common.add_time'), value: data.data.add_time || '' },
+                                    { name: this.$t('common.receive_time'), value: data.data.receive_time || '' },
+                                    { name: this.$t('common.service_time'), value: data.data.service_time || '' },
+                                    { name: this.$t('order-detail.order-detail.2dw4gd'), value: data.data.success_time || '' },
+                                    { name: this.$t('user-order-detail.user-order-detail.1jpv4n'), value: data.data.cancel_time || '' },
+                                ],
+                                site_fictitious: data.site_fictitious || null,
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: '',
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "init")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 地图查看
+            address_map_event(e) {
+                if ((this.detail.address_data || null) == null) {
+                    app.globalData.showToast(this.$t('user-order-detail.user-order-detail.i876o3'));
+                    return false;
+                }
+
+                // 打开地图
+                var data = this.detail.address_data;
+                var name = data.alias || data.name || "";
+                var address = (data.province_name || "") + (data.city_name || "") + (data.county_name || "") + (data.address || "");
+                app.globalData.open_location(data.lng, data.lat, name, address);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 文本复制
+            text_copy_event(e) {
+                if((e.currentTarget.dataset.value || null) != null) {
+                    app.globalData.text_copy_event(e);
+                }
+            }
+        },
+    };
+</script>
+<style>
+    @import "./orderallot-detail.css";
+</style>
diff --git a/pages/plugins/realstore/orderallot-list/orderallot-list.css b/pages/plugins/realstore/orderallot-list/orderallot-list.css
new file mode 100644
index 0000000..c98a7d8
--- /dev/null
+++ b/pages/plugins/realstore/orderallot-list/orderallot-list.css
@@ -0,0 +1,18 @@
+/*
+* 导航
+*/
+.nav-base .item {
+    width: 16.66%;
+}
+
+/*
+* 列表
+*/
+.goods-base {
+    min-height: 160rpx;
+    margin-left: 180rpx;
+}
+.goods-image {
+    width: 160rpx;
+    height: 160rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/realstore/orderallot-list/orderallot-list.vue b/pages/plugins/realstore/orderallot-list/orderallot-list.vue
new file mode 100644
index 0000000..17cd387
--- /dev/null
+++ b/pages/plugins/realstore/orderallot-list/orderallot-list.vue
@@ -0,0 +1,526 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav-base bg-white">
+            <block v-for="(item, index) in nav_status_list" :key="index">
+                <view v-if="nav_status_index == index" class="item fl tc cr-main nav-active-line" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+                <view v-else class="item fl tc" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+            </block>
+        </view>
+
+        <!-- 数据列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="list-item padding-horizontal-main padding-top-main border-radius-main bg-white oh spacing-mb">
+                    <view class="item-base oh br-b padding-bottom-main">
+                        <text class="fl cr-base">{{ item.order_allot_no }}</text>
+                        <text class="fr cr-red"
+                            >{{ item.status_name }}<text v-if="(item.is_under_line_text || null) != null">（{{ item.is_under_line_text }}）</text></text
+                        >
+                    </view>
+                    <view v-for="(detail, di) in item.items" :key="di" class="br-b-dashed oh padding-vertical-main">
+                        <view :data-value="'/pages/plugins/realstore/orderallot-detail/orderallot-detail?id=' + item.id" @tap="url_event" class="cp">
+                            <image class="goods-image fl radius" :src="detail.images" mode="aspectFill"></image>
+                            <view class="goods-base pr">
+                                <view class="multi-text">{{ detail.title }}</view>
+                                <view v-if="detail.spec != null" class="margin-top-sm">
+                                    <block v-for="(sv, si) in detail.spec" :key="si">
+                                        <text v-if="si > 0" class="cr-grey padding-left-xs padding-right-xs">;</text>
+                                        <text class="cr-grey">{{ sv.value }}</text>
+                                    </block>
+                                </view>
+                                <view class="margin-top-sm">
+                                    <text class="fw-b">{{ item.currency_data.currency_symbol }}{{ detail.price }}</text>
+                                    <text class="margin-left-sm">x{{ detail.buy_number }}</text>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="padding-vertical-main tr cr-base text-size">
+                        <text>{{$t('user-order-detail.user-order-detail.423rmr')}}<text class="fw-b">{{ item.buy_number_count }}</text>{{$t('user-order-detail.user-order-detail.41ty94')}}<text class="sales-price margin-right-xs">{{ item.currency_data.currency_symbol }}{{ item.total_price }}</text></text>
+                    </view>
+                    <view v-if="
+                        (
+                            item.operate_data.is_cancel +
+                            item.operate_data.is_pay +
+                            item.operate_data.is_collect +
+                            (item.plugins_delivery_data || 0) +
+                            (item.plugins_is_order_frequencycard_button || 0) > 0
+                        ) ||
+                        ((item.express_data || null) != null && item.express_data.length > 0) ||
+                        (item.operate_data.is_order_batch || 0) == 1 ||
+                        (item.operate_data.is_order_frequencycard || 0) == 1
+                    " class="item-operation tr br-t padding-vertical-main">
+                        <button v-if="item.operate_data.is_cancel == 1" class="round bg-white cr-yellow br-yellow" type="default" size="mini" @tap="cancel_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('common.cancel')}}</button>
+                        <button v-if="item.operate_data.is_pay == 1" class="round bg-white cr-green br-green" type="default" size="mini" @tap="pay_event" :data-value="item.order_id" :data-index="index" :data-price="item.total_price" :data-payment="item.main_order_data.payment_id" :data-currency-symbol="item.currency_data.currency_symbol" hover-class="none">{{$t('order.order.1i873j')}}</button>
+                        <button v-if="item.operate_data.is_collect == 1" class="round bg-white cr-green br-green" type="default" size="mini" @tap="collect_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('orderallot-list.orderallot-list.w2w2w4')}}</button>
+                        <button v-if="(item.operate_data.is_order_batch || 0) == 1" class="round bg-white cr-blue br-blue" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/realstore/batchorder-list/batchorder-list?oid=' + item.order_id" hover-class="none">{{$t('orderallot-list.orderallot-list.6m73j2')}}</button>
+                        <button v-if="(item.operate_data.is_order_frequencycard || 0) == 1" class="round bg-white cr-green br-green" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/realstore/frequencycard-list/frequencycard-list?oid=' + item.order_id" hover-class="none">{{$t('orderallot-list.orderallot-list.b13k5r')}}</button>
+                        <button v-if="(item.express_data || null) != null && item.express_data.length > 0" class="round bg-white cr-main br-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/express/detail/detail?oid=' + item.id + '&action_type=realstore'" hover-class="none">{{$t('orderallot-list.orderallot-list.w2t242')}}</button>
+                        <button v-if="(item.plugins_delivery_data || 0) > 0" class="round bg-white cr-main br-main margin-bottom-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/delivery/logistics/logistics?id=' + item.plugins_delivery_data" hover-class="none">{{$t('orderallot-list.orderallot-list.w2t242')}}</button>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 支付组件 -->
+        <component-payment
+            ref="payment"
+            :propCurrencySymbol="payment_currency_symbol"
+            :propPayUrl="pay_url"
+            :propQrcodeUrl="qrcode_url"
+            :propPaymentList="payment_list"
+            propPayDataKey="ids"
+            :propTempPayValue="temp_pay_value"
+            :propTempPayIndex="temp_pay_index"
+            :propPaymentId="payment_id"
+            :propDefaultPaymentId="default_payment_id"
+            :propPayPrice="pay_price"
+            :propIsShowPayment="is_show_payment_popup"
+            @close-payment-popup="payment_popup_event_close"
+            @pay-success="order_item_pay_success_handle"
+        ></component-payment>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+    import componentPayment from '@/components/payment/payment';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                nav_status_list: [
+                    { name: this.$t('common.all'), value: "-1" },
+                    { name: this.$t('extraction.extraction.53h4fj'), value: "0,1" },
+                    { name: this.$t('orderallot-list.orderallot-list.285ir2'), value: "2,5" },
+                    { name: this.$t('order.order.q820hx'), value: "3" },
+                    { name: this.$t('order.order.15lr5l'), value: "4" },
+                    { name: this.$t('detail.detail.32171c'), value: "6,7" },
+                ],
+                nav_status_index: 0,
+                // 前往页面携带的参数
+                payment_currency_symbol: app.globalData.currency_symbol(),
+                pay_price: 0,
+                pay_url: '',
+                qrcode_url: '',
+                payment_list: [],
+                temp_pay_value: '',
+                temp_pay_index: 0,
+                payment_id: 0,
+                default_payment_id: 0,
+                is_show_payment_popup: false,
+                // 智能工具箱（限定仅可选择下单支付方式）
+                is_order_pay_only_can_buy_payment: 0,
+                original_payment_list: [],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentPayment
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 是否指定状态
+            var nav_status_index = 0;
+            if ((params.status || null) != null) {
+                for (var i in this.nav_status_list) {
+                    if (this.nav_status_list[i]["value"] == params.status) {
+                        nav_status_index = i;
+                        break;
+                    }
+                }
+            }
+            this.setData({
+                params: params,
+                nav_status_index: nav_status_index,
+            });
+
+            // 初始化配置
+            this.init_config();
+
+            // 数据加载
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    this.setData({
+                        is_order_pay_only_can_buy_payment: parseInt(app.globalData.get_config('plugins_base.intellectstools.data.is_order_pay_only_can_buy_payment', 0)),
+                    });
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 获取数据
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.setData({
+                        pay_url: app.globalData.get_request_url('pay', 'order'),
+                        qrcode_url: app.globalData.get_request_url('paycheck', 'order'),
+                    });
+
+                    // 获取数据
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 参数
+                var status = (this.nav_status_list[this.nav_status_index] || null) == null ? -1 : this.nav_status_list[this.nav_status_index]["value"];
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("index", "orderallot", "realstore"),
+                    method: "POST",
+                    data: {
+                        page: this.data_page,
+                        status: status,
+                        oid: this.params.oid || 0,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    original_payment_list: res.data.data.payment_list || [],
+                                    payment_list: res.data.data.payment_list || [],
+                                    default_payment_id: res.data.data.default_payment_id || 0,
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+
+                                // 下订单支付处理
+                                var key = app.globalData.data.cache_page_pay_key;
+                                var pay_data = uni.getStorageSync(key) || null;
+                                if (pay_data != null && (pay_data.order_ids || null) != null && (pay_data.payment_id || null) != null) {
+                                    uni.removeStorageSync(key);
+                                    this.setData({
+                                        temp_pay_value: pay_data.order_ids,
+                                        payment_id: pay_data.payment_id,
+                                    });
+                                    if ((this.$refs.payment || null) != null) {
+                                        this.$refs.payment.pay_handle(pay_data.order_ids, pay_data.payment_id, this.original_payment_list);
+                                    }
+                                }
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 支付
+            pay_event(e) {
+                // 参数
+                var index = e.currentTarget.dataset.index || 0;
+                var payment_id = e.currentTarget.dataset.payment || 0;
+
+                // 智能工具箱（限定仅可选择下单支付方式）
+                if(this.is_order_pay_only_can_buy_payment == 1) {
+                    var payment_list = [];
+                    this.original_payment_list.forEach(function(v, k) {
+                        if(v.id == payment_id) {
+                            payment_list.push(v);
+                        }
+                    });
+                } else {
+                    var payment_list = this.original_payment_list;
+                }
+
+                // 设置支付参数
+                this.setData({
+                    is_show_payment_popup: true,
+                    payment_list: payment_list,
+                    payment_currency_symbol: e.currentTarget.dataset.currencySymbol,
+                    temp_pay_value: e.currentTarget.dataset.value,
+                    temp_pay_index: index,
+                    payment_id: payment_id,
+                    pay_price: e.currentTarget.dataset.price,
+                    order_select_ids: [],
+                });
+            },
+
+            // 支付弹窗关闭
+            payment_popup_event_close(e) {
+                this.setData({
+                    is_show_payment_popup: false,
+                });
+            },
+
+            // 支付成功数据设置
+            // 订单完成回调
+            order_item_pay_success_handle(data) {
+                var order_ids_arr = data.order_id.toString().split(',');
+                var temp_data_list = this.data_list;
+                for (var i in temp_data_list) {
+                    if (order_ids_arr.indexOf(temp_data_list[i]['order_id'].toString()) != -1) {
+                        temp_data_list[i]['operate_data']['is_pay'] = 0;
+                        temp_data_list[i]['operate_data']['is_cancel'] = 0;
+                        temp_data_list[i]['status'] = 2;
+                        temp_data_list[i]['status_name'] = this.$t('orderallot-list.orderallot-list.x5l17j');
+                    }
+                }
+                this.setData({
+                    data_list: temp_data_list,
+                });
+            },
+
+            // 取消
+            cancel_event(e) {
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('order.order.pn78ns'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('recommend-list.recommend-list.w9460o'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            // 参数
+                            var id = e.currentTarget.dataset.value;
+                            var index = e.currentTarget.dataset.index;
+            
+                            // 加载loding
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text'),
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url("cancel", "orderallot", "realstore"),
+                                method: 'POST',
+                                data: {
+                                    id: id,
+                                },
+                                dataType: 'json',
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        var temp_data_list = this.data_list;
+                                        temp_data_list[index]['status'] = 5;
+                                        temp_data_list[index]['status_name'] = this.$t('order.order.1k98tk');
+                                        temp_data_list[index]['operate_data']['is_cancel'] = 0;
+                                        temp_data_list[index]['operate_data']['is_pay'] = 0;
+                                        temp_data_list[index]['operate_data']['is_delete'] = 1;
+                                        this.setData({
+                                            data_list: temp_data_list,
+                                        });
+                                        app.globalData.showToast(res.data.msg, 'success');
+                                    } else {
+                                        app.globalData.showToast(res.data.msg);
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 收货
+            collect_event(e) {
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('orderallot-list.orderallot-list.o3ouqv'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('recommend-list.recommend-list.w9460o'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            // 参数
+                            var id = e.currentTarget.dataset.value;
+                            var index = e.currentTarget.dataset.index;
+
+                            // 加载loding
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text'),
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url("collect", "orderallot", "realstore"),
+                                method: "POST",
+                                data: {
+                                    id: id,
+                                },
+                                dataType: "json",
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        var temp_data_list = this.data_list;
+                                        temp_data_list[index]["status"] = 4;
+                                        temp_data_list[index]["status_name"] = this.$t('order.order.15lr5l');
+                                        temp_data_list[index]["operate_data"]["is_collect"] = 0;
+                                        this.setData({
+                                            data_list: temp_data_list,
+                                        });
+                                        app.globalData.showToast(res.data.msg, "success");
+                                    } else {
+                                        app.globalData.showToast(res.data.msg);
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_status_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+
+                // 重新拉取数据
+                this.get_data_list(1);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+        },
+    };
+</script>
+<style>
+    @import "./orderallot-list.css";
+</style>
diff --git a/pages/plugins/realstore/search/search.css b/pages/plugins/realstore/search/search.css
new file mode 100644
index 0000000..13e64b4
--- /dev/null
+++ b/pages/plugins/realstore/search/search.css
@@ -0,0 +1,37 @@
+/**
+* 位置和搜索
+*/
+.nav-location {
+    max-width: 260rpx;
+    height: 56rpx;
+    line-height: 56rpx;
+}
+.nav-search {
+    width: calc(100% - 260rpx);
+}
+.nav-search.map {
+    width: 100%;
+}
+
+/**
+* 数据列表
+*/
+.scroll-box {
+    height: calc(100vh - 180rpx);
+}
+.scroll-box.map {
+    height: calc(100vh - 682rpx);
+}
+
+/**
+* 地图
+*/
+.map-container {
+    height: 500rpx;
+}
+.map-container .map-center-icon {
+    top: calc(50% - 30rpx);
+    left: calc(50% - 30rpx);
+    width: 60rpx;
+    height: 60rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/realstore/search/search.vue b/pages/plugins/realstore/search/search.vue
new file mode 100644
index 0000000..77d6c1f
--- /dev/null
+++ b/pages/plugins/realstore/search/search.vue
@@ -0,0 +1,495 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="(data_base || null) != null">
+            <!-- 顶部 -->
+            <view class="bg-white padding-top-main padding-horizontal-main oh flex-row jc-sb align-c cr-grey" :class="show_type_mode == 1 ? 'map padding-bottom' : ''">
+                <!-- 位置 -->
+                <view v-if="show_type_mode == 0" class="nav-location flex-row align-c single-text margin-right-sm">
+                    <component-choice-location ref="choice_location" propBaseColor="#666" propTextMaxWidth="180rpx" @onBack="user_back_choice_location"></component-choice-location>
+                </view>
+                <!-- 搜索 -->
+                <view class="nav-search" :class="show_type_mode == 1 ? 'map' : ''">
+                    <component-search @onsearch="search_button_event" :propIsOnEvent="true" :propIsRequired="false" :propDefaultValue="search_keywords_value" :propPlaceholder="$t('index.index.c5273j')" propPlaceholderClass="cr-grey-c" propBgColor="#f5f5f5"></component-search>
+                </view>
+                <view v-if="is_search_map == 1" class="dis-inline-block margin-left" @tap="show_event">
+                    <iconfont :name="show_type_mode == 1 ? 'icon-list-dot' : 'icon-map-location'" color="#666" size="38rpx"></iconfont>
+                </view>
+            </view>
+
+            <!-- 地图 -->
+            <view v-show="show_type_mode == 1" class="map-container pr">
+                <map class="wh-auto ht-auto"
+                    :enable-zoom="true"
+                    :enable-scroll="true"
+                    :show-location="true"
+                    :latitude="latitude"
+                    :longitude="longitude"
+                    :scale="map_scale"
+                    :markers="markers"
+                    @regionchange="region_change_event"
+                    @markertap="marker_tap_event"
+                ></map>
+                <image v-if="map_center_icon_status == 1" class="map-center-icon pa" :src="map_location_icon" mode="aspectFit"></image>
+            </view>
+
+            <!-- 分类 -->
+            <scroll-view v-if="(category || null) != null && category.length > 0" class="nav-base scroll-view-horizontal bg-white oh" scroll-x="true">
+                <view :class="'item cr-grey dis-inline-block padding-horizontal-main ' + (nav_active_value == 0 ? 'cr-main' : '')" @tap="nav_event" data-value="0">{{$t('common.all')}}</view>
+                <block v-for="(item, index) in category" :key="index">
+                    <view :class="'item cr-grey dis-inline-block padding-horizontal-main ' + (nav_active_value == item.id ? 'cr-main fw-b nav-active-line' : '')" @tap="nav_event" :data-value="item.id">{{ item.name }}</view>
+                </block>
+            </scroll-view>
+
+            <!-- 列表 -->
+            <scroll-view :scroll-y="true" :scroll-top="scroll_top" :scroll-with-animation="true" class="scroll-box scroll-box-ece-nav" :class="show_type_mode == 1 ? 'map' : ''" @scrolltolower="scroll_lower" lower-threshold="60">
+                <view v-if="(data_list || null) != null && data_list.length > 0" class="padding-top-main padding-horizontal-main">
+                    <component-realstore-list :propData="{data: data_list}" :propRealstoreDetailQuery="realstore_detail_query" :propFavorUser="favor_user" :propIsChoice="is_choice_mode == 1" :propIsChoiceBackType="choice_mode_back_type" :propIsOpenRealstoreRedirect="is_open_realstore_redirect"></component-realstore-list>
+                </view>
+                <view v-else>
+                    <!-- 提示信息 -->
+                    <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg" :propLoadingLogoTop="show_type_mode == 1 ? '20%' : ''"></component-no-data>
+                </view>
+
+                <!-- 结尾 -->
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            </scroll-view>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+    import componentSearch from "@/components/search/search";
+    import componentRealstoreList from "@/components/realstore-list/realstore-list";
+    import componentChoiceLocation from '@/components/choice-location/choice-location';
+    var plugins_static_url = app.globalData.get_static_url('realstore', true);
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                params: null,
+                data_base: null,
+                category: [],
+                search_keywords_value: "",
+                nav_active_value: 0,
+                favor_user: [],
+                realstore_detail_query: '',
+                // 是否选择模式（0否，1是）
+                is_choice_mode: 0,
+                // 选择模式回调类型（back返回上一页，realstore-detail进入门店详情）
+                choice_mode_back_type: 'back',
+                // 打开门店详情页面是否关闭当前页面（0否，1是）
+                is_open_realstore_redirect: true,
+                // 显示类型模式（0列表，1地图）
+                show_type_mode: 0,
+                // 地图
+                is_search_map: 0,
+                map_location_icon: plugins_static_url+'app/search/location-icon.png',
+                markers_icon: plugins_static_url+'app/search/markers-icon.png',
+                markers_icon_active: '',
+                map_scale: 12,
+                latitude: 39.909,
+                longitude: 116.39742,
+                markers: [],
+                map_center_icon_status: 1,
+                markers_active_index: null,
+                scroll_top: 0,
+                // 用户位置信息
+                user_location: {},
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentSearch,
+            componentRealstoreList,
+            componentChoiceLocation
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 参数处理
+            params = app.globalData.launch_params_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+                is_choice_mode: parseInt(params.is_choice_mode || 0),
+                choice_mode_back_type: (params.choice_mode_back_type === undefined) ? 'back' : (params.choice_mode_back_type || ''),
+                is_open_realstore_redirect: (params.is_open_realstore_redirect === undefined) ? true : parseInt(params.is_open_realstore_redirect || 0) == 1,
+                show_type_mode: parseInt(params.show_type_mode || 0),
+                search_keywords_value: params.keywords || "",
+                nav_active_value: params.category_id || 0,
+                realstore_detail_query: (params.goods_id || null) == null ? '' : '&source_goods_id='+params.goods_id
+            });
+
+            // 数据加载
+            this.get_data();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 用户位置初始化
+            this.user_location_init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 标题设置
+            if(this.is_choice_mode == 1) {
+                uni.setNavigationBarTitle({
+                    title: this.$t('realstore-cart.realstore-cart.87tty2')
+                });
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            // 初始化
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url("index", "search", "realstore"),
+                    method: "POST",
+                    data: {},
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var data_base = data.base || {};
+                            this.setData({
+                                data_base: data.base || null,
+                                category: data.category || [],
+                                favor_user: data.favor_user || [],
+                                is_search_map: parseInt(data_base.is_search_map || 0),
+                                map_scale: parseInt(data_base.search_map_scale || 12),
+                                markers_icon: data_base.search_map_store_icon || this.markers_icon,
+                                markers_icon_active: data_base.search_map_store_icon_active || '',
+                                map_location_icon: data_base.search_map_location_icon || this.map_location_icon,
+                            });
+
+                            // 获取列表数据
+                            this.get_data_list(1);
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 获取数据列表
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 基础自定义分享
+                this.share_info_handle();
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({ data_is_loading: 1 });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 用户位置
+                var lng = 0;
+                var lat = 0;
+                if ((this.user_location || null) != null) {
+                    lng = this.user_location.lng || 0;
+                    lat = this.user_location.lat || 0;
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("datalist", "search", "realstore"),
+                    method: "POST",
+                    data: {
+                        page: this.data_page,
+                        keywords: this.search_keywords_value,
+                        category_id: this.nav_active_value || 0,
+                        goods_id: this.params.goods_id || 0,
+                        lng: this.longitude || lng,
+                        lat: this.latitude || lat,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            if (data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: data.total,
+                                    data_page_total: data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_is_loading: 0,
+                                });
+                                if (this.data_page <= 1) {
+                                    this.setData({
+                                        data_list: [],
+                                        data_bottom_line_status: false,
+                                    });
+                                }
+                            }
+
+                            // 地图展示
+                            var temp_markers = [];
+                            if(this.data_list.length > 0) {
+                                this.data_list.forEach((item, index) => {
+                                    temp_markers.push({
+                                        id: index,
+                                        width: 25,
+                                        height: 25,
+                                        latitude: item.lat,
+                                        longitude: item.lng,
+                                        iconPath: this.markers_icon
+                                    });
+                                });
+                            }
+                            this.setData({
+                                markers: temp_markers,
+                                markers_active_index: null
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                                data_is_loading: 0,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 分享设置处理
+            share_info_handle() {
+                if ((this.data_base || null) != null) {
+                    // 基础自定义分享
+                    this.setData({
+                        share_info: {
+                            title: this.search_keywords_value || this.data_base.seo_title || this.data_base.application_name,
+                            desc: this.data_base.seo_desc,
+                            path: "/pages/plugins/realstore/search/search",
+                            query: "category_id=" + this.nav_active_value + "&keywords=" + this.search_keywords_value+"&goods_id="+(this.params.goods_id || 0),
+                        },
+                    });
+                }
+
+                // 分享菜单处理
+                app.globalData.page_share_handle(this.share_info);
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_active_value: e.currentTarget.dataset.value || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 搜索事件
+            search_button_event(e) {
+                this.setData({
+                    search_keywords_value: e || "",
+                    data_page: 1,
+                });
+                this.get_data_list(1);
+            },
+
+            // 选择用户地理位置回调
+            user_back_choice_location(e) {
+                this.setData({
+                    user_location: e,
+                    data_page: 1,
+                });
+                // 重新请求数据
+                this.get_data_list(1);
+            },
+
+            // 地址信息初始化
+            user_location_init() {
+                var user_location = app.globalData.choice_user_location_init();
+                var upd_data = {
+                    user_location: user_location
+                };
+                if ((user_location || null) != null) {
+                    upd_data['longitude'] = user_location.lng;
+                    upd_data['latitude'] = user_location.lat;
+                }
+                this.setData(upd_data);
+            },
+
+            // 显示类型事件
+            show_event(e) {
+                this.setData({
+                    show_type_mode: (this.show_type_mode == 1) ? 0 : 1
+                });
+            },
+
+            // 点击标记点事件
+            marker_tap_event(e) {
+                // 索引值
+                var index = e.detail.markerId;
+                // 选中处理
+                this.data_markers_active_handle(index);
+                // 列表滑动到用户位置
+                this.setData({
+                    scroll_top: (index*252)+'rpx'
+                });
+            },
+
+            // 用户和覆盖物选中处理
+            data_markers_active_handle(index) {
+                // 列表数据
+                var temp_data_list = this.data_list;
+                for(var i in temp_data_list) {
+                    if(i == index) {
+                        temp_data_list[i]['active'] = 'active';
+                    } else {
+                        temp_data_list[i]['active'] = '';
+                    }
+                }
+                // 覆盖物
+                var temp_markers = this.markers;
+                for(var i in temp_markers) {
+                    if(i == index) {
+                        temp_markers[i]['iconPath'] = this.markers_icon_active || temp_data_list[temp_markers[i]['id']]['logo'];
+                    } else {
+                        temp_markers[i]['iconPath'] = this.markers_icon;
+                    }
+                }
+                // 设置数据
+                this.setData({
+                    markers_active_index: index,
+                    markers: temp_markers,
+                    data_list: temp_data_list,
+                    map_center_icon_status: 0
+                });
+            },
+
+            // 视野改变事件
+            region_change_event(e) {
+                // 仅拖动及手势有效
+                if(e.causedBy == 'drag' || e.causedBy == 'gesture') {
+                    // 1. 开始显示中心图标
+                    // 2. 结束重新拉取数据
+                    if(e.type == 'end') {
+                        this.setData({
+                            latitude: e.detail.centerLocation.latitude,
+                            longitude: e.detail.centerLocation.longitude,
+                            data_page: 1,
+                            data_list: [],
+                            data_list_loding_status: 1,
+                            data_bottom_line_status: false,
+                        });
+                        this.get_data_list(1);
+                    } else {
+                        this.setData({
+                            map_center_icon_status: 1,
+                        });
+                    }
+                }
+            }
+        }
+    };
+</script>
+<style>
+    @import "./search.css";
+</style>
diff --git a/pages/plugins/scanpay/index/index.css b/pages/plugins/scanpay/index/index.css
new file mode 100644
index 0000000..152283a
--- /dev/null
+++ b/pages/plugins/scanpay/index/index.css
@@ -0,0 +1,134 @@
+.scanpay-logo {
+    width: 92rpx;
+    height: 92rpx !important;
+}
+
+.badge {
+    min-width: 50rpx;
+    height: 32rpx;
+    line-height: 32rpx;
+    background: #D5D5D5;
+    border-radius: 4rpx;
+    padding: 0 12rpx;
+    font-size: 22rpx;
+}
+
+.unit {
+    font-size: 42rpx;
+}
+
+.img-pay {
+    width: 40rpx;
+}
+
+.pay-scroll {
+    max-height: calc(100vh - 1102rpx);
+    min-height: 140rpx;
+    overflow-y: auto;
+}
+
+::-webkit-scrollbar {
+    display: none;
+    ;
+}
+
+.sub-key {
+    background-color: transparent !important;
+    box-shadow: none !important;
+    padding: 0;
+}
+
+.title-padding {
+    padding: 16rpx;
+}
+
+/**
+ * 页面底部浮动、增加底部边距
+ */
+.page-pay-fixed {
+    padding-bottom: calc(536rpx + env(safe-area-inset-bottom) - 40rpx);
+    /* #ifdef H5 */
+    padding-bottom: 536rpx !important;
+    /* #endif */
+}
+
+.edit-width {
+    min-width: 50rpx;
+}
+
+.key-1 {
+    padding: 26rpx 0;
+}
+
+.repair {
+    margin-left: -2rpx;
+}
+
+.fw-n {
+    font-weight: 400;
+}
+
+.sub-key-content .key-num {
+    transition: all 0.15s ease-in-out;
+}
+
+.sub-key-content .key-num:active {
+    background-color: rgba(0, 0, 0, 0.1) !important;
+}
+
+.sub-key-content .key-num.sub:active {
+    background-color: rgba(230, 67, 64, 0.85) !important;
+}
+
+/* 弹框 */
+.dialog-container {
+    width: 600rpx;
+    border-radius: 22rpx;
+    background-color: #fff;
+}
+
+.dialog-title {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    padding-top: 30rpx;
+    font-size: 32rpx;
+    text-align: center;
+}
+
+.dialog-content {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    padding: 40rpx;
+}
+
+.dialog-input {
+    flex: 1;
+    font-size: 28rpx;
+    border: 2rpx #eee solid;
+    height: 80rpx;
+    line-height: 80rpx;
+    min-height: 80rpx;
+    padding: 0 20rpx;
+    border-radius: 10rpx;
+    color: #555;
+    background: #F1F1F1;
+    box-sizing: unset !important;
+}
+
+.dialog-btn-group {
+    display: flex;
+    flex-direction: row;
+}
+
+.dialog-btn {
+    display: flex;
+    flex: 1;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    height: 90rpx;
+    font-size: 32rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/scanpay/index/index.vue b/pages/plugins/scanpay/index/index.vue
new file mode 100644
index 0000000..531e71b
--- /dev/null
+++ b/pages/plugins/scanpay/index/index.vue
@@ -0,0 +1,463 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data || null) !== null" class="page-pay-fixed">
+            <view class="padding-main">
+                <block v-if="(data.scanpay_info || null) !== null">
+                    <view class="flex-row align-c margin-top-main margin-bottom-xl">
+                        <image v-if="data.scanpay_info.logo" :src="data.scanpay_info.logo" mode="widthFix" class="circle scanpay-logo br margin-right-main" />
+                        <div class="flex-1 flex-width flex-row align-c">
+                            <text class="text-size fw-b single-text">{{ data.scanpay_info.name }}</text>
+                            <text v-if="(data.scanpay_info.alias || null) !== null" class="cr-white badge tc margin-left-sm">{{ data.scanpay_info.alias }}</text>
+                        </div>
+                    </view>
+                </block>
+                <view class="bg-white border-radius-main padding-main spacing-mb">
+                    <view class="flex-row jc-sb align-c">
+                        <view class="text-size cr-grey-9 title-padding">{{$t('promotion-user.promotion-user.32bf15')}}</view>
+                        <view class="flex-1 flex-width tr">
+                            <view class="pay-price" :class="form.price ? '' : 'cr-grey-9'">
+                                <text class="unit">{{ currency_symbol }}</text>
+                                <text class="price fw-b text-size-xl"> {{ form.price || '0.00' }} </text>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <view class="bg-white border-radius-main padding-main spacing-mb">
+                    <view class="text-size fw-b spacing-mb">{{$t('user-order-detail.user-order-detail.0e1sfs')}}</view>
+                    <view class="flex-col" :class="is_more ? 'pay-scroll' : ''">
+                        <view v-for="(item, index) in is_more ? data.payment_list : data.payment_list.slice(0, 2)" :key="index" class="flex-row jc-sb align-c padding-vertical-sm" @tap="change_event(index, item.id)">
+                            <div class="flex-1 flex-width flex-row align-c">
+                                <image v-if="item.logo" :src="item.logo" mode="widthFix" class="circle img-pay margin-right-main" />
+                                <view>{{ item.name }}</view>
+                                <view v-if="(item.tips || null) !== null" class="va-m cr-red text-size-xs">（{{ item.tips }}</view>
+                            </div>
+                            <iconfont :name="checked === index ? 'icon-zhifu-yixuan' : 'icon-zhifu-weixuan'" size="40rpx" :color="checked === index ? '#E83B11' : '#ddd'"></iconfont>
+                        </view>
+                    </view>
+                    <view v-if="data.payment_list.length > 2" class="br-t margin-top-sm padding-top-main tc cr-grey-9" @tap="more_event">
+                        <text>{{$t('common.more')}}</text>
+                        <iconfont :name="is_more ? 'icon-arrow-bottom' : 'icon-arrow-top'" size="24rpx"></iconfont>
+                    </view>
+                </view>
+            </view>
+            <view class="bottom-fixed sub-key" :style="bottom_fixed_style">
+                <view class="tc text-size-xs spacing-mb">
+                    <block v-if="!form.note">
+                        <view class="cr-blue" @tap="add_desc_event">{{$t('index.index.1e582h')}}</view>
+                    </block>
+                    <block v-else>
+                        <view class="flex-row align-c jc-c padding-horizontal-main">
+                            <text class="cr-grey-9 single-text tc">{{ form.note }}</text>
+                            <view class="cr-blue margin-left-sm edit-width" @tap="add_desc_event">{{$t('user.user.567lwz')}}</view>
+                        </view>
+                    </block>
+                    <!-- 输入框示例 -->
+                    <uni-popup ref="inputDialog" type="dialog" :animation="false">
+                        <view class="dialog-container">
+                            <view class="dialog-title">
+                                <text>{{$t('common.note')}}</text>
+                            </view>
+                            <view class="dialog-content">
+                                <input type="text" class="dialog-input" maxlength="200" @input="input_change" />
+                            </view>
+                            <view class="dialog-btn-group">
+                                <view class="dialog-btn cr-grey-9" @tap="input_dialog_colse">{{$t('common.cancel')}}</view>
+                                <view class="dialog-btn divider-l" @tap="input_dialog_open">{{$t('index.index.7w75zb')}}</view>
+                            </view>
+                        </view>
+                    </uni-popup>
+                </view>
+                <view class="bg-white tc text-size-xl fw-b sub-key-content">
+                    <view class="flex-row">
+                        <view class="flex-1 key-1 br-r-f5 br-b-f5 key-num" @tap="key_up_event('1')">1</view>
+                        <view class="flex-1 key-1 br-r-f5 br-b-f5 key-num" @tap="key_up_event('2')">2</view>
+                        <view class="flex-1 key-1 br-r-f5 br-b-f5 key-num" @tap="key_up_event('3')">3</view>
+                        <view class="flex-1 key-1 br-b-f5 key-num" @tap="key_up_event('del')">
+                            <iconfont name="icon-keyboard-backspace" color="#333" size="68rpx" class="fw-n"></iconfont>
+                        </view>
+                    </view>
+                    <view class="flex-row">
+                        <view class="flex-3">
+                            <view class="flex-row">
+                                <view class="flex-1 key-1 br-r-f5 br-b-f5 key-num" @tap="key_up_event('4')">4</view>
+                                <view class="flex-1 key-1 br-r-f5 br-b-f5 key-num" @tap="key_up_event('5')">5</view>
+                                <view class="flex-1 key-1 br-r-f5 br-b-f5 key-num" @tap="key_up_event('6')">6</view>
+                            </view>
+                            <view class="flex-row">
+                                <view class="flex-1 key-1 br-r-f5 br-b-f5 key-num" @tap="key_up_event('7')">7</view>
+                                <view class="flex-1 key-1 br-r-f5 br-b-f5 key-num" @tap="key_up_event('8')">8</view>
+                                <view class="flex-1 key-1 br-r-f5 br-b-f5 key-num" @tap="key_up_event('9')">9</view>
+                            </view>
+                            <view class="flex-row">
+                                <view class="flex-2 key-1 br-r-f5 key-num" @tap="key_up_event('0')">0</view>
+                                <view class="flex-1 key-1 repair br-r-f5 key-num" @tap="key_up_event('.')">.</view>
+                            </view>
+                        </view>
+                        <view class="flex-1 key-num sub" @tap="key_up_event('sub')">
+                            <button type="default" class="flex-col jc-c ht-auto wh-auto radius-0 bg-red cr-white" :disabled="form_submit_loading">{{$t('order.order.1i873j')}}</button>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <!-- 支付弹窗 -->
+            <component-payment
+                ref="payment"
+                :propPayUrl="pay_url"
+                :propQrcodeUrl="qrcode_url"
+                :propPaymentList="data.payment_list"
+                :propTempPayValue="temp_pay_value"
+                :propPayPrice="pay_price"
+                :propPaymentId="payment_id"
+                :propIsRedirectTo="true"
+                :propIsFailAlert="false"
+                :propToPage="to_page"
+                :propToFailPage="to_fail_page"
+                :propToAppointPage="to_appoint_page"
+                :propIsShowPayment="is_show_payment_popup"
+                @close-payment-popup="payment_popup_event_close"
+                @pay-success="pay_back_event"
+                @pay-fail="pay_back_event"
+            ></component-payment>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentPayment from '@/components/payment/payment';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                currency_symbol: app.globalData.currency_symbol(),
+                data: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                bottom_fixed_style: '',
+                form_submit_loading: false,
+                checked: 0,
+                is_more: false,
+                form: {
+                    price: '',
+                    note: '',
+                    payment_id: '',
+                },
+                params: {},
+
+                // 支付弹窗参数
+                pay_url: '',
+                qrcode_url: '',
+                temp_pay_value: '',
+                is_show_payment_popup: false,
+                pay_price: 0,
+                payment_id: 0,
+                // 指定所有页面跳转到指定页面------除现金支付外
+                to_page: '',
+                // 现金支付跳转的页面
+                to_appoint_page: '',
+                // 失败跳转
+                to_fail_page: '',
+
+                input_value: '',
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentPayment,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params || {},
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();;
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.setData({
+                        pay_url: app.globalData.get_request_url('pay', 'index', 'scanpay'),
+                        qrcode_url: app.globalData.get_request_url('paycheck', 'index', 'scanpay'),
+                    });
+                    this.get_data();
+                }
+            },
+            // 获取数据
+            get_data() {
+                // 加载loding
+                uni.showLoading({
+                    title: this.$t('common.loading_in_text')
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'index', 'scanpay'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var temp_form = this.form;
+                            var data = res.data.data || null;
+                            if (data != null && (data.payment_list || null) != null && data.payment_list.length > 0) {
+                                temp_form.payment_id = data.payment_list[0]['id'];
+                            }
+                            this.setData({
+                                data: res.data.data,
+                                form: temp_form,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                            });
+
+                            // 标题
+                            if (data != null && (data.scanpay_info || null) != null) {
+                                uni.setNavigationBarTitle({
+                                    title: data.scanpay_info.name + this.$t('index.index.6941e7'),
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 选择支付方式
+            change_event(i, id) {
+                var new_data = this.form;
+                new_data.payment_id = id;
+                this.setData({
+                    checked: i,
+                    form: new_data,
+                });
+            },
+
+            // 更多
+            more_event() {
+                this.setData({
+                    is_more: !this.is_more,
+                });
+            },
+
+            // 备注
+            add_desc_event() {
+                this.$refs.inputDialog.open();
+            },
+
+            input_change(e) {
+                this.setData({
+                    input_value: e.detail.value,
+                });
+            },
+
+            // 提交备注
+            input_dialog_colse(val) {
+                this.setData({
+                    input_value: this.form.note,
+                });
+                // 关闭窗口后，恢复默认内容
+                this.$refs.inputDialog.close();
+            },
+
+            // 打开备注框
+            input_dialog_open() {
+                var new_data = this.form;
+                new_data.note = this.input_value;
+                this.setData({
+                    form: new_data,
+                });
+                // 关闭窗口后，恢复默认内容
+                this.$refs.inputDialog.close();
+            },
+
+            // 键盘点击事件
+            key_up_event(v) {
+                var price = this.form.price;
+                if (v === 'del') {
+                    this.concat_string(price.slice(0, -1));
+                } else if (v === '.') {
+                    // 判断输入框是否有值，如果没值则不允许输入
+                    if (price.length > 0) {
+                        // 判断是否已经存在‘。’如果存在则不允许输入
+                        if (price.indexOf(v) == -1) {
+                            this.concat_string(price + v);
+                        }
+                    } else {
+                        this.concat_string('0' + v);
+                    }
+                } else if (v === '0') {
+                    if (price.length > 0) {
+                        this.control_price(price, v);
+                    } else {
+                        this.concat_string(price + v);
+                    }
+                } else if (v === 'sub') {
+                    this.form_submit();
+                } else {
+                    if (price.length > 0) {
+                        this.control_price(price, v);
+                    } else {
+                        this.concat_string(price + v);
+                    }
+                }
+
+                // 触感振动
+                uni.vibrateShort();
+            },
+
+            // 提交订单
+            form_submit() {
+                var new_data = {
+                    ...this.params,
+                    ...this.form,
+                };
+                var validation = [{ fields: 'price', msg: this.$t('index.index.t1o84g') }];
+                if (app.globalData.fields_check(new_data, validation)) {
+                    // 加载loding
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                        mask: true
+                    });
+                    this.setData({
+                        form_submit_loading: true
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('created', 'index', 'scanpay'),
+                        method: 'POST',
+                        data: new_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            uni.stopPullDownRefresh();
+                            if (res.data.code == 0) {
+                                var data = res.data.data;
+                                this.setData({
+                                    to_page: '/pages/plugins/scanpay/tips/tips?id=' + data.id,
+                                    to_appoint_page: '/pages/plugins/scanpay/tips/tips?id=' + data.id,
+                                    to_fail_page: '/pages/plugins/scanpay/tips/tips?id=' + data.id,
+                                });
+                                this.$refs.payment.pay_handle(data.id, this.form.payment_id, this.data.payment_list);
+                            } else {
+                                if (app.globalData.is_login_check(res.data, this, 'form_submit')) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    this.setData({
+                                        form_submit_loading: false
+                                    });
+                                }
+                            }
+                        },
+                        fail: () => {
+                            this.setData({
+                                form_submit_loading: false
+                            });
+                            uni.hideLoading();
+                            uni.stopPullDownRefresh();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 支付成功失败回调
+            pay_back_event(params) {
+                this.setData({
+                    form_submit_loading: false
+                });
+            },
+
+            // 消费金额更新
+            concat_string(price) {
+                var new_data = this.form;
+                new_data.price = price;
+                this.setData({
+                    form: new_data,
+                });
+            },
+
+            // 数字键盘业务处理
+            control_price(price, num) {
+                // 判断输入框第一个字符是否是0
+                if (price.substring(0, 1) == '0') {
+                    if (price.indexOf('.') !== -1) {
+                        var index = price.lastIndexOf('.');
+                        if (price.substring(index + 1, price.length).length < 2) {
+                            this.concat_string(price + num);
+                        }
+                    }
+                } else {
+                    if (price.indexOf('.') !== -1) {
+                        // 判断是否含有小数点
+                        var index = price.lastIndexOf('.');
+                        if (price.substring(index + 1, price.length).length < 2) {
+                            this.concat_string(price + num);
+                        }
+                    } else {
+                        if (price.length < 8) {
+                            this.concat_string(price + num);
+                        }
+                    }
+                }
+            },
+
+            // 支付弹窗关闭
+            payment_popup_event_close() {
+                this.setData({
+                    is_show_payment_popup: false,
+                });
+            },
+        },
+    };
+</script>
+
+<style scoped>
+    @import './index.css';
+</style>
\ No newline at end of file
diff --git a/pages/plugins/scanpay/tips/tips.css b/pages/plugins/scanpay/tips/tips.css
new file mode 100644
index 0000000..4d25e63
--- /dev/null
+++ b/pages/plugins/scanpay/tips/tips.css
@@ -0,0 +1,3 @@
+.user-title-img {
+    width: 200rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/scanpay/tips/tips.vue b/pages/plugins/scanpay/tips/tips.vue
new file mode 100644
index 0000000..31d45e4
--- /dev/null
+++ b/pages/plugins/scanpay/tips/tips.vue
@@ -0,0 +1,167 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data || null) !== null" class="page-bottom-fixed">
+            <view class="bg-white padding-main">
+                <block v-if="(data.order_info.status || null) !== null && data.order_info.status == 1">
+                    <view class="tc margin-bottom-lg">
+                        <view class="user-title-img auto circle br oh">
+                            <image v-if="data.scanpay_info.logo" :src="data.scanpay_info.logo" mode="widthFix" class="wh-auto" />
+                        </view>
+                        <view class="text-size margin-top-sm">{{ data.scanpay_info.name }}</view>
+                    </view>
+                    <view class="flex-row jc-sb align-c spacing-mb">
+                        <view class="cr-base">{{$t('user-order-detail.user-order-detail.yxwu8n')}}</view>
+                        <view class="flex-1 flex-width tr" :class="data.order_info.status == 1 ? 'cr-green' : 'cr-red'">{{ data.order_info.status == 1 ? $t('paytips.paytips.679rxu') : $t('paytips.paytips.6y488i')+pay_fail_msg }}</view>
+                    </view>
+                    <view class="flex-row jc-sb align-c spacing-mb">
+                        <view class="cr-base">{{$t('user-order-detail.user-order-detail.n18sd2')}}</view>
+                        <view class="flex-1 flex-width tr">{{ data.order_info.order_no }}</view>
+                    </view>
+                    <view class="flex-row jc-sb align-c spacing-mb">
+                        <view class="cr-base">{{$t('tips.tips.0azfc3')}}</view>
+                        <view class="flex-1 flex-width tr fw-b cr-red">{{ currency_symbol }}{{ data.order_info.pay_price }}</view>
+                    </view>
+                </block>
+                <block v-else>
+                    <view class="padding-top-xxxl padding-bottom-main tc">
+                        <view class="cr-grey-c">
+                            <iconfont name="icon-payment-fail" size="120rpx"></iconfont>
+                        </view>
+                        <view class="margin-top-lg">{{$t('paytips.paytips.6y488i')}}{{ pay_fail_msg }}</view>
+                    </view>
+                </block>
+            </view>
+            <view v-if="(data.ad_code || null) !== null" class="padding-main">
+                <view class="border-radius-main">
+                    <mp-html :content="data.ad_code" />
+                </view>
+            </view>
+            <view class="bottom-fixed" :style="bottom_fixed_style">
+                <view class="bottom-line-exclude">
+                    <button class="item bg-red br-red cr-white round text-size" type="default" hover-class="none" @tap="exit_event">{{$t('tips.tips.579u02')}}</button>
+                </view>
+            </view>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                // 基础配置
+                currency_symbol: app.globalData.currency_symbol(),
+                data: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                bottom_fixed_style: '',
+                params: {},
+                pay_fail_msg: '',
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            var params = params || {};
+            this.setData({
+                params: params,
+                pay_fail_msg: (params.msg || null) == null ? '' : '('+params.msg+')',
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        methods: {
+            init() {
+                this.get_data();
+            },
+
+            // 获取数据
+            get_data() {
+                // 加载loding
+                uni.showLoading({
+                    title: this.$t('common.loading_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('orderinfo', 'index', 'scanpay'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            this.setData({
+                                data: res.data.data || null,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 关闭页面
+            exit_event(e) {
+                // #ifdef APP || H5
+                uni.navigateBack();
+                // #endif
+                // #ifdef MP
+                uni.exitMiniProgram();
+                // #endif
+            },
+        },
+    };
+</script>
+<style scoped>
+    @import './tips.css';
+</style>
diff --git a/pages/plugins/seckill/index/index.css b/pages/plugins/seckill/index/index.css
new file mode 100644
index 0000000..08a33e2
--- /dev/null
+++ b/pages/plugins/seckill/index/index.css
@@ -0,0 +1,66 @@
+/**
+ * 秒杀导航
+ */
+.title {
+    width: 142rpx;
+}
+
+.seckill-right-title {
+    padding-right: 40rpx;
+}
+
+.nav_seckill .item {
+    width: 176rpx;
+    padding: 26rpx 0;
+    opacity: 0.5;
+    flex-basis: 176rpx;
+    flex-shrink: 0;
+    white-space: nowrap;
+}
+
+.nav_seckill .item.active {
+    opacity: 1;
+}
+
+.nav_seckill .item .time {
+    line-height: 50rpx;
+}
+
+.nav_seckill .item .state {
+    margin-top: 4rpx;
+    padding: 0 14rpx;
+    display: inline-flex;
+}
+
+.nav_seckill .item.active .state {
+    font-size: 22rpx;
+    background-color: #fff;
+}
+
+/**
+ * 规则弹窗
+ */
+.rule {
+    padding: 42rpx 26rpx;
+    max-height: 50vh;
+}
+
+.rule .item {
+    padding-bottom: 100rpx;
+    max-height: calc(50vh - 164rpx);
+}
+
+.rule button {
+    margin: 20rpx 70rpx 42rpx 70rpx;
+    height: 80rpx;
+    line-height: 80rpx;
+}
+
+/**
+ * 内容
+ */
+.scroll-y {
+    /* #ifdef H5 */
+    height: calc(100vh - 248rpx) !important;
+    /* #endif */
+}
\ No newline at end of file
diff --git a/pages/plugins/seckill/index/index.vue b/pages/plugins/seckill/index/index.vue
new file mode 100644
index 0000000..4ff7c82
--- /dev/null
+++ b/pages/plugins/seckill/index/index.vue
@@ -0,0 +1,313 @@
+<template>
+    <view :class="theme_view">
+        <component-nav-back :propFixed="false" :propStyle="seckill_bg">
+            <template slot="right" class="flex-1 flex-width seckill-right-title">
+                <view class="flex-1 seckill-right-title tc">
+                    <image :src="seckill_title_url" mode="widthFix" class="title pr top-md"></image>
+                </view>
+            </template>
+            <template v-if="periods_list.length > 0" slot="content">
+                <!-- 秒杀时段 -->
+                <scroll-view :scroll-x="true" :scroll-with-animation="true" :scroll-into-view="'one-nav-item-' + nav_active_index" class="top-nav-scroll wh-auto">
+                    <view class="nav_seckill flex-row flex-nowrap cr-white tc">
+                        <view v-for="(item, index) in periods_list" :key="index" class="item text-size-xss" :class="nav_active_index === index ? 'active' : ''" :id="'one-nav-item-' + index" :data-index="index" :data-text="item.time.time_first_text" :data-status="item.time.status" @tap="nav_event">
+                            <view class="time text-size-lg">{{ item.name }}</view>
+                            <view class="state text-size-xs round" :class="nav_active_index === index ? 'cr-red' : ''">{{ item.time.msg }}</view>
+                        </view>
+                    </view>
+                </scroll-view>
+            </template>
+        </component-nav-back>
+        <scroll-view v-if="periods_list.length > 0" :scroll-top="scroll_top" scroll-y="true" class="scroll-y" @scroll="scroll_event" :style="'height: calc(100vh - 210rpx - ' + (status_bar_height + 5) + 'px);'">
+            <view class="padding-horizontal-main padding-top-main">
+                <!-- 基础信息、倒计时 -->
+                <view class="oh spacing-mb flex-row jc-sb align-c">
+                    <view>
+                        <text :class="'va-m text-size-xs fw-b cr-blak ' + (is_valid == 1 ? 'cr-base' : 'cr-red')">{{ time_first_text }}</text>
+                        <view v-if="is_valid == 1" class="dis-inline-block va-m margin-left-sm">
+                            <view v-for="(item, index) in periods_list" :key="index">
+                                <view v-show="nav_active_index === index">
+                                    <component-countdown :propHour="item.time.hours" :propMinute="item.time.minutes" :propSecond="item.time.seconds" :propTimeBackgroundColor="seckill_status === 1 ? '#E22C08' : '#333333'"></component-countdown>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                    <view v-if="(data_base.content_notice || null) != null && data_base.content_notice.length > 0" class="text-size-xs cr-blak" @tap="quick_open_event">{{$t('index.index.516559')}}<iconfont name="icon-miaosha-hdgz" size="26rpx" propClass="margin-left-xs pr top-xs" color="#999"></iconfont>
+                    </view>
+                </view>
+
+                <!-- 商品 -->
+                <view v-if="goods.length > 0">
+                    <component-goods-list :propData="{ style_type: 1, goods_list: goods }" :propCurrencySymbol="currency_symbol" :propGridBtnConfig="grid_btn_config" :propIsOpenGridBtnSet="isOpenGridBtnSet" propPriceField="seckill_min_price"></component-goods-list>
+                </view>
+                <view v-else>
+                    <!-- 提示信息 -->
+                    <component-no-data propStatus="0" :propMsg="$t('detail.detail.5knxg6')"></component-no-data>
+                </view>
+            </view>
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            <!-- 弹窗 -->
+            <component-popup v-if="(data_base.content_notice || null) != null && data_base.content_notice.length > 0" :propShow="popup_status" :propIsBar="propIsBar" propPosition="bottom" @onclose="quick_close_event">
+                <view class="rule">
+                    <view class="title cr-black text-size-md fw-b margin-bottom-main tc">{{$t('index.index.516559')}}</view>
+                    <scroll-view :scroll-y="true" class="item">
+                        <view v-for="(item, index) in data_base.content_notice" :key="index" class="cr-grey text-size-md">{{ item }}</view>
+                    </scroll-view>
+                    <button type="default" class="bg-main cr-white round text-size-md pa bottom-0 left-0 right-0" @tap="quick_close_event">{{$t('index.index.qbi72m')}}</button>
+                </view>
+            </component-popup>
+        </scroll-view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNavBack from '@/components/nav-back/nav-back';
+    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';
+    import componentPopup from '@/components/popup/popup';
+    var seckill_static_url = app.globalData.get_static_url('seckill', true);
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                status_bar_height: parseInt(app.globalData.get_system_info('statusBarHeight', 0)),
+                // 顶部导航返回按钮
+                is_realstore_top_nav_back: app.globalData.data.is_realstore_top_nav_back || 0,
+                seckill_bg: 'background: url(' + seckill_static_url + 'app/header-bg.png) top/100% no-repeat;background-size:100% 100%;',
+                seckill_title_url: seckill_static_url + 'seckill-title.png',
+                scroll_top: 0,
+                scroll_top_old: 0,
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                currency_symbol: app.globalData.currency_symbol(),
+                data_base: null,
+                // 秒杀时段
+                periods_list: [],
+                current: null,
+                time: null,
+                goods: [],
+                is_valid: 0,
+                // 自定义分享信息
+                share_info: {},
+                // nav滚动下标
+                nav_active_index: 0,
+                // 规则弹窗
+                popup_status: false,
+                propIsBar: false,
+                // 倒计时标题
+                time_first_text: '',
+                // 抢购状态
+                // status 0未开始, 1进行中(距离结束还有), 2已结束, 3异常错误
+                seckill_status: 0,
+                // 配置商品列表按钮
+                isOpenGridBtnSet: false,
+                grid_btn_config: {
+                    name: this.$t('index.index.872w3v'),
+                    disabled: true,
+                },
+            };
+        },
+        components: {
+            componentCommon,
+            componentNavBack,
+            componentCountdown,
+            componentNoData,
+            componentBottomLine,
+            componentGoodsList,
+            componentPopup,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 初始化配置
+            this.init_config();
+
+            // 获取数据
+            this.get_data();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        watch: {
+            seckill_status(val) {
+                if (val === 0) {
+                    let newData = {
+                        name: this.$t('index.index.872w3v'),
+                    };
+                    this.setData({
+                        grid_btn_config: Object.assign({}, this.grid_btn_config, newData),
+                    });
+                } else if (val === 2) {
+                    let newData = {
+                        name: this.$t('index.index.443683'),
+                    };
+                    this.setData({
+                        grid_btn_config: Object.assign({}, this.grid_btn_config, newData),
+                    });
+                }
+            },
+        },
+        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 periods_list = data.periods_list || [];
+                            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.$t('index.index.399f6c') : '';
+                                }
+                            }
+                            this.setData({
+                                periods_list: periods_list,
+                                data_base: data_base,
+                                current: current,
+                                time: time,
+                                time_first_text: (time == null) ? '' : time.time_first_text,
+                                seckill_status: (periods_list.length > 0) ? data.periods_list[this.nav_active_index].time.status : 3,
+                                isOpenGridBtnSet: (periods_list.length > 0) ? (data.periods_list[this.nav_active_index].time.status === 1 ? false : true) : false,
+                                goods: goods,
+                                is_valid: is_valid,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: goods.length > 0,
+                            });
+                            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'] : '',
+                                    },
+                                });
+                                // #ifndef MP-ALIPAY
+                                // 导航名称
+                                if ((this.data_base.application_name || null) != null) {
+                                    uni.setNavigationBarTitle({
+                                        title: this.data_base.application_name,
+                                    });
+                                }
+                                // #endif
+                            }
+                        } 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: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+            nav_event(e) {
+                let index = e.currentTarget.dataset.index;
+                let time_first_text = e.currentTarget.dataset.text;
+                let seckill_status = e.currentTarget.dataset.status;
+                this.setData({
+                    nav_active_index: index,
+                    time_first_text: time_first_text,
+                    seckill_status: seckill_status,
+                    goods: this.periods_list[index].goods,
+                    isOpenGridBtnSet: seckill_status === 1 ? false : true,
+                });
+                this.reset_scroll();
+            },
+            // 弹层开启
+            quick_open_event(e) {
+                this.setData({
+                    popup_status: true,
+                });
+            },
+            // 弹层关闭
+            quick_close_event(e) {
+                this.setData({
+                    popup_status: false,
+                });
+            },
+
+            // 重置滑动位置
+            reset_scroll() {
+                this.setData({
+                    scroll_top: this.scroll_top_old,
+                });
+                this.$nextTick(() => {
+                    this.setData({
+                        scroll_top: 0,
+                    });
+                });
+            },
+
+            // 滑动事件位置记录
+            scroll_event(e) {
+                this.setData({
+                    scroll_top_old: e.detail.scrollTop,
+                });
+            },
+        },
+    };
+</script>
+<style scoped>
+    @import './index.css';
+</style>
diff --git a/pages/plugins/shop/check/check.vue b/pages/plugins/shop/check/check.vue
new file mode 100644
index 0000000..e959b76
--- /dev/null
+++ b/pages/plugins/shop/check/check.vue
@@ -0,0 +1,157 @@
+<template>
+    <view :class="theme_view">
+        <view class="padding-main">
+            <form @submit="form_submit" class="form-container">
+                <view class="border-radius-main bg-white padding-main padding-bottom-xxxxl spacing-mb">
+                    <view class="title fw-b text-size margin-vertical-xxxl">{{$t('common.verification_text')}}</view>
+                    <view class="flex-row align-c padding-bottom-xl">
+                        <!-- #ifndef H5 -->
+                        <view class="margin-right" @tap="scan_event">
+                            <uni-icons type="scan" size="56rpx" color="#666"></uni-icons>
+                        </view>
+                        <!-- #endif -->
+                        <input type="text" class="wh-auto check-value" :placeholder="$t('common.verification_message')" placeholder-class="cr-grey-c" :value="check_value" @input="check_event" />
+                    </view>
+                </view>
+                <view class="padding-main">
+                    <button type="default" form-type="submit" hover-class="none" class="br-main bg-main cr-white round text-size-lg" :disabled="form_submit_loading">{{$t('common.confirm')}}</button>
+                </view>
+                <view class="padding-lg margin-top-xl text-size-lg tc">
+                    <text v-if="(error_msg || null) != null" class="cr-red">{{error_msg}}</text>
+                    <text v-if="(success_msg || null) != null" class="cr-green">{{success_msg}}</text>
+                </view>
+            </form>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                form_submit_loading: false,
+                check_value: '',
+                error_msg: '',
+                success_msg: ''
+            };
+        },
+        components: {
+            componentCommon
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        methods: {
+            // 获取数据
+            init() {
+                app.globalData.get_user_info(this, "init");
+            },
+
+            // 输入事件
+            check_event(e) {
+                this.setData({
+                    check_value: e.detail.value
+                });
+            },
+
+            // 扫码事件
+            scan_event(e) {
+                var self = this;
+                uni.scanCode({
+                	success: function (res) {
+                        if((res.result || null) != null) {
+                            self.setData({
+                                check_value: res.result
+                            });
+                            self.form_submit();
+                        }
+                	}
+                });
+            },
+
+            // 表单提交
+            form_submit() {
+                this.setData({
+                    error_msg: '',
+                    success_msg: ''
+                });
+                var form_data = {
+                    extraction_code: this.check_value
+                }
+                var validation = [
+                    { fields: 'extraction_code', msg: this.$t('common.verification_message') }
+                ];
+                if (app.globalData.fields_check(form_data, validation)) {
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    this.setData({
+                        form_submit_loading: true
+                    });
+                    var temp_code = this.check_value;
+                    uni.request({
+                        url: app.globalData.get_request_url('verification', 'adminorder', 'shop'),
+                        method: 'POST',
+                        data: form_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                this.setData({
+                                    form_submit_loading: false,
+                                    check_value: '',
+                                    error_msg: '',
+                                    success_msg: res.data.msg+'（'+temp_code+'）',
+                                });
+                            } else {
+                                if (app.globalData.is_login_check(res.data, this, 'form_submit')) {
+                                    this.setData({
+                                        form_submit_loading: false,
+                                        error_msg: res.data.msg+'（'+temp_code+'）',
+                                        success_msg: '',
+                                    });
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_loading: false,
+                                error_msg: this.$t('common.internet_error_tips')+'（'+temp_code+'）',
+                                success_msg: '',
+                            });
+                        },
+                    });
+                }
+            }
+        }
+    };
+</script>
+<style scoped>
+    input.check-value {
+        height: 100rpx;
+        line-height: 100rpx;
+        font-size: 44rpx;
+    }
+</style>
\ No newline at end of file
diff --git a/pages/plugins/shop/components/shop-header/shop-header.vue b/pages/plugins/shop/components/shop-header/shop-header.vue
new file mode 100644
index 0000000..5e45624
--- /dev/null
+++ b/pages/plugins/shop/components/shop-header/shop-header.vue
@@ -0,0 +1,468 @@
+<template>
+    <view :class="theme_view">
+        <!-- 搜索 -->
+        <view class="flex-row jc-sb align-c padding-main bg-white pr oh">
+            <view class="flex-1 wh-auto">
+                <view class="search flex-row jc-sb align-c round border-color-main bg-white">
+                    <view class="flex-row align-c flex-1 wh-auto padding-left-main">
+                        <iconfont name="icon-search-max" size="28rpx" color="#ccc"></iconfont>
+                        <input class="text-size-md flex-1 wh-auto padding-left-sm" type="done" :placeholder="$t('detail.detail.8q6345')" :value="search_keywords_value || ''" placeholder-class="cr-grey-c" @input="search_keywords_event" />
+                    </view>
+                    <button class="bg-main br-main cr-white round text-size-xs" type="default" size="mini" hover-class="none" @tap="search_button_event" :data-value="'/pages/plugins/shop/search/search?shop_id=' + propShop.id + '&'">
+                        {{ is_shop_search_all_search_button == 1 ? $t('design.design.i7725u') : $t('common.search') }}
+                    </button>
+                </view>
+            </view>
+            <view v-if="is_shop_search_all_search_button == 1" class="search-btn padding-left-main flex-row align-c">
+                <button class="bg-main-pair br-main-pair cr-white round text-size-xs" type="default" size="mini" hover-class="none" @tap="search_button_event" data-value="/pages/goods-search/goods-search?">{{$t('design.design.ay7m42')}}</button>
+            </view>
+        </view>
+        <!-- 顶部 -->
+        <view class="header plugins-shop-data-list bg-white oh">
+            <image :src="propShop.logo" mode="widthFix" class="shop-logo fl border-radius-main cp" @tap="image_show_event" :data-value="propShop.logo"></image>
+            <view class="base fr item">
+                <view class="shop-title single-text">
+                    <!-- 认证信息 -->
+                    <view v-if="(propBase.is_enable_auth || 0) == 1 && ((propShop.auth_type != -1 && (propShop.auth_type_msg || null) != null) || ((propShop.bond_status || 0) == 1 && (propShop.bond_status_msg || null) != null))" class="auth-icon dis-inline-block">
+                        <!-- 实名认证 -->
+                        <block v-if="propShop.auth_type != -1 && (propShop.auth_type_msg || null) != null">
+                            <image :src="propShop.auth_type == 0 ? propBase.shop_auth_personal_icon : propBase.shop_auth_company_icon" class="icon va-m" mode="aspectFill" :data-value="'/pages/plugins/shop/license/license?id=' + propShop.id" @tap="url_event"></image>
+                        </block>
+                        <!-- 保证金认证 -->
+                        <block v-if="(propShop.bond_status || 0) == 1 && (propShop.bond_status_msg || null) != null">
+                            <image :src="propBase.shop_auth_bond_icon" class="icon va-m" mode="aspectFill"></image>
+                        </block>
+                    </view>
+                    <!-- 标题 -->
+                    <text class="fw-b text-size va-m">{{ propShop.name }}</text>
+                </view>
+                <view class="base-bottom oh margin-top-sm text-size-xs">
+                    <!-- 在线客服 -->
+                    <view v-if="(propBase.is_service_info || 0) == 1" class="fl margin-right-xxl cp" @tap="popup_service_open_event">
+                        <image class="va-m margin-right-sm" :src="common_static_url + 'customer-service-icon.png'" mode="scaleToFill"></image>
+                        <text class="va-m cr-base">{{$t('design.design.21kak7')}}</text>
+                    </view>
+                    <!-- 收藏 -->
+                    <view class="fl single-text cp" @tap="shop_favor_event">
+                        <image class="va-m margin-right-sm" :src="common_static_url + 'favor' + (shop_favor_info.status == 1 ? '-active' : '') + '-icon.png'" mode="scaleToFill"></image>
+                        <text :class="'va-m ' + (shop_favor_info.status == 1 ? 'cr-main' : '')">{{ shop_favor_info.text }}({{ shop_favor_info.count }})</text>
+                    </view>
+                    <!-- 评分 -->
+                    <view v-if="(propShop.score_data || null) != null" class="fl margin-left-xxl">
+                        <view class="dis-inline-block va-m">
+                            <uni-rate :value="propShop.score_data.value" :readonly="true" :is-fill="false" :size="14" />
+                        </view>
+                        <text class="va-m cr-red">{{ propShop.score_data.value }}{{$t('design.design.745kx2')}}</text>
+                    </view>
+                </view>
+            </view>
+        </view>
+        
+        <!-- 导航 -->
+        <view v-if="((propShopGoodsCategory || null) != null && propShopGoodsCategory.length > 0) || ((shop_navigation || null) != null && shop_navigation.length > 0)" class="nav bg-white padding-sm flex-row">
+            <view v-if="propShopGoodsCategory.length > 0" class="item padding-main arrow-bottom nav-shop-category dis-inline-block cp" @tap="nav_shop_category_event">{{$t('recommend-form.recommend-form.203itn')}}</view>
+            <scroll-view scroll-x class="nav-scroll">
+                <view class="pr flex-row">
+                    <block v-if="(shop_navigation || null) != null && shop_navigation.length > 0">
+                        <block v-for="(item, index) in shop_navigation" :key="index">
+                            <block v-if="(item.items || null) == null || item.items.length == 0">
+                                <view class="item par dis-inline-block cp" @tap="nav_event" :data-value="item.url" :data-index="index">{{ item.name }}</view>
+                            </block>
+                            <block v-else>
+                                <view class="item par dis-inline-block cp" @tap="nav_event" :data-index="index">{{ item.name }}</view>
+                                <view v-if="(item.items_status || 0) == 1" class="nav-items pf oh bg-white cr-base">
+                                    <block v-for="(items, index2) in item.items" :key="index2">
+                                        <view class="item cp" @tap="nav_event" :data-value="items.url" :data-index="index" :data-indexs="index2">{{ items.name }}</view>
+                                    </block>
+                                </view>
+                            </block>
+                        </block>
+                    </block>
+                </view>
+            </scroll-view>
+            <view v-if="nav_category_status" class="nav-category bg-white pa">
+                <scroll-view scroll-y class="category-scroll">
+                    <block v-if="(propShopGoodsCategory || null) != null && propShopGoodsCategory.length > 0">
+                        <block v-for="(item, index) in propShopGoodsCategory" :key="index">
+                            <view class="item dis-block cr-base single-text cp" @tap="shop_category_event" :data-value="item.id">{{ item.name }}</view>
+                            <block v-if="(item.items || null) != null && item.items.length > 0">
+                                <view v-for="(item2, index2) in item.items" :key="index2" class="padding-left-xl">
+                                    <view class="item dis-block cr-base single-text cp" @tap="shop_category_event" :data-value="item2.id">{{ item2.name }}</view>
+                                </view>
+                            </block>
+                        </block>
+                    </block>
+                    <block v-else>
+                        <view class="padding-top-xxl padding-bottom-xxl cr-grey">{{$t('design.design.83occ4')}}</view>
+                    </block>
+                </scroll-view>
+            </view>
+        </view>
+
+        <!-- 客服弹窗 -->
+        <component-popup :propShow="popup_service_status" propPosition="bottom" @onclose="popup_service_close_event">
+            <view class="padding-top-main bg-white">
+                <view class="padding-horizontal-main">
+                    <view class="close oh">
+                        <view class="fr" @tap.stop="popup_service_close_event">
+                            <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                        </view>
+                    </view>
+                </view>
+                <view class="popup-service-container">
+                    <view v-if="(propShop || null) != null && (propBase || null) != null && (propBase.is_service_info || 0) == 1" class="header-service">
+                        <view v-if="(propShop.chat_info || null) != null" class="item padding-main single-text">
+                            <text class="va-m">{{$t('detail.detail.r4124d')}}</text>
+                            <view class="dis-inline-block chat-info cp" @tap="chat_event">
+                                <image class="dis-inline-block va-m" :src="propShop.chat_info.icon" mode="scaleToFill"></image>
+                                <text class="margin-left-sm va-m cr-blue" :data-value="propShop.chat_info.chat_url">{{ propShop.chat_info.name }}</text>
+                            </view>
+                        </view>
+                        <view v-if="(propShop.service_qq || null) != null" class="item padding-main br-t-f9 single-text">
+                            <text>Q Q：</text>
+                            <text class="cp" @tap="text_copy_event" :data-value="propShop.service_qq">{{ propShop.service_qq }}</text>
+                        </view>
+                        <view v-if="(propShop.service_tel || null) != null" class="item padding-main br-t-f9 single-text">
+                            <text>{{$t('order.order.7dxbm5')}}：</text>
+                            <text class="cp" @tap="tel_event" :data-value="propShop.service_tel">{{ propShop.service_tel }}</text>
+                        </view>
+                        <view v-if="(propShop.open_week_name || null) != null && (propShop.close_week_name || null) != null" class="item padding-main br-t-f9 single-text">
+                            <text>{{$t('article-detail.article-detail.728374')}}</text>
+                            <text class="cp" @tap="text_copy_event" :data-value="propShop.open_week_name + $t('design.design.gv16tj') + propShop.close_week_name + '，' + propShop.open_time + '-' + propShop.close_time">{{ propShop.open_week_name }}{{$t('detail.detail.324777')}}{{ propShop.close_week_name }}，{{ propShop.open_time }}-{{ propShop.close_time }}</text>
+                        </view>
+                        <view v-if="(propShop.service_weixin_qrcode || null) != null || (propShop.service_line_qrcode || null) != null" class="oh qrcode tc br-t-f9 padding-top-main">
+                            <view v-if="(propShop.service_weixin_qrcode || null) != null" class="item padding-bottom-lg dis-inline-block">
+                                <image class="radius cp" :src="propShop.service_weixin_qrcode" mode="scaleToFill" @tap="image_show_event" :data-value="propShop.service_weixin_qrcode"></image>
+                                <view>{{$t('detail.detail.54k10s')}}</view>
+                            </view>
+                            <view v-if="(propShop.service_line_qrcode || null) != null" class="item padding-bottom-lg dis-inline-block">
+                                <image class="radius cp" :src="propShop.service_line_qrcode" mode="scaleToFill" @tap="image_show_event" :data-value="propShop.service_line_qrcode"></image>
+                                <view>{{$t('detail.detail.vj4nom')}}</view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </component-popup>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentPopup from '@/components/popup/popup';
+    var common_static_url = app.globalData.get_static_url('common');
+    export default {
+        props: {
+            propBase: {
+                type: [Object,String],
+                default: '',
+            },
+            propShop: {
+                type: [Object,String],
+                default: '',
+            },
+            propShopGoodsCategory: {
+                type: [Array,String],
+                default: '',
+            },
+            propShopNavigation: {
+                type: [Array,String],
+                default: '',
+            },
+            propShopFavorUser: {
+                type: [Array,Object],
+                default: '',
+            },
+        },
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                is_shop_search_all_search_button: 0,
+                search_keywords_value: '',
+                popup_service_status: false,
+                nav_category_status: false,
+                shop_category_tab_value: 0,
+                shop_navigation: [],
+                shop_favor_info: {
+                    "text": this.$t('goods-detail.goods-detail.dco1sc'),
+                    "status": 0,
+                    "count": 0
+                },
+            };
+        },
+
+        components: {
+            componentPopup
+        },
+        created() {
+            this.init();
+        },
+
+        methods: {
+            // 初始化
+            init() {
+                var upd_data = {
+                    is_shop_search_all_search_button: (this.propBase == null || parseInt(this.propBase.is_shop_search_all_search_button || 0) != 1) ? 0 : 1,
+                    shop_navigation: this.propShopNavigation,
+                }
+                // 收藏信息
+                if ((this.propShop || null) != null) {
+                    var status = this.propShopFavorUser.indexOf(this.propShop.id) != -1 ? 1 : 0;
+                    upd_data['shop_favor_info'] = {
+                        count: this.propShop.shop_favor_count || 0,
+                        status: status,
+                        text: (status == 1 ? this.$t('goods-detail.goods-detail.by7052') : '') + this.$t('goods-detail.goods-detail.dco1sc')
+                    };
+                }
+                this.setData(upd_data);
+            },
+
+            // 店铺收藏事件
+            shop_favor_event(e) {
+                var user = app.globalData.get_user_info(this, 'shop_favor_event');
+                if (user != false) {
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text')
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url("favor", "shopfavor", "shop"),
+                        method: 'POST',
+                        data: {
+                            "id": this.propShop.id
+                        },
+                        dataType: 'json',
+                        success: res => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                this.setData({
+                                    shop_favor_info: res.data.data
+                                });
+                                app.globalData.showToast(res.data.msg, 'success');
+                            } else {
+                                if (app.globalData.is_login_check(res.data, this, 'shop_favor_event')) {
+                                    app.globalData.showToast(res.data.msg);
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        }
+                    });
+                }
+            },
+
+            // 搜索输入事件
+            search_keywords_event(e) {
+                this.setData({
+                    search_keywords_value: e.detail.value || ''
+                });
+            },
+
+            // 搜索事件
+            search_button_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                app.globalData.url_open(value + 'keywords=' + this.search_keywords_value || '');
+            },
+
+            // 导航分类事件
+            nav_shop_category_event(e) {
+                this.setData({
+                    nav_category_status: !this.nav_category_status
+                });
+            },
+
+            // 分类事件
+            shop_category_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                app.globalData.url_open('/pages/plugins/shop/search/search?shop_id=' + this.propShop.id + '&category_id=' + value);
+            },
+
+            // 导航事件
+            nav_event(e) {
+                // 存在子级则做子级显示隐藏处理
+                var value = e.currentTarget.dataset.value || null;
+                if(value == null) {
+                    var index = e.currentTarget.dataset.index;
+                    var temp_nav = this.propShopNavigation;
+                    for(var i in temp_nav) {
+                        if(i == index) {
+                            temp_nav[i]['items_status'] = ((temp_nav[i]['items_status'] || 0) == 0) ? 1 : 0;
+                        } else {
+                            temp_nav[i]['items_status'] = 0;
+                        }
+                    }
+                    this.setData({shop_navigation: temp_nav});
+                } else {
+                    app.globalData.url_event(e);
+                }
+            },
+
+            // 开启客服弹层
+            popup_service_open_event(e) {
+                this.setData({
+                    popup_service_status: true,
+                });
+            },
+
+            // 关闭客服弹层
+            popup_service_close_event(e) {
+                this.setData({
+                    popup_service_status: false,
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 剪切板
+            text_copy_event(e) {
+                app.globalData.text_copy_event(e);
+            },
+
+            // 电话
+            tel_event(e) {
+                app.globalData.call_tel(e);
+            },
+
+            // 图片预览
+            image_show_event(e) {
+                app.globalData.image_show_event(e);
+            },
+
+            // 进入客服系统
+            chat_event() {
+                app.globalData.chat_entry_handle(this.propShop.chat_info.chat_url);
+            }
+        },
+    };
+</script>
+<style scoped>
+    /**
+    * 搜索
+    */
+    .search {
+        border: 2rpx solid;
+        padding: 2rpx;
+    }
+    
+    .search button {
+        width: 140rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        padding: 0;
+    }
+    
+    .search input {
+        height: 56rpx;
+        line-height: 56rpx;
+    }
+    
+    .search-btn {
+        width: 148rpx;
+    }
+    
+    .search-btn button {
+        width: 100%;
+        padding: 0;
+        height: 64rpx;
+        line-height: 64rpx;
+    }
+    
+    /**
+    * 头部
+    */
+    .header {
+        padding: 20rpx 24rpx;
+        font-size: 24rpx;
+    }
+    
+    .shop-logo {
+        width: 90rpx;
+    }
+    
+    .base-bottom image {
+        width: 28rpx;
+        height: 28rpx;
+    }
+    
+    .header .base {
+        width: calc(100% - 110rpx);
+    }
+    
+    .shop-title {
+        line-height: 40rpx;
+    }
+    
+    /**
+    * 导航
+    */
+    .nav .nav-scroll {
+        float: right;
+        width: calc(100% - 172rpx);
+    }
+    
+    .nav .nav-scroll .item.par {
+        height: 56rpx;
+        line-height: 56rpx;
+        white-space: nowrap;
+    }
+    
+    .nav .item {
+        padding: 0 20rpx;
+    }
+    
+    .nav-shop-category {
+        padding-right: 32rpx !important;
+        background-size: 28rpx 28rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+    }
+    
+    .nav .nav-items {
+        left: calc(50% - 212rpx);
+        top: 322rpx;
+        z-index: 1;
+        border-radius: 0 0 8rpx 8rpx;
+        box-shadow: 0 12rpx 12rpx rgb(0 0 0 / 10%);
+    }
+    
+    .nav .nav-items .item {
+        padding: 20rpx;
+    }
+    
+    /**
+    * 导航商品分类
+    */
+    .nav-category {
+        z-index: 1;
+        box-shadow: 0 12rpx 12rpx rgb(0 0 0 / 10%);
+        border-bottom-right-radius: 8rpx;
+        margin-top: 70rpx;
+    }
+    
+    .nav-category .category-scroll {
+        max-height: 600rpx;
+    }
+    
+    .nav-category .item {
+        padding: 20rpx 30rpx;
+    }
+    
+    /**
+    * 商品分类切换
+    */
+    .shop-category-list .item {
+        margin: 20rpx 0;
+    }
+    
+    .shop-category-list .item {
+        margin-left: 20rpx;
+    }
+    
+    .shop-category-list .item:last-child {
+        margin-right: 20rpx;
+    }
+</style>
diff --git a/pages/plugins/shop/design/design.vue b/pages/plugins/shop/design/design.vue
new file mode 100644
index 0000000..6e91f0e
--- /dev/null
+++ b/pages/plugins/shop/design/design.vue
@@ -0,0 +1,159 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data || null) != null" class="pr">
+            <!-- 头部 -->
+            <block v-if="(data.is_header || 0) == 1">
+                <component-shop-header :propBase="data_base" :propShop="shop" :propShopGoodsCategory="shop_goods_category" :propShopNavigation="shop_navigation" :propShopFavorUser="shop_favor_user"></component-shop-header>
+            </block>
+
+            <!-- 拖拽模式、引入拖拽数据模块 -->
+            <component-layout :propData="layout_data"></component-layout>
+
+            <!-- 结尾 -->
+            <block v-if="(data.is_footer || 0) == 1">
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            </block>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentLayout from "@/components/layout/layout";
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+    import componentShopHeader from '../components/shop-header/shop-header';
+
+    var common_static_url = app.globalData.get_static_url('common');
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                params: {},
+                data_base: null,
+                data: null,
+                layout_data: [],
+                shop: null,
+                shop_favor_user: [],
+                shop_navigation: [],
+                shop_goods_category: [],
+                // 自定义分享信息
+                share_info: {}
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentLayout,
+            componentNoData,
+            componentBottomLine,
+            componentShopHeader
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params)
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.get_data();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        methods: {
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url("index", "design", "shop"),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: res => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var base = data.base || null;
+                            this.setData({
+                                data_base: base,
+                                shop: (data.shop || null) == null || data.shop.length <= 0 ? null : data.shop,
+                                shop_favor_user: data.shop_favor_user || [],
+                                shop_navigation: data.shop_navigation || [],
+                                shop_goods_category: data.shop_goods_category || [],
+                                data: (data.data || null) != null && data.data.length != 0 ? data.data : null,
+                                layout_data: data.layout_data || [],
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: true
+                            });
+
+                            if ((this.data || null) != null) {
+                                // 基础自定义分享
+                                this.setData({
+                                    share_info: {
+                                        title: this.data.seo_title || this.data.name,
+                                        desc: this.data.seo_desc,
+                                        path: '/pages/plugins/shop/design/design',
+                                        query: 'id='+this.data.id,
+                                        img: this.data.logo
+                                    }
+                                });
+
+                                // 标题名称
+                                uni.setNavigationBarTitle({
+                                    title: this.data.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: this.$t('common.internet_error_tips')
+                        });
+                    }
+                });
+            }
+        }
+    };
+</script>
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/plugins/shop/detail/detail.css b/pages/plugins/shop/detail/detail.css
new file mode 100644
index 0000000..be9f5f5
--- /dev/null
+++ b/pages/plugins/shop/detail/detail.css
@@ -0,0 +1,125 @@
+/**
+* 搜索
+*/
+.search {
+    border: 2rpx solid;
+    padding: 2rpx;
+}
+
+.search button {
+    width: 140rpx;
+    height: 56rpx;
+    line-height: 56rpx;
+    padding: 0;
+}
+
+.search input {
+    height: 56rpx;
+    line-height: 56rpx;
+}
+
+.search-btn {
+    width: 148rpx;
+}
+
+.search-btn button {
+    width: 100%;
+    padding: 0;
+    height: 64rpx;
+    line-height: 64rpx;
+}
+
+/**
+* 头部
+*/
+.header {
+    padding: 20rpx 24rpx;
+    font-size: 24rpx;
+}
+
+.shop-logo {
+    width: 90rpx;
+}
+
+.base-bottom image {
+    width: 28rpx;
+    height: 28rpx;
+}
+
+.header .base {
+    width: calc(100% - 110rpx);
+}
+
+.shop-title {
+    line-height: 40rpx;
+}
+
+/**
+* 导航
+*/
+.nav .nav-scroll {
+    float: right;
+    width: calc(100% - 172rpx);
+}
+
+.nav .nav-scroll .item.par {
+    height: 56rpx;
+    line-height: 56rpx;
+    white-space: nowrap;
+}
+
+.nav .item {
+    padding: 0 20rpx;
+}
+
+.nav-shop-category {
+    padding-right: 32rpx !important;
+    background-size: 28rpx 28rpx;
+    height: 56rpx;
+    line-height: 56rpx;
+}
+
+.nav .nav-items {
+    left: calc(50% - 212rpx);
+    top: 322rpx;
+    z-index: 1;
+    border-radius: 0 0 8rpx 8rpx;
+    box-shadow: 0 12rpx 12rpx rgb(0 0 0 / 10%);
+}
+
+.nav .nav-items .item {
+    padding: 20rpx;
+}
+
+/**
+* 导航商品分类
+*/
+.nav-category {
+    z-index: 1;
+    box-shadow: 0 12rpx 12rpx rgb(0 0 0 / 10%);
+    border-bottom-right-radius: 8rpx;
+    margin-top: 70rpx;
+}
+
+.nav-category .category-scroll {
+    max-height: 600rpx;
+}
+
+.nav-category .item {
+    padding: 20rpx;
+}
+
+/**
+* 商品分类切换
+*/
+.shop-category-list .item {
+    margin: 20rpx 0;
+}
+
+.shop-category-list .item {
+    margin-left: 20rpx;
+}
+
+.shop-category-list .item:last-child {
+    margin-right: 20rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/shop/detail/detail.vue b/pages/plugins/shop/detail/detail.vue
new file mode 100644
index 0000000..27b4773
--- /dev/null
+++ b/pages/plugins/shop/detail/detail.vue
@@ -0,0 +1,240 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(shop || null) != null" class="pr">
+            <!-- 头部 -->
+            <component-shop-header :propBase="data_base" :propShop="shop" :propShopGoodsCategory="shop_goods_category" :propShopNavigation="shop_navigation" :propShopFavorUser="shop_favor_user"></component-shop-header>
+
+            <!-- 数据模式 -->
+            <!-- 自动模式 -->
+            <block v-if="(shop.data_model || 0) == 0">
+                <view v-if="(data || null) != null && data.length > 0" class="wh-auto">
+                    <view class="padding-main">
+                        <component-goods-list :propData="{ style_type: 1, goods_list: data }" :propCurrencySymbol="currency_symbol"></component-goods-list>
+                        <button class="bg-main br-main cr-white round dis-block margin-top-xl margin-bottom-xl margin-horizontal-main" @tap="url_event" :data-value="'/pages/plugins/shop/search/search?shop_id=' + shop.id" size="mini">查看更多商品 >></button>
+                    </view>
+                </view>
+                <block v-else>
+                    <component-no-data propStatus="0"></component-no-data>
+                </block>
+            </block>
+
+            <!-- 标准模式 -->
+            <block v-if="(shop.data_model || 0) == 1">
+                <block v-if="((slider || null) != null && slider.length > 0) || ((data || null) != null && data.length > 0)">
+                    <view class="data-list padding-horizontal-main oh">
+                        <!-- 轮播 -->
+                        <view v-if="slider.length > 0" class="margin-top-main">
+                            <component-banner :propData="slider"></component-banner>
+                        </view>
+
+                        <!-- 商品列表 -->
+                        <view v-if="data.length > 0" :class="((slider || null) == null || slider.length == 0) ? 'margin-top-main' : ''">
+                            <block v-for="(item, index) in data" :key="index">
+                                <component-goods-list :propData="item" :propKeywordsUrl="'/pages/plugins/shop/search/search?shop_id=' + shop.id + '&keywords='" :propIsAutoPlay="true" :propCurrencySymbol="currency_symbol"></component-goods-list>
+                            </block>
+                        </view>
+                    </view>
+                </block>
+                <block v-else>
+                    <component-no-data propStatus="0"></component-no-data>
+                </block>
+            </block>
+
+            <!-- 拖拽模式 -->
+            <block v-if="(shop.data_model || 0) == 2">
+                <block v-if="(data || null) != null && data.length > 0">
+                    <!-- 拖拽模式、引入拖拽数据模块 -->
+                    <component-layout :propData="data"></component-layout>
+                </block>
+                <block v-else>
+                    <component-no-data propStatus="0"></component-no-data>
+                </block>
+            </block>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentLayout from '@/components/layout/layout';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentBanner from '@/components/slider/slider';
+    import componentGoodsList from '@/components/goods-list/goods-list';
+    import componentShopHeader from '../components/shop-header/shop-header';
+    var common_static_url = app.globalData.get_static_url('common');
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                currency_symbol: app.globalData.currency_symbol(),
+                params: null,
+                data_base: null,
+                shop: null,
+                shop_favor_user: [],
+                shop_navigation: [],
+                shop_goods_category: [],
+                slider: [],
+                data: [],
+                search_keywords_value: '',
+                popup_service_status: false,
+                nav_category_status: false,
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+        components: {
+            componentCommon,
+            componentLayout,
+            componentNoData,
+            componentBottomLine,
+            componentBanner,
+            componentGoodsList,
+            componentShopHeader
+        },
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            params = app.globalData.launch_params_handle(params);
+            // 是否指定店铺id
+            var shop_id = app.globalData.data.plugins_shop_id || null;
+            if(shop_id != null) {
+                params['id'] = shop_id;
+            }
+            this.setData({
+                params: params
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.get_data();
+
+            // 初始化配置
+            this.init_config();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            if(this.data_list_loding_status === 1) {
+                uni.stopPullDownRefresh();
+            } else {
+                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');
+                }
+            },
+
+            // 获取数据
+            get_data(params = {}) {
+                // 网络检查
+                if((params || null) == null || (params.loading || 0) == 0) {
+                    app.globalData.network_type_handle(this, 'get_data', params);
+                    return false;
+                }
+
+                // 请求数据
+                uni.request({
+                    url: app.globalData.get_request_url('detail', 'index', 'shop'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var base = data.base || null;
+                            var temp_data = data.data || [];
+                            this.setData({
+                                data_base: base,
+                                shop: data.shop || null,
+                                shop_favor_user: data.shop_favor_user || [],
+                                shop_navigation: data.shop_navigation || [],
+                                shop_goods_category: data.shop_goods_category || [],
+                                data: temp_data,
+                                slider: data.slider || [],
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: temp_data.length > 0,
+                            });
+                            if ((this.shop || null) != null) {
+                                // 基础自定义分享
+                                this.setData({
+                                    share_info: {
+                                        title: this.shop.seo_title || this.shop.name,
+                                        desc: this.shop.seo_desc || this.shop.describe,
+                                        path: '/pages/plugins/shop/detail/detail',
+                                        query: 'id=' + this.shop.id,
+                                        img: this.shop.share_images || this.shop.logo,
+                                    },
+                                });
+                                // 标题名称
+                                uni.setNavigationBarTitle({
+                                    title: this.shop.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: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        }
+    };
+</script>
+<style>
+    @import './detail.css';
+</style>
\ No newline at end of file
diff --git a/pages/plugins/shop/favor/favor.css b/pages/plugins/shop/favor/favor.css
new file mode 100644
index 0000000..59b5e28
--- /dev/null
+++ b/pages/plugins/shop/favor/favor.css
@@ -0,0 +1,8 @@
+.base {
+    min-height: 140rpx;
+    margin-left: 160rpx;
+}
+.logo {
+    width: 140rpx;
+    height: 140rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/shop/favor/favor.vue b/pages/plugins/shop/favor/favor.vue
new file mode 100644
index 0000000..bc3f67d
--- /dev/null
+++ b/pages/plugins/shop/favor/favor.vue
@@ -0,0 +1,257 @@
+<template>
+    <view :class="theme_view">
+        <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="padding-main border-radius-main oh bg-white spacing-mb">
+                    <view :data-value="'/pages/plugins/shop/detail/detail?id=' + item.shop_info.id" @tap="url_event" class="cp">
+                        <image class="logo fl radius" :src="item.shop_info.logo" mode="aspectFill"></image>
+                        <view class="base">
+                            <view class="single-text fw-b">{{item.shop_info.name}}</view>
+                            <view class="multi-text cr-grey margin-top-sm">{{item.shop_info.describe}}</view>
+                        </view>
+                    </view>
+                    <button class="br-yellow cr-yellow bg-white fr round" type="default" size="mini" @tap="cancel_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('common.cancel')}}</button>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            // 获取数据
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+                
+                // 是否加载中
+                if(this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1
+                });
+                
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+                
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("index", "shopfavor", "shop"),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page
+                    },
+                    dataType: 'json',
+                    success: res => {
+                        if (this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            // 数据列表
+                            var data = res.data.data;
+                            if (this.data_page <= 1) {
+                                var temp_data_list = data.data_list || [];
+                            } else {
+                                var temp_data_list = this.data_list || [];
+                                var temp_data = data.data_list;
+                                for (var i in temp_data) {
+                                    temp_data_list.push(temp_data[i]);
+                                }
+                            }
+                        
+                            this.setData({
+                                data_list: temp_data_list,
+                                data_total: data.total,
+                                data_page_total: data.page_total,
+                                data_list_loding_status: temp_data_list.length > 0 ? 3 : 0,
+                                data_list_loding_msg: '',
+                                data_page: this.data_page + 1,
+                                data_is_loading: 0,
+                            });
+                        
+                            // 是否还有数据
+                            this.setData({
+                                data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            app.globalData.is_login_check(res.data, this, 'get_data_list');
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    }
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 取消
+            cancel_event(e) {
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('order.order.pn78ns'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('recommend-list.recommend-list.w9460o'),
+                    success: result => {
+                        if (result.confirm) {
+                            // 参数
+                            var id = e.currentTarget.dataset.value;
+                            var index = e.currentTarget.dataset.index;
+                            
+                            // 加载loding
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text')
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url("delete", "shopfavor", "shop"),
+                                method: 'POST',
+                                data: {
+                                    ids: id
+                                },
+                                dataType: 'json',
+                                success: res => {
+                                    uni.hideLoading();
+
+                                    if (res.data.code == 0) {
+                                        var temp_data_list = this.data_list;
+                                        temp_data_list.splice(index, 1);
+                                        this.setData({
+                                            data_list: temp_data_list
+                                        });
+                                        if (temp_data_list.length == 0) {
+                                            this.setData({
+                                                data_list_loding_status: 0,
+                                                data_bottom_line_status: false
+                                            });
+                                        }
+                                        app.globalData.showToast(res.data.msg, 'success');
+                                    } else {
+                                        if (app.globalData.is_login_check(res.data)) {
+                                            app.globalData.showToast(res.data.msg);
+                                        } else {
+                                            app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                        }
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                }
+                            });
+                        }
+                    }
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        }
+    };
+</script>
+<style>
+    @import './favor.css';
+</style>
\ No newline at end of file
diff --git a/pages/plugins/shop/index/index.css b/pages/plugins/shop/index/index.css
new file mode 100644
index 0000000..881020b
--- /dev/null
+++ b/pages/plugins/shop/index/index.css
@@ -0,0 +1,20 @@
+/**
+* 数据列表
+*/
+.data-list .item {
+    width: calc(50% - 10rpx);
+    margin-bottom: 20rpx;
+}
+
+.data-list .item:nth-child(2n) {
+    float: right;
+}
+
+.data-list .item:nth-child(2n+1) {
+    float: left;
+}
+
+.data-list .item .logo {
+    width: 100%;
+    height: 160rpx !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/shop/index/index.vue b/pages/plugins/shop/index/index.vue
new file mode 100644
index 0000000..0d5045c
--- /dev/null
+++ b/pages/plugins/shop/index/index.vue
@@ -0,0 +1,317 @@
+<template>
+    <view :class="theme_view">
+        <!-- 分类 -->
+        <scroll-view v-if="(shop_category || null) != null && shop_category.length > 0" class="nav-base scroll-view-horizontal bg-white oh" scroll-x="true">
+            <block v-for="(item, index) in shop_category" :key="index">
+                <view :class="'item cr-grey dis-inline-block padding-horizontal-main ' + (nav_active_value == item.id ? 'cr-main nav-active-line fw-b' : '')" @tap="nav_event" :data-value="item.id">
+                    {{ item.name }}
+                </view>
+            </block>
+        </scroll-view>
+
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav plugins-shop-data-list" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="(data_list || null) != null && data_list.length > 0" class="data-list padding-horizontal-main padding-top-main oh">
+                <block v-for="(item, index) in data_list" :key="index">
+                    <view :data-value="'/pages/plugins/shop/detail/detail?id=' + item.id" @tap="url_event" class="item border-radius-main bg-white oh cp spacing-mb">
+                        <image :src="item.logo_long" class="logo" mode="aspectFit"></image>
+                        <view class="tc">
+                            <view class="single-text padding-horizontal-main padding-top-main">
+                                <!-- 标题 -->
+                                <text class="fw-b text-size-md va-m">{{ item.name }}</text>
+                                <!-- 认证信息 -->
+                                <view v-if="(data_base.is_enable_auth || 0) == 1 && ((item.auth_type != -1 && (item.auth_type_msg || null) != null) || ((item.bond_status || 0) == 1 && (item.bond_status_msg || null) != null))" class="auth-icon dis-inline-block margin-left-sm">
+                                    <!-- 实名认证 -->
+                                    <block v-if="item.auth_type != -1 && (item.auth_type_msg || null) != null">
+                                        <block v-if="item.auth_type == 0">
+                                            <image :src="data_base.shop_auth_personal_icon" class="icon va-m" mode="aspectFill"></image>
+                                        </block>
+                                        <block v-if="item.auth_type == 1">
+                                            <image :src="data_base.shop_auth_company_icon" class="icon va-m" mode="aspectFill"></image>
+                                        </block>
+                                    </block>
+                                    <!-- 保证金认证 -->
+                                    <block v-if="(item.bond_status || 0) == 1 && (item.bond_status_msg || null) != null">
+                                        <image :src="data_base.shop_auth_bond_icon" class="icon va-m" mode="aspectFill"></image>
+                                    </block>
+                                </view>
+                            </view>
+                            <view class="cr-grey padding-main">
+                                <text class="multi-text">{{ item.describe }}</text>
+                            </view>
+                            <view class="oh br-t-dashed padding-main">
+                                <view class="fl cr-grey-9 single-text"
+                                    >{{$t('recommend-list.recommend-list.x74z3o')}}<text class="cr-black fw-b padding-left-sm">{{ item.goods_count }}</text></view
+                                >
+                                <view class="fr cr-grey-9 single-text"
+                                    >{{$t('goods-category.goods-category.at5p35')}}<text class="cr-black fw-b padding-left-sm">{{ item.goods_sales_count }}</text></view
+                                >
+                            </view>
+                        </view>
+                    </view>
+                </block>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                params: null,
+                data_base: null,
+                shop_category: [],
+                nav_active_value: 0,
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 参数处理
+            params = app.globalData.launch_params_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+                nav_active_value: params.category_id || 0,
+            });
+            // 数据加载
+            this.get_data();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            if(this.data_list_loding_status === 1) {
+                uni.stopPullDownRefresh();
+            } else {
+                this.setData({
+                    data_page: 1,
+                });
+                this.get_data_list(1);
+            }
+        },
+
+        methods: {
+            // 初始化
+            get_data(params = {}) {
+                // 网络检查
+                if((params || null) == null || (params.loading || 0) == 0) {
+                    app.globalData.network_type_handle(this, 'get_data', params);
+                    return false;
+                }
+
+                // 请求数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'index', 'shop'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_base: data.base || null,
+                                shop_category: data.shop_category || [],
+                            });
+                            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/shop/index/index',
+                                    },
+                                });
+                                // 导航名称
+                                if ((this.data_base.application_name || null) != null) {
+                                    uni.setNavigationBarTitle({
+                                        title: this.data_base.application_name,
+                                    });
+                                }
+                            }
+                            // 获取列表数据
+                            this.get_data_list(1);
+                        } else {
+                            this.setData({
+                                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_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('index.index.f69r4i'),
+                        });
+                    },
+                });
+            },
+
+            // 获取数据列表
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                });
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('shoplist', 'index', 'shop'),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page,
+                        category_id: this.nav_active_value || 0,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            if (data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: data.total,
+                                    data_page_total: data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_is_loading: 0,
+                                });
+                                if (this.data_page <= 1) {
+                                    this.setData({
+                                        data_list: [],
+                                        data_bottom_line_status: false,
+                                    });
+                                }
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                                data_is_loading: 0,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_active_value: e.currentTarget.dataset.value || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import './index.css';
+</style>
diff --git a/pages/plugins/shop/license/license.vue b/pages/plugins/shop/license/license.vue
new file mode 100644
index 0000000..e647ce9
--- /dev/null
+++ b/pages/plugins/shop/license/license.vue
@@ -0,0 +1,129 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="(data || null) != null">
+            <!-- 主体信息 -->
+            <view class="padding-main">
+                <view class="fw-b text-size margin-top-xxl">{{ data.title }}</view>
+                <view class="text-size-xs cr-grey margin-top-sm">{{ data.sub_title }}</view>
+                <view class="br padding-main margin-top-lg bg-white border-radius-main">
+                    <image :src="data.images" class="wh-auto border-radius-main dis-block" mode="aspectFill" :data-value="data.images" @tap="image_show_event"></image>
+                </view>
+                <view v-if="(data.tips || null) != null && data.tips.length > 0" class="cr-grey margin-top-lg text-size-xs">
+                    <block v-for="(item, index) in data.tips" :key="index">
+                        <view class="margin-top-sm">{{ item }}</view>
+                    </block>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                params: null,
+                data: null,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.get_data();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        methods: {
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url("index", "license", "shop"),
+                    method: "POST",
+                    data: {
+                        id: this.params.id || 0,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data: res.data.data || null,
+                                layout_data: data.layout_data || [],
+                                data_list_loding_msg: "",
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: true,
+                            });
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 图片预览
+            image_show_event(e) {
+                app.globalData.image_show_event(e);
+            },
+        },
+    };
+</script>
+<style></style>
diff --git a/pages/plugins/shop/search/search.css b/pages/plugins/shop/search/search.css
new file mode 100644
index 0000000..71c1f88
--- /dev/null
+++ b/pages/plugins/shop/search/search.css
@@ -0,0 +1,76 @@
+/**
+* 排序导航
+*/
+.nav-sort-content .item {
+    height: 80rpx;
+    line-height: 80rpx;
+    width: calc(20% - 33.33rpx);
+}
+.nav-sort-content .item .icon {
+    width: 30rpx;
+    height: 30rpx !important;
+}
+.screening-submit {
+    width: 50rpx;
+    height: 50rpx;
+    top: 15rpx;
+    right: 80rpx !important;
+}
+.show-type-submit {
+    width: 50rpx;
+    height: 50rpx !important;
+    top: 15rpx;
+    right: 16rpx;
+}
+
+/**
+* 条件
+*/
+.search-map {
+    height: calc(100vh - 180rpx);
+    overflow-y: scroll;
+    overflow-x: hidden;
+}
+.search-map,
+.search-map .search-submit {
+    width: 660rpx;
+}
+.map-keywords {
+    padding: 0 20rpx;
+    line-height: 66rpx;
+    height: 66rpx;
+    font-size: 26rpx;
+    box-sizing: border-box;
+}
+.map-nav text:first-child {
+    font-weight: bold;
+}
+.map-nav .arrow-bottom {
+    top: 0;
+    right: 10rpx;
+    padding-right: 46rpx;
+}
+.map-item {
+    line-height: 66rpx;
+}
+.map-content {
+    line-height: 50rpx;
+}
+.map-content .item {
+    margin-bottom: 20rpx;
+}
+.map-content .item:not(:last-child) {
+    margin-right: 20rpx;
+}
+.map-text-item .item {
+    padding: 0 15rpx;
+    border: 1px solid transparent;
+}
+.search-map .search-submit {
+    left: 0;
+    bottom: 0;
+}
+.search-map .search-submit .btn {
+    height: 80rpx;
+    line-height: 80rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/shop/search/search.vue b/pages/plugins/shop/search/search.vue
new file mode 100644
index 0000000..becb4b5
--- /dev/null
+++ b/pages/plugins/shop/search/search.vue
@@ -0,0 +1,567 @@
+<template>
+    <view :class="theme_view">
+        <!-- 排序 -->
+        <view class="nav-sort bg-white oh pr">
+            <view class="nav-sort-content">
+                <block v-for="(item, index) in search_nav_sort_list" :key="index">
+                    <view class="item tc fl" :data-index="index" @tap="nav_sort_event">
+                        <text class="cr-base va-m">{{item.name}}</text>
+                        <image v-if="(item.icon || null) != null" class="icon va-m" :src="common_static_url + 'sort-' + item.icon + '-icon.png'" mode="aspectFill"></image>
+                    </view>
+                </block>
+            </view>
+            <image class="screening-submit pa cp" :src="common_static_url+'search-submit-icon.png'" mode="aspectFill" @tap="popup_form_event_show"></image>
+            <image class="show-type-submit pa cp" :src="common_static_url+'show-'+(data_show_type_value == 0 ? 'grid' : 'list')+'-icon.png'" mode="aspectFill" @tap="data_show_type_event"></image>
+        </view>
+
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="padding-horizontal-main padding-top-main oh">
+                <component-goods-list :propData="{style_type: data_show_type_value, goods_list: data_list}" :propCurrencySymbol="currency_symbol"></component-goods-list>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 筛选条件 popup -->
+        <component-popup :propShow="is_show_popup_form" propPosition="left" @onclose="popup_form_event_close">
+            <form @submit="form_submit_event" class="popup-form oh">
+                <view class="search-map padding-main bg-base">
+                    <view class="padding-main border-radius-main bg-white">
+                        <view class="map-item map-base br-b">
+                            <text>{{$t('goods-search.goods-search.j8o278')}}</text>
+                            <text class="cr-main"> {{data_total}} </text>
+                            <text>{{$t('goods-search.goods-search.t9nikq')}}</text>
+                            <text class="fr cr-red" @tap="map_remove_event">{{$t('goods-search.goods-search.pxk051')}}</text>
+                        </view>
+                        <!-- 搜索关键字 -->
+                        <input type="text" confirm-type="done" :placeholder="$t('search.search.723rbx')" name="wd" :value="(post_data.wd || '')" class="map-keywords wh-auto round bg-base margin-top-lg" placeholder-class="cr-grey">
+                    </view>
+
+                    <!-- 分类 -->
+                    <view v-if="(search_map_list.category_list || null) != null && search_map_list.category_list.length > 0" class="map-item padding-horizontal-main padding-top-main border-radius-main bg-white spacing-mt">
+                        <view class="map-nav pr br-b">
+                            <text>{{$t('common.category')}}</text>
+                            <text class="arrow-bottom pa cr-grey" v-if="search_map_list.category_list.length > 3" @tap="more_event" data-value="category_list">{{$t('common.more')}}</text>
+                        </view>
+                        <view class="map-content map-text-item map-category-container oh margin-top-lg" :style="'height:' + map_fields_list.category_list.height + ';'">
+                            <block v-for="(item, index) in search_map_list.category_list" :key="index">
+                                <view :class="'item fl radius ' + (item.active == 1 ? 'cr-main br-main' : 'cr-base')" @tap="map_item_event" :data-value="item.id" data-field="category_list">{{item.name}}</view>
+                            </block>
+                        </view>
+                        <block v-for="(item, index) in search_map_list.category_list" :key="index">
+                            <view v-if="item.active == 1 && (item.items || null) != null && item.items.length > 0" class="map-category-two map-text-item padding-bottom">
+                                <view class="bg-grey-f7 oh radius padding-sm">
+                                    <block v-for="(item2, index2) in item.items" :key="index2">
+                                        <view :class="'item fl radius ' + (item2.active == 1 ? 'cr-main' : 'cr-base')" @tap="map_item_event" :data-pvalue="item.id" :data-value="item2.id" data-field="category_list">{{item2.name}}</view>
+                                    </block>
+                                </view>
+                            </view>
+                        </block>
+                    </view>
+
+                    <view class="search-submit padding-main pa">
+                        <button form-type="submit" class="btn bg-main cr-white text-size wh-auto round" :disabled="popup_form_loading_status" hover-class="none">{{$t('common.confirm')}}</button>
+                    </view>
+                </view>
+            </form>
+        </component-popup>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentPopup from "@/components/popup/popup";
+    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 common_static_url = app.globalData.get_static_url('common');
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                currency_symbol: app.globalData.currency_symbol(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                params: null,
+                post_data: {},
+                shop: null,
+                is_show_popup_form: false,
+                popup_form_loading_status: false,
+                // 排序导航
+                search_nav_sort_index: 0,
+                search_nav_sort_list: [
+                    { name: this.$t('goods-category.goods-category.x69aow'), field: "default", sort: "asc", "icon": null },
+                    { name: this.$t('goods-category.goods-category.at5p35'), field: "sales_count", sort: "asc", "icon": "default" },
+                    { name: this.$t('goods-category.goods-category.283ot0'), field: "access_count", sort: "asc", "icon": "default" },
+                    { name: this.$t('goods-category.goods-category.g2u3lf'), field: "min_price", sort: "asc", "icon": "default" },
+                    { name: this.$t('goods-category.goods-category.5p4ksj'), field: "id", sort: "asc", "icon": "default" }
+                ],
+                // 数据展示样式（0图文、1九方格）
+                data_show_type_value: 1,
+                // 搜素条件
+                search_map_list: {
+                    category_list: []
+                },
+                map_fields_list: {
+                    category_list: {height: "82rpx", default: "82rpx", form_key: "category_ids"}
+                },
+                // 自定义分享信息
+                share_info: {}
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentPopup,
+            componentNoData,
+            componentBottomLine,
+            componentGoodsList
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+                post_data: {
+                    wd: params.keywords || '',
+                    shop_id: params.shop_id || 0,
+                    category_ids: ((params.category_id || 0) == 0) ? '' : JSON.stringify({"0":params.category_id})
+                }
+            });
+
+            // 数据加载
+            this.get_data();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 初始化配置
+            this.init_config();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1
+            });
+            this.get_data_list(1);
+        },
+
+        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() {
+                var post_data = this.request_map_handle();
+                uni.request({
+                    url: app.globalData.get_request_url("index", "search", "shop"),
+                    method: 'POST',
+                    data: post_data,
+                    dataType: 'json',
+                    success: res => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            // 分类选中处理
+                            var category = data.shop_goods_category || [];
+                            if((this.params.category_id || 0) != 0 && category.length > 0) {
+                                for(var i in category) {
+                                    category[i]['active'] = (category[i]['id'] == this.params.category_id) ? 1 : 0;
+                                    if((category[i]['items'] || null) != null && category[i]['items'].length > 0) {
+                                        for(var x in category[i]['items']) {
+                                            category[i]['items'][x]['active'] = (category[i]['items'][x]['id'] == this.params.category_id) ? 1 : 0;
+                                        }
+                                    }
+                                }
+                            }
+                            this.setData({
+                                shop: data.shop || null,
+                                search_map_info: data.search_map_info || [],
+                                search_map_list: {
+                                    category_list: category
+                                }
+                            });
+
+                            if((this.shop || null) != null) {
+                                // 获取列表数据
+                                this.get_data_list(1);
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_bottom_line_status: false
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    }
+                });
+            },
+
+            // 获取数据列表
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 基础自定义分享
+                this.share_info_handle();
+                
+                // 是否加载中
+                if(this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({data_is_loading: 1});
+                
+                // 获取数据
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+                var post_data = this.request_map_handle();
+                uni.request({
+                    url: app.globalData.get_request_url("datalist", "search", "shop"),
+                    method: 'POST',
+                    data: post_data,
+                    dataType: 'json',
+                    success: res => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            if (data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: data.total,
+                                    data_page_total: data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total)
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_total: 0,
+                                    data_is_loading: 0
+                                });
+                                if (this.data_page <= 1) {
+                                    this.setData({
+                                        data_list: [],
+                                        data_bottom_line_status: false
+                                    });
+                                }
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    }
+                });
+            },
+
+            // 搜索条件处理
+            request_map_handle() {
+                var params = this.params;
+                var post_data = this.post_data;
+                post_data['page'] = this.data_page;
+                
+                // 店铺id
+                post_data['shop_id'] = params['shop_id'] || 0;
+
+                // 搜索条件
+                var temp_field = this.map_fields_list;
+                var temp_list = this.search_map_list;
+                for (var i in temp_field) {
+                    if (temp_list[i] != null != null && temp_list[i].length > 0) {
+                        var value = '';
+                        for (var k in temp_list[i]) {
+                            if ((temp_list[i][k]['active'] || 0) == 1) {
+                                value = temp_list[i][k]['id'];
+                                if((temp_list[i][k]['items'] || null) != null) {
+                                    for(var x in temp_list[i][k]['items']) {
+                                        if ((temp_list[i][k]['items'][x]['active'] || 0) == 1) {
+                                            value = temp_list[i][k]['items'][x]['id'];
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        post_data[temp_field[i]['form_key']] = value;
+                    }
+                }
+                
+                // 排序
+                var temp_index = this.search_nav_sort_index;
+                var temp_search_nav_sort = this.search_nav_sort_list;
+                post_data['order_by_type'] = temp_search_nav_sort[temp_index]['sort'] == 'desc' ? 'asc' : 'desc';
+                post_data['order_by_field'] = temp_search_nav_sort[temp_index]['field'];
+
+                return post_data;
+            },
+
+            // 分享设置处理
+            share_info_handle() {
+                if((this.shop || null) != null) {
+                    // 基础自定义分享
+                    var shop_id = this.shop.id;
+                    var category_id = this.params.category_id || 0;
+                    var keywords = this.post_data.wd || '';
+                    this.setData({
+                        share_info: {
+                            title: this.shop.seo_title || this.shop.name,
+                            desc: this.shop.seo_desc || this.shop.describe,
+                            path: '/pages/plugins/shop/search/search',
+                            query: 'shop_id='+shop_id+'&category_id='+category_id+'&keywords='+keywords,
+                            img: this.shop.logo
+                        }
+                    });
+                }
+
+                // 分享菜单处理
+                app.globalData.page_share_handle(this.share_info);
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 搜索条件
+            form_submit_event(e) {
+                this.setData({
+                    post_data: e.detail.value,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+                this.popup_form_event_close();
+            },
+
+            // 筛选条件关闭
+            popup_form_event_close(e) {
+                this.setData({
+                    is_show_popup_form: false
+                });
+            },
+
+            // 筛选条件开启
+            popup_form_event_show(e) {
+                this.setData({
+                    is_show_popup_form: true
+                });
+            },
+
+            // 排序事件
+            nav_sort_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var temp_search_nav_sort = this.search_nav_sort_list;
+                var temp_sort = temp_search_nav_sort[index]['sort'] == 'desc' ? 'asc' : 'desc';
+                for (var i in temp_search_nav_sort) {
+                    if (i != index) {
+                        if (temp_search_nav_sort[i]['icon'] != null) {
+                            temp_search_nav_sort[i]['icon'] = 'default';
+                        }
+                        temp_search_nav_sort[i]['sort'] = 'desc';
+                    }
+                }
+                temp_search_nav_sort[index]['sort'] = temp_sort;
+                if (temp_search_nav_sort[index]['icon'] != null) {
+                    temp_search_nav_sort[index]['icon'] = temp_sort;
+                }
+
+                this.setData({
+                    search_nav_sort_index: index,
+                    search_nav_sort_list: temp_search_nav_sort,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 条件-更多数据展示事件
+            more_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                var temp_more = this.map_fields_list;
+                if (value != null && (temp_more[value] || null) != null) {
+                    temp_more[value]['height'] = temp_more[value]['height'] == 'auto' ? temp_more[value]['default'] : 'auto';
+                    this.setData({
+                        map_fields_list: temp_more
+                    });
+                }
+            },
+
+            // 条件-选择事件
+            map_item_event(e) {
+                var pvalue = e.currentTarget.dataset.pvalue;
+                var value = e.currentTarget.dataset.value;
+                var field = e.currentTarget.dataset.field;
+                var temp_list = this.search_map_list;
+                if ((temp_list[field] || null) != null) {
+                    if(pvalue === undefined) {
+                        for(var i in temp_list[field]) {
+                            temp_list[field][i]['active'] = (temp_list[field][i]['id'] == value) ? (temp_list[field][i]['active'] == 1 ? 0 : 1) : 0;
+                            // 当前没有选中则取消子级数据的选中
+                            if(temp_list[field][i]['active'] == 0 && (temp_list[field][i]['items'] || null) != null) {
+                                for(var x in temp_list[field][i]['items']) {
+                                    temp_list[field][i]['items'][x]['active'] = 0;
+                                }
+                            }
+                        }
+                    } else {
+                        for(var i in temp_list[field]) {
+                            temp_list[field][i]['active'] = (temp_list[field][i]['id'] == pvalue) ? 1 : 0;
+                            if((temp_list[field][i]['items'] || null) != null) {
+                                for(var x in temp_list[field][i]['items']) {
+                                    temp_list[field][i]['items'][x]['active'] = (temp_list[field][i]['items'][x]['id'] == value) ? (temp_list[field][i]['items'][x]['active'] == 1 ? 0 : 1) : 0;
+                                    // 选中父级
+                                    if(temp_list[field][i]['items'][x]['active'] == 1) {
+                                        temp_list[field][i]['active'] = 1;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    this.setData({
+                        search_map_list: temp_list,
+                    });
+                }
+            },
+
+            // 条件-清空
+            map_remove_event(e) {
+                var temp_list = this.search_map_list;
+                var temp_post = this.post_data;
+                
+                // 关键字
+                temp_post['wd'] = '';
+                
+                // 分类
+                for (var i in temp_list) {
+                    if((temp_list[i] || null) != null && temp_list[i].length > 0) {
+                        for(var k in temp_list[i]) {
+                            temp_list[i][k]['active'] = 0;
+                            if((temp_list[i][k]['items'] || null) != null) {
+                                for(var x in temp_list[i][k]['items']) {
+                                    temp_list[i][k]['items'][x]['active'] = 0;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // 排序导航
+                var temp_search_nav_sort = this.search_nav_sort_list;
+                for (var i in temp_search_nav_sort) {
+                    temp_search_nav_sort[i]['sort'] = 'asc';
+                    temp_search_nav_sort[i]['icon'] = (temp_search_nav_sort[i]['field'] == 'default') ? null : 'default';
+                }
+                
+                // 关闭弹窗、分页恢复1页、重新获取数据
+                this.setData({
+                    search_map_list: temp_list,
+                    post_data: temp_post,
+                    is_show_popup_form: false,
+                    search_nav_sort_list: temp_search_nav_sort,
+                    search_nav_sort_index: 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 数据展示类型
+            data_show_type_event(e) {
+                this.setData({data_show_type_value: this.data_show_type_value == 0 ? 1 : 0});
+            }
+        }
+    };
+</script>
+<style>
+    @import './search.css';
+</style>
\ No newline at end of file
diff --git a/pages/plugins/signin/components/user-qrcode/user-qrcode.vue b/pages/plugins/signin/components/user-qrcode/user-qrcode.vue
new file mode 100644
index 0000000..da4e74f
--- /dev/null
+++ b/pages/plugins/signin/components/user-qrcode/user-qrcode.vue
@@ -0,0 +1,225 @@
+<template>
+    <view :class="theme_view">
+        <scroll-view :scroll-y="true" :class="'scroll-box-ece-nav ' + ((data_base || null) != null && (data_base.signin_desc || null) != null && data_base.signin_desc.length > 0 ? 'top-notice' : '')" lower-threshold="60">
+            <view class="data-list" :class="(data_base || null) != null && (data_base.is_team || 0) == 1 ? 'page-bottom-fixed' : ''">
+                <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                    <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                        <view class="base oh br-b-dashed padding-bottom-main flex-row jc-sb align-c">
+                            <text class="cr-grey-9">{{ item.add_time }}</text>
+                            <text>{{ item.is_enable_name }}</text>
+                        </view>
+                        <view :data-value="'/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail?id=' + item.id" @tap="url_event" class="content margin-top cp">
+                            <view v-for="(fv, fi) in content_list" :key="fi">
+                                <view class="single-text margin-top-xs">
+                                    <text class="cr-grey-9 margin-right-xl">{{ fv.name }}:</text>
+                                    <text class="cr-base">{{ item[fv.field] }}</text>
+                                    <text v-if="(fv.unit || null) != null" class="cr-grey">{{ fv.unit }}</text>
+                                </view>
+                            </view>
+                        </view>
+                        <view class="item-operation tr margin-top-main">
+                            <button class="round bg-white br-grey-9 text-size-md" type="default" size="mini" hover-class="none" :data-value="'/pages/plugins/signin/detail/detail?id='+item.id" @tap="url_event">{{ $t('detail.detail.y2217b') }}</button>
+                            <button v-if="(data_base.is_team_show_coming_user || 0) == 1" class="round bg-white cr-main br-main text-size-md" type="default" size="mini" hover-class="none" :data-value="'/pages/plugins/signin/user-coming-list/user-coming-list?id='+item.id" @tap="url_event">{{ $t('login.login.1i4o86') }}</button>
+                            <button class="round bg-white cr-main br-main text-size-md" type="default" size="mini" hover-class="none" :data-value="'/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo?id='+item.id" @tap="url_event">{{ $t('common.edit') }}</button>
+                        </view>
+                    </view>
+                </view>
+                <view v-else>
+                    <!-- 提示信息 -->
+                    <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+                    <!-- 组队 -->
+                    <view v-if="(data_base || null) != null && (data_base.is_team || 0) == 1" class="bottom-fixed">
+                        <view class="bottom-line-exclude">
+                            <button class="item cr-white bg-green br-green text-size auto round" type="default" hover-class="none" data-value="/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo" @tap="url_event">{{ $t('user-qrcode.user-qrcode.8p57v3') }}</button>
+                        </view>
+                    </view>
+                </view>
+                <!-- 结尾 -->
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            </view>
+        </scroll-view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+
+    export default {
+        props: {
+            propPullDownRefresh: {
+                type: Boolean,
+                default: false,
+            },
+            propScrollLower: {
+                type: Boolean,
+                default: false,
+            },
+        },
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                data_base: null,
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                content_list: [
+                    { name: this.$t('user-qrcode-detail.user-qrcode-detail.mjfygy'), field: 'reward_master', unit: this.$t('index.index.t26j9z') },
+                    { name: this.$t('user-qrcode-detail.user-qrcode-detail.pb2e32'), field: 'reward_invitee', unit: this.$t('index.index.t26j9z') },
+                ],
+            };
+        },
+
+        components: {
+            componentNoData,
+            componentBottomLine,
+        },
+        created() {
+            this.init();
+        },
+        mounted() {
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+        watch: {
+            propPullDownRefresh(newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.setData({
+                        data_page: 1,
+                    });
+                    this.get_data_list(1);
+                }
+            },
+            propScrollLower(newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.get_data_list();
+                }
+            },
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'userqrcode', 'signin'),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_base: res.data.data.base || null,
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_base: res.data.data.base || null,
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style scoped>
+    .scroll-box-ece-nav.top-notice {
+        height: calc(100vh - 154rpx);
+    }
+</style>
diff --git a/pages/plugins/signin/components/user-signin/user-signin.vue b/pages/plugins/signin/components/user-signin/user-signin.vue
new file mode 100644
index 0000000..309e136
--- /dev/null
+++ b/pages/plugins/signin/components/user-signin/user-signin.vue
@@ -0,0 +1,203 @@
+<template>
+    <view :class="theme_view">
+        <scroll-view :scroll-y="true" :class="'scroll-box-ece-nav '+((data_base || null) != null && (data_base.signin_desc || null) != null && data_base.signin_desc.length > 0 ? 'top-notice' : '')" lower-threshold="60">
+            <view class="data-list">
+                <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                    <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                        <block v-for="(fv, fi) in content_list" :key="fi">
+                            <view class="single-text margin-top-xs" :class="fi === 0 ? 'fw-b cr-black' : 'cr-grey-9'">
+                                <text class="margin-right-sm">{{ fv.name }}</text>
+                                <text>{{ item[fv.field] }}</text>
+                                <text v-if="(fv.unit || null) != null">{{ fv.unit }}</text>
+                            </view>
+                        </block>
+                    </view>
+                </view>
+                <view wx:else>
+                    <!-- 提示信息 -->
+                    <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+                </view>
+
+                <!-- 结尾 -->
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            </view>
+        </scroll-view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+
+    export default {
+        props: {
+            propPullDownRefresh: {
+                type: Boolean,
+                default: false,
+            },
+            propScrollLower: {
+                type: Boolean,
+                default: false,
+            }
+        },
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                data_base: null,
+                content_list: [
+                    { name: this.$t('user-coming-list.user-coming-list.xkwnl8'), field: 'integral' },
+                    { name: this.$t('user-coming-list.user-coming-list.sq4379'), field: 'add_time' },
+                ],
+            };
+        },
+
+        components: {
+            componentNoData,
+            componentBottomLine,
+        },
+        created() {
+            this.init();
+        },
+        mounted() {
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+        watch: {
+            propPullDownRefresh(newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.setData({
+                        data_page: 1,
+                    });
+                    this.get_data_list(1);
+                }
+            },
+            propScrollLower(newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.get_data_list();
+                }
+            },
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'usersignin', 'signin'),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_base: res.data.data.base || null,
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+        },
+    };
+</script>
+<style scoped>
+    .scroll-box-ece-nav.top-notice {
+        height: calc(100vh - 154rpx);
+    }
+</style>
diff --git a/pages/plugins/signin/detail/detail.css b/pages/plugins/signin/detail/detail.css
new file mode 100644
index 0000000..607f69f
--- /dev/null
+++ b/pages/plugins/signin/detail/detail.css
@@ -0,0 +1,197 @@
+/**
+* 签到
+*/
+.signin-container {
+    min-height: 100vh;
+    background-color: rgb(255 209 133);
+}
+
+.signin-opration-group {
+    top: calc(156rpx + var(--status-bar-height) + 5px);
+    right: -2rpx;
+}
+
+.share,
+.team {
+    margin-bottom: 36rpx;
+    background: linear-gradient(90deg, rgba(255, 255, 255, 0.72) 0%, rgba(255, 255, 255, 0) 100%);
+    box-shadow: 0 4rpx 8rpx 0 rgba(0, 61, 196, 0.51);
+    border-radius: 32rpx 0 0 32rpx;
+}
+
+.signin-opration-group .content {
+    margin: 2rpx;
+    padding: 12rpx 12rpx 12rpx 36rpx;
+    background: #2A82E1;
+    border-radius: 32rpx 0 0 32rpx;
+    color: #fff;
+    font-size: 28rpx;
+    line-height: normal;
+}
+
+.content .iconfont {
+    margin-right: 4rpx;
+}
+
+.signin-btn {
+    margin: -120rpx;
+}
+
+.signin-btn .content {
+    min-width: 216rpx;
+    padding: 12rpx 48rpx;
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
+    background: linear-gradient(98deg, #FF9734 0%, #FF1304 100%);
+    box-shadow: 0 4rpx 8rpx 0 rgba(185, 110, 22, 0.66);
+    border-radius: 44rpx;
+    border: 4rpx solid #FFE99B;
+    font-size: 40rpx;
+}
+
+.calendar-title {
+    color: #C48746;
+    padding: 24rpx;
+    background: #FEEBAF;
+    border-radius: 24rpx 24rpx 0 0;
+}
+
+.calendar-week {
+    line-height: 76rpx;
+    height: 76rpx;
+    background: #FEF6F8;
+}
+
+.calendar-days {
+    padding-bottom: 52rpx;
+    border-radius: 0 0 24rpx 24rpx;
+}
+
+.calendar-days .list {
+    width: calc(100% / 7);
+    height: 84rpx;
+    line-height: 84rpx;
+}
+
+.calendar-link-left,
+.calendar-link-right {
+    position: absolute;
+    top: -52rpx;
+    width: 24rpx;
+}
+
+.calendar-link-left {
+    left: 28rpx;
+}
+
+.calendar-link-right {
+    right: 28rpx;
+}
+
+.calendar-foot .content {
+    padding: 30rpx 40rpx;
+    border-radius: 24rpx;
+    color: #C48746;
+}
+
+.notice-content {
+    padding: 18rpx 24rpx;
+    color: #C48746;
+    background-color: #FEE6BC;
+}
+
+.notice-content .title {
+    height: 40rpx;
+}
+
+.notice-content .content {
+    line-height: 40rpx;
+}
+
+/**
+* 签到成功提示
+*/
+.coming-tips-container {
+    width: 100%;
+    height: 100%;
+    z-index: 1050;
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: rgb(0 0 0 / 0.6);
+}
+
+.coming-content {
+    position: fixed;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+}
+
+.coming-item {
+    width: 572rpx;
+    height: 446rpx;
+    margin: 0 auto;
+    position: relative;
+    background: linear-gradient(135deg, #EBE7F8 0%, #FEE3D0 51%, #FFEBE7 100%);
+    border-radius: 20px;
+    border: 1px solid #FCF7CC;
+}
+
+.coming-content image {
+    width: 292rpx;
+    left: 50%;
+    top: -90rpx;
+    transform: translateX(-50%);
+}
+
+.coming-content .title {
+    font-size: 42rpx;
+    color: #8D2407;
+    padding-top: 136rpx;
+}
+
+.coming-content .desc {
+    font-size: 28rpx;
+    margin-top: 18rpx;
+    color: #BC7059;
+    margin-bottom: 52rpx;
+}
+
+.coming-content .use-btn {
+    background: linear-gradient(180deg, #FF956B 0%, #FF2D0A 100%);
+    border-radius: 48rpx;
+    border: 2rpx solid #ffac78;
+    width: 294rpx;
+    height: 96rpx;
+    line-height: 96rpx;
+    margin: 0 auto;
+}
+
+.coming-content .close-sub {
+    bottom: -150rpx;
+    left: 50%;
+    transform: translateX(-50%);
+}
+
+/**
+* 媒体查询
+*/
+@media only screen and (min-width:960px) {
+    .signin-btn .content {
+        /* #ifdef H5 */
+        font-size: 64rpx;
+        border-radius: 128rpx;
+        padding: 24rpx 168rpx;
+        /* #endif */
+    }
+
+    .signin-btn {
+        /* #ifdef H5 */
+        margin: -240rpx;
+        /* #endif */
+    }
+}
\ No newline at end of file
diff --git a/pages/plugins/signin/detail/detail.vue b/pages/plugins/signin/detail/detail.vue
new file mode 100644
index 0000000..aac1bcf
--- /dev/null
+++ b/pages/plugins/signin/detail/detail.vue
@@ -0,0 +1,462 @@
+<template>
+    <view :class="theme_view">
+        <component-nav-back></component-nav-back>
+        <view v-if="(data || null) != null" class="signin-container">
+            <view class="pr oh">
+                <image :src="signin_static_url + 'signin-bg.png'" mode="widthFix" class="wh-auto"></image>
+                <view class="signin-opration-group pa flex-col cr-white">
+                    <view v-if="(data_base.is_share || 0) == 1" class="share oh flex-row"  @tap="share_event">
+                        <view class="content">
+                            <iconfont name="icon-share-square" propClass="pr top-xs" size="32rpx"></iconfont>
+                            <text>{{$t('common.share')}}</text>
+                        </view>
+                    </view>
+                    <view v-if="(data_base.is_team || 0) == 1 && (user || null) != null && data.user_id != user.id" class="team oh flex-row" @tap="team_event">
+                        <view class="content">
+                            <iconfont name="icon-qiandao-zudui" propClass="pr top-xs" size="34rpx"></iconfont>
+                            <text>{{$t('detail.detail.8ua11k')}}</text>
+                        </view>
+                    </view>
+                </view>
+                <view class="signin-btn pa left-0 right-0 tc">
+                    <view class="content cr-white" @tap="coming_event">
+                        <block v-if="is_already_coming == 1">{{$t('detail.detail.25x8ij')}}</block>
+                        <block v-else>{{$t('detail.detail.mvj266')}}<iconfont name="icon-arrow-right-round" color="#fff" size="32rpx" propClass="margin-left-sm"></iconfont>
+                        </block>
+                    </view>
+                </view>
+
+                <view class="padding-horizontal-main padding-bottom-main">
+                    <view class="signin-calendar spacing-mb">
+                        <view class="calendar-title flex-row align-c jc-sb">
+                            <view class="title-left fw-b text-size">
+                                {{ calendar }}
+                            </view>
+                            <view class="title-right text-size-md">
+                                <text v-if="(data_base.is_user_menu || 0) == 1" data-value="/pages/plugins/signin/user/user" @tap="url_event" class="cp">
+                                    <iconfont name="icon-qiandao-wdqd" size="32rpx" propClass="margin-right-sm pr top-sm"></iconfont>{{$t('detail.detail.31lky7')}}</text>
+                            </view>
+                        </view>
+                        <view class="calendar-week flex-row align-c jc-sa padding-horizontal-main">
+                            <view v-for="(item, index) in week" :key="index">
+                                {{ item }}
+                            </view>
+                        </view>
+                        <view class="calendar-days padding-horizontal-main bg-white spacing-mb">
+                            <view class="item flex-row jc-sa align-c" v-for="(row, rowIndex) in day_count" :key="rowIndex">
+                                <view v-for="(col, colIndex) in row" class="list tc" :class="col.class" :key="colIndex">
+                                    <block v-if="col.today">
+                                        <block v-if="user_signin_data && user_signin_data.current_day === 1">
+                                            <iconfont name="icon-qiandao-yixuan" color="#E22C08" size="48rpx"></iconfont>
+                                        </block>
+                                        <block v-else>
+                                            <text class="fw-b">{{$t('detail.detail.p07k62')}}</text>
+                                        </block>
+                                    </block>
+                                    <block v-else>
+                                        <!-- 判断bool是否存在数组signinHistory中    【 true则表示存在于数组中】 -->
+                                        <block v-if="user_signin_data && user_signin_data.history_day.some((item) => Number(item) === col.num) && col.current_month">
+                                            <iconfont name="icon-qiandao-yixuan" size="48rpx" color="#ccc"></iconfont>
+                                        </block>
+                                        <block v-else>
+                                            {{ col.num }}
+                                        </block>
+                                    </block>
+                                </view>
+                            </view>
+                        </view>
+                        <view v-if="(user || null) !== null" class="calendar-foot pr">
+                            <image :src="signin_static_url + 'calendar-link.png'" mode="widthFix" class="calendar-link-left"></image>
+                            <image :src="signin_static_url + 'calendar-link.png'" mode="widthFix" class="calendar-link-right"></image>
+                            <!-- 判断是组队签到还是个人签到 -->
+                            <view v-if="(team_signin_data || null) != null && user.id == data.user_id" class="content bg-white flex-row jc-sb align-c">
+                                <text class="fw-b">{{$t('detail.detail.96bwp0')}}{{ team_signin_data.day }}{{$t('detail.detail.rdxjvh')}}{{ team_signin_data.total }}{{$t('user.user.rjye50')}}</text>
+                                <text v-if="(data_base.is_team_show_coming_user || 0) == 1" :data-value="'/pages/plugins/signin/user-coming-list/user-coming-list?id=' + data.id" @tap="url_event" class="cp">
+                                    <iconfont name="icon-arrow-right"></iconfont>
+                                </text>
+                            </view>
+                            <view v-else class="content bg-white flex-row jc-sb align-c">
+                                <text class="fw-b">{{$t('detail.detail.96bwp0')}}<block v-if="user_signin_data.integral">{{$t('goods-detail.goods-detail.by7052')}}</block>
+                                    <block v-else>{{$t('detail.detail.we522y')}}</block>{{$t('detail.detail.mqmxbt')}}{{ user_signin_data.integral || 0 }}{{$t('detail.detail.15i191')}}{{ user_signin_data.total || 0 }}{{$t('buy.buy.0pgsrm')}}</text>
+                                <text v-if="(data_base.is_user_menu || 0) == 1" data-value="/pages/plugins/signin/user/user" @tap="url_event" class="cp">
+                                    <iconfont name="icon-arrow-right"></iconfont>
+                                </text>
+                            </view>
+                        </view>
+                    </view>
+
+                    <!-- 公告信息 -规则说明 -->
+                    <view v-if="(data_base.signin_desc || null) != null && data_base.signin_desc.length > 0" class="notice-content border-radius-main text-size-md">
+                        <view class="title fw-b">{{$t('detail.detail.sx6u43')}}</view>
+                        <view class="content">
+                            <block v-for="(item, index) in data_base.signin_desc" :key="index">{{ item }}</block>
+                        </view>
+                    </view>
+
+                    <!-- 推荐商品 -->
+                    <view v-if="(data.goods_list || null) != null && data.goods_list.length > 0" class="spacing-mt">
+                        <view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
+                            <text class="text-wrapper title-left-border single-text flex-1 flex-width padding-right-main">{{$t('index.index.8t4j95')}}</text>
+                            <text data-value="/pages/goods-search/goods-search" @tap="url_event" class="arrow-right padding-right cr-base cp">{{$t('common.more')}}</text>
+                        </view>
+                        <component-goods-list :propData="{ style_type: 1, goods_list: data.goods_list }" :propCurrencySymbol="currency_symbol"></component-goods-list>
+                    </view>
+                </view>
+
+                <!-- 签到成功提示信息 -->
+                <view v-if="is_success_tips == 1" class="coming-tips-container">
+                    <view class="coming-content">
+                        <view class="coming-item tc pr">
+                            <image :src="signin_static_url + 'signin-popup-title.png'" class="pa" mode="widthFix"></image>
+                            <view class="title">{{$t('detail.detail.6qk085')}}</view>
+                            <view class="desc">{{$t('detail.detail.ndp2k3')}}<text>{{ coming_integral }}</text>{{$t('index.index.t26j9z')}}</view>
+                            <view class="use-btn text-size fw-b cr-white" :data-value="home_page_url" @tap="url_event">{{$t('detail.detail.7itw5w')}}</view>
+                            <view class="close-sub pa cr-white" @tap="coming_success_close_event">
+                                <iconfont name="icon-qiandao-tancguanbi" size="60rpx"></iconfont>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <component-share-popup ref="share"></component-share-popup>
+            </view>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNavBack from '@/components/nav-back/nav-back';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentSharePopup from '@/components/share-popup/share-popup';
+    import componentGoodsList from '@/components/goods-list/goods-list';
+    var signin_static_url = app.globalData.get_static_url('signin', true) + 'app/';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                signin_static_url: signin_static_url,
+                // 首页地址
+                home_page_url: app.globalData.app_tabbar_pages()[0],
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                currency_symbol: app.globalData.currency_symbol(),
+                params: null,
+                user: null,
+                data_base: null,
+                data: null,
+                team_signin_data: null,
+                user_signin_data: null,
+                is_already_coming: 0,
+                is_success_tips: 0,
+                coming_integral: 0,
+                // 自定义分享信息
+                share_info: {},
+                // 周数
+                week: [this.$t('detail.detail.6w8t3g'), this.$t('detail.detail.xtcy73'), this.$t('detail.detail.w2p2d9'), this.$t('detail.detail.xt8596'), this.$t('detail.detail.13s18l'), this.$t('detail.detail.n5rm3q'), this.$t('detail.detail.3d23mc')],
+                // 年
+                year: new Date().getFullYear(),
+                // 月
+                month: new Date().getMonth() + 1,
+                // 日
+                date: new Date().getDate(),
+                // 日期
+                calendar: new Date().getFullYear() + this.$t('detail.detail.73rb8q') + (new Date().getMonth() + 1) + this.$t('detail.detail.zill36') + new Date().getDate() + this.$t('detail.detail.6w8t3g'),
+                // 本月日历总天数
+                day_count: [],
+            };
+        },
+        components: {
+            componentCommon,
+            componentNavBack,
+            componentNoData,
+            componentSharePopup,
+            componentGoodsList
+        },
+        computed: {
+            days_in_month() {
+                const date = new Date(this.year, this.month, 0);
+                return date.getDate();
+            },
+        },
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+        },
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 用户信息
+            this.setData({
+                user: app.globalData.get_user_cache_info(),
+            });
+
+            // 获取数据
+            this.get_data();
+
+            // 日历渲染
+            this.get_calendar();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+        methods: {
+            // 获取日历数据
+            get_calendar() {
+                const first_day = new Date(this.year, this.month - 1, 1).getDay();
+                const last_day = this.days_in_month;
+                const days = [];
+                let day = [];
+                // 上月计数
+                let firstday = new Date();
+                firstday.setDate(1); //本月第一天的日期
+                const first_day_week = firstday.getDay();
+                var defore_days = new Date(this.year, this.month, 0).getDate(); //上月天数
+                for (var i = first_day_week - 1; i >= 0; i--) {
+                    // 上个月计数
+                    day.push({
+                        num: defore_days - i,
+                        class: 'cr-grey-c',
+                        today: false,
+                        current_month: false,
+                    });
+                }
+                // 本月计数
+                for (let i = 1; i <= last_day; i++) {
+                    // 获取当天日期
+                    var today = new Date().getDate();
+                    day.push({
+                        num: i,
+                        class: 'cr-black',
+                        today: i === today ? true : false,
+                        current_month: true,
+                    });
+                    if (day.length === 7) {
+                        days.push(day);
+                        day = [];
+                    }
+                }
+                // 本月计数
+                if (day.length > 0) {
+                    var num = 1;
+                    for (let i = day.length; i < 7; i++) {
+                        day.push({
+                            num: num++,
+                            class: 'cr-grey-c',
+                            today: false,
+                            current_month: false,
+                        });
+                    }
+                    days.push(day);
+                }
+                this.setData({
+                    day_count: days,
+                });
+            },
+            // 点击日期
+            handle_day() {},
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('detail', 'index', 'signin'),
+                    method: 'POST',
+                    data: {
+                        id: this.params.id || 0,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_base: data.base || null,
+                                data: data.data || null,
+                                team_signin_data: data.team_signin_data || null,
+                                user_signin_data: data.user_signin_data || null,
+                                is_already_coming: (data.user_signin_data || null) != null && (data.user_signin_data.current_day || 0) == 1 ? 1 : 0,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: true,
+                            });
+                            if ((this.data || null) != null) {
+                                // 基础自定义分享
+                                this.setData({
+                                    share_info: {
+                                        title: this.data.seo_title || this.$t('detail.detail.y2217b'),
+                                        desc: this.data.seo_desc,
+                                        path: '/pages/plugins/signin/detail/detail',
+                                        query: 'id=' + this.data.id,
+                                        img: this.data.bg_images || this.data.logo || '',
+                                    },
+                                });
+                            }
+                        } 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: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+            // 初始化
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    return true;
+                }
+                return false;
+            },
+            // 签到
+            coming_event(e) {
+                if (!app.globalData.is_single_page_check()) {
+                    return false;
+                }
+                if (this.is_already_coming != 1 && app.globalData.get_user_info(this, 'coming_event', e)) {
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('coming', 'index', 'signin'),
+                        method: 'POST',
+                        data: {
+                            id: this.data.id,
+                        },
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                this.setData({
+                                    is_already_coming: 1,
+                                    is_success_tips: 1,
+                                    coming_integral: res.data.data,
+                                });
+                                this.get_data();
+                            } else {
+                                if (app.globalData.is_login_check(res.data, this, 'team_request')) {
+                                    app.globalData.showToast(res.data.msg);
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+            // 签到成功提示关闭
+            coming_success_close_event(e) {
+                this.setData({
+                    is_success_tips: 0,
+                });
+            },
+            // 组队事件
+            team_event(e) {
+                if (this.init()) {
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('team', 'userqrcode', 'signin'),
+                        method: 'POST',
+                        data: {},
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                switch (res.data.data.status) {
+                                    // 组队成功
+                                    case 0:
+                                        var self = this;
+                                        var data = res.data;
+                                        // 现金支付
+                                        uni.showModal({
+                                            content: res.data.msg,
+                                            showCancel: false,
+                                            success(res) {
+                                                if (res.confirm) {
+                                                    // 设置签到码id
+                                                    var temp_params = self.params;
+                                                    temp_params['id'] = data.data.qrcode_id;
+                                                    self.setData({
+                                                        params: temp_params,
+                                                    });
+                                                    // 重新拉取数据
+                                                    self.get_data();
+                                                }
+                                            },
+                                        });
+                                        break;
+                                    // 需要填写联系人信息
+                                    case 1:
+                                        app.globalData.url_open('/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo?id=' + res.data.data.qrcode_id + '&is_team=1');
+                                        break;
+                                }
+                            } else {
+                                if (app.globalData.is_login_check(res.data, this, 'team_request')) {
+                                    app.globalData.showToast(res.data.msg);
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+            // 打开url
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+            // 分享开启弹层
+            share_event(e) {
+                if ((this.$refs.share || null) != null) {
+                    this.$refs.share.init({
+                        share_info: this.share_info
+                    });
+                }
+            },
+
+            // 页面滚动监听
+            onPageScroll(res) {
+                uni.$emit('onPageScroll', res);
+            },
+        },
+    };
+</script>
+<style>
+    @import './detail.css';
+</style>
diff --git a/pages/plugins/signin/user-coming-list/user-coming-list.css b/pages/plugins/signin/user-coming-list/user-coming-list.css
new file mode 100644
index 0000000..90c4874
--- /dev/null
+++ b/pages/plugins/signin/user-coming-list/user-coming-list.css
@@ -0,0 +1,4 @@
+.data-list .item .avatar {
+    width: 50rpx;
+    height: 50rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/signin/user-coming-list/user-coming-list.vue b/pages/plugins/signin/user-coming-list/user-coming-list.vue
new file mode 100644
index 0000000..1be410b
--- /dev/null
+++ b/pages/plugins/signin/user-coming-list/user-coming-list.vue
@@ -0,0 +1,230 @@
+<template>
+    <view :class="theme_view">
+        <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view class="data-list">
+                <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                    <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                        <view class="base oh br-b padding-bottom-main">
+                            <image :src="item.user.avatar" class="avatar va-m circle" mode="widthFix" @tap="avatar_event" :data-value="item.user.avatar"></image>
+                            <text class="cr-grey margin-left-sm va-m">{{ item.user.user_name_view || "" }}</text>
+                        </view>
+                        <view class="content margin-top">
+                            <block v-for="(fv, fi) in content_list" :key="fi">
+                                <view class="single-text margin-top-xs">
+                                    <text class="cr-grey margin-right-xl">{{ fv.name }}</text>
+                                    <text class="cr-base">{{ item[fv.field] }}</text>
+                                    <text v-if="(fv.unit || null) != null" class="cr-grey">{{ fv.unit }}</text>
+                                </view>
+                            </block>
+                        </view>
+                    </view>
+                </view>
+                <view wx:else>
+                    <!-- 提示信息 -->
+                    <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+                </view>
+
+                <!-- 结尾 -->
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            </view>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                content_list: [
+                    { name: this.$t('user-coming-list.user-coming-list.xkwnl8'), field: "integral" },
+                    { name: this.$t('user-coming-list.user-coming-list.sq4379'), field: "add_time" },
+                ],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("usercominglist", "userqrcode", "signin"),
+                    method: "POST",
+                    data: {
+                        id: this.params.id || 0,
+                        page: this.data_page,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 头像查看
+            avatar_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value != null) {
+                    uni.previewImage({
+                        current: value,
+                        urls: [value],
+                    });
+                } else {
+                    app.globalData.showToast(this.$t('order.order.p3scy0'));
+                }
+            },
+        },
+    };
+</script>
+<style>
+    @import "./user-coming-list.css";
+</style>
diff --git a/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.vue b/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.vue
new file mode 100644
index 0000000..4901aba
--- /dev/null
+++ b/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.vue
@@ -0,0 +1,163 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="detail != null">
+            <view class="padding-horizontal-main padding-top-main">
+                <view v-if="detail_list.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('order-detail.order-detail.9er1pc')}}</view>
+                    <view class="panel-content oh">
+                        <view v-for="(item, index) in detail_list" :key="index" class="item br-b-dashed oh padding-vertical-main">
+                            <view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
+                            <view class="content fl br-l padding-left-main">{{ item.value }}</view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 连续签到翻倍奖励 -->
+                <view v-if="(detail.continuous_rules || null) != null && detail.continuous_rules.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-qrcode-detail.user-qrcode-detail.18680z')}}</view>
+                    <view class="panel-content oh">
+                        <view v-for="(item, index) in detail.continuous_rules" :key="index" class="item br-b oh padding-vertical-main">
+                            <view class="content fl">{{$t('user-qrcode-detail.user-qrcode-detail.dupsnc')}}{{ item.number }}{{$t('user-qrcode-detail.user-qrcode-detail.b5ilz3')}}{{ item.value }}{{$t('user-qrcode-detail.user-qrcode-detail.c8e5of')}}</view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 指定时段额外奖励 -->
+                <view
+                    v-if="(detail.specified_time_reward || null) != null && (detail.specified_time_reward.time_start || null) != null && (detail.specified_time_reward.time_end || null) != null && (detail.specified_time_reward.value || null) != null"
+                    class="panel-item padding-main border-radius-main bg-white spacing-mb"
+                >
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-qrcode-detail.user-qrcode-detail.37bh73')}}</view>
+                    <view class="panel-content oh">
+                        <view v-for="(item, index) in detail.specified_time_reward" :key="index" class="item br-b oh padding-vertical-main">
+                            <view class="content fl">{{$t('user-qrcode-detail.user-qrcode-detail.6l7r99')}}{{ detail.specified_time_reward.time_start }}{{$t('user-qrcode-detail.user-qrcode-detail.22zc5y')}}{{ detail.specified_time_reward.value }}</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                data_bottom_line_status: false,
+                detail: null,
+                detail_list: [],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("detail", "userqrcode", "signin"),
+                    method: "POST",
+                    data: {
+                        id: this.params.id,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                detail: data.data,
+                                detail_list: [
+                                    { name: this.$t('form.form.043a10'), value: data.data.is_enable_name || "" },
+                                    { name: this.$t('user-qrcode-detail.user-qrcode-detail.mjfygy'), value: (data.data.reward_master || 0) + this.$t('index.index.t26j9z') },
+                                    { name: this.$t('user-qrcode-detail.user-qrcode-detail.pb2e32'), value: (data.data.reward_invitee || 0) + this.$t('index.index.t26j9z') },
+                                    { name: this.$t('user-qrcode-detail.user-qrcode-detail.do23j6'), value: data.data.name || "" },
+                                    { name: this.$t('user-qrcode-detail.user-qrcode-detail.5k2ibd'), value: data.data.tel || "" },
+                                    { name: this.$t('user-qrcode-detail.user-qrcode-detail.911a61'), value: data.data.address || "" },
+                                    { name: this.$t('common.note'), value: data.data.note || "" },
+                                    { name: this.$t('user-order-detail.user-order-detail.h2c78h'), value: data.data.add_time || "" },
+                                    { name: this.$t('common.upd_time'), value: data.data.upd_time || "" },
+                                ],
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: "",
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "init")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+        },
+    };
+</script>
+<style></style>
diff --git a/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.vue b/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.vue
new file mode 100644
index 0000000..4b5dc16
--- /dev/null
+++ b/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.vue
@@ -0,0 +1,232 @@
+<template>
+    <view :class="theme_view">
+        <view class="page-bottom-fixed">
+            <view v-if="data_base != null">
+                <form @submit="form_submit" class="form-container">
+                    <view class="padding-main oh">
+                        <view class="padding-main border-radius-main bg-white spacing-mb">
+                            <view>
+                                <text class="cr-base margin-right-sm">{{$t('user-qrcode-detail.user-qrcode-detail.mjfygy')}}</text>
+                                <text class="cr-main fw-b">{{ data.reward_master || data_base.reward_master }}</text>
+                                <text class="cr-grey margin-left-sm">{{$t('index.index.t26j9z')}}</text>
+                            </view>
+                            <view class="margin-top-sm">
+                                <text class="cr-base margin-right-sm">{{$t('user-qrcode-detail.user-qrcode-detail.pb2e32')}}</text>
+                                <text class="cr-main fw-b">{{ data.reward_invitee || data_base.reward_invitee }}</text>
+                                <text class="cr-grey margin-left-sm">{{$t('index.index.t26j9z')}}</text>
+                            </view>
+                        </view>
+
+                        <view v-if="(data_base.is_qrcode_must_userinfo || 0) == 1">
+                            <view class="form-gorup">
+                                <view class="form-gorup-title">{{$t('user-qrcode-detail.user-qrcode-detail.do23j6')}}<text class="form-group-tips-must">*</text></view>
+                                <input type="text" name="name" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('user-qrcode-saveinfo.user-qrcode-saveinfo.xa2k42')" maxlength="30" :value="data.name || ''" />
+                            </view>
+                            <view class="form-gorup">
+                                <view class="form-gorup-title">{{$t('user-qrcode-detail.user-qrcode-detail.5k2ibd')}}<text class="form-group-tips-must">*</text></view>
+                                <input type="text" name="tel" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('user-qrcode-saveinfo.user-qrcode-saveinfo.e9ko33')" maxlength="15" :value="data.tel || ''" />
+                            </view>
+                            <view class="form-gorup">
+                                <view class="form-gorup-title">{{$t('user-qrcode-detail.user-qrcode-detail.911a61')}}<text class="form-group-tips-must">*</text></view>
+                                <input type="text" name="address" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('user-qrcode-saveinfo.user-qrcode-saveinfo.bbxaw6')" maxlength="230" :value="data.address || ''" />
+                            </view>
+                        </view>
+                        <view class="form-gorup">
+                            <view class="form-gorup-title">{{$t('common.note')}}</view>
+                            <input type="text" name="note" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('invoice-saveinfo.invoice-saveinfo.vaw647')" maxlength="60" :value="data.note || ''" />
+                        </view>
+                        <view class="bottom-fixed" :style="bottom_fixed_style">
+                            <view class="bottom-line-exclude">
+                                <button class="item bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">{{$t('form.form.4yd066')}}</button>
+                            </view>
+                        </view>
+                    </view>
+                </form>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                params: {},
+                form_submit_loading: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                bottom_fixed_style: '',
+                data_base: null,
+                data: null,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params || {},
+            });
+
+            // 设置标题
+            uni.setNavigationBarTitle({
+                title: this.$t('user-qrcode-saveinfo.user-qrcode-saveinfo.jw2h8l') + ((this.params.id || null) == null ? this.$t('invoice-saveinfo.invoice-saveinfo.004t56') : this.$t('common.edit')),
+            });
+
+            // 加载数据
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                var self = this;
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('saveinfo', 'userqrcode', 'signin'),
+                    method: 'POST',
+                    data: {...this.params, ...{is_lang: 0}},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            self.setData({
+                                data_base: data.base || null,
+                                data: data.data || null,
+                                data_list_loding_status: 0,
+                            });
+                        } else {
+                            self.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, self, 'init')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        self.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 表单提交
+            form_submit(e) {
+                var data = e.detail.value;
+                if ((this.data || null) != null) {
+                    data['id'] = this.data.id || 0;
+                }
+
+                // 数据验证
+                var validation = [];
+                if ((this.data_base || null) != null && (this.data_base.is_qrcode_must_userinfo || 0) == 1) {
+                    validation.push({ fields: 'name', msg: this.$t('user-qrcode-saveinfo.user-qrcode-saveinfo.84g5t6') });
+                    validation.push({ fields: 'tel', msg: this.$t('user-qrcode-saveinfo.user-qrcode-saveinfo.1tilke') });
+                    validation.push({ fields: 'address', msg: this.$t('user-qrcode-saveinfo.user-qrcode-saveinfo.5m2752') });
+                }
+                if (app.globalData.fields_check(data, validation)) {
+                    uni.showLoading({
+                        title: this.$t('buy.buy.r79t77'),
+                    });
+                    this.setData({
+                        form_submit_loading: true,
+                    });
+
+                    // 网络请求
+                    uni.request({
+                        url: app.globalData.get_request_url('save', 'userqrcode', 'signin'),
+                        method: 'POST',
+                        data: data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                var self = this;
+                                var data = res.data;
+                                // 现金支付
+                                uni.showModal({
+                                    content: res.data.msg,
+                                    showCancel: false,
+                                    success(res) {
+                                        if (res.confirm) {
+                                            var is_temp = (self.params || null) != null && (self.params.is_team || 0) == 1;
+                                            setTimeout(function () {
+                                                // 是否签到也组队
+                                                if (is_temp) {
+                                                    app.globalData.url_open('/pages/plugins/signin/detail/detail?id=' + data.data, true);
+                                                } else {
+                                                    uni.navigateBack();
+                                                }
+                                            }, 2000);
+                                        }
+                                    },
+                                });
+                            } else {
+                                this.setData({
+                                    form_submit_loading: false,
+                                });
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_loading: false,
+                            });
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+        },
+    };
+</script>
+<style></style>
diff --git a/pages/plugins/signin/user/user.css b/pages/plugins/signin/user/user.css
new file mode 100644
index 0000000..809b87f
--- /dev/null
+++ b/pages/plugins/signin/user/user.css
@@ -0,0 +1,7 @@
+/*
+* 导航
+*/
+.nav .item {
+    height: 74rpx;
+    line-height: 74rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/signin/user/user.vue b/pages/plugins/signin/user/user.vue
new file mode 100644
index 0000000..5607b57
--- /dev/null
+++ b/pages/plugins/signin/user/user.vue
@@ -0,0 +1,172 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="(data_base || null) != null">
+            <!-- 公告 -->
+            <view v-if="(data_base.signin_desc || null) != null && data_base.signin_desc.length > 0" class="padding-horizontal-main padding-vertical-sm bg-white">
+                <uni-notice-bar class="padding-0 margin-0" show-icon scrollable :text="data_base.signin_desc.join('')" background-color="transparent" color="#666" />
+            </view>
+            <!-- 导航 -->
+            <view v-if="nav_list.length > 0" class="nav oh bg-white">
+                <view class="flex-row jc-sa align-c">
+                    <block v-for="(item, index) in nav_list" :key="index">
+                        <view class="item text-size-md" :data-index="index" @tap="nav_change">
+                            <view class="pr" :class="current === index ? 'cr-main nav-active-line fw-b' : ''">
+                                {{ item.title }}
+                            </view>
+                        </view>
+                    </block>
+                </view>
+            </view>
+            <!-- 明细 -->
+            <view class="nav-detail margin-bottom-lg">
+                <view v-if="current === 0">
+                    <component-user-signin :propPullDownRefresh="propPullDownRefresh" :propScrollLower="scroll_lower_bool"></component-user-signin>
+                </view>
+                <view v-if="current === 1">
+                    <component-user-qrcode :propPullDownRefresh="propPullDownRefresh" :propScrollLower="scroll_lower_bool"></component-user-qrcode>
+                </view>
+            </view>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentUserSignin from '../components/user-signin/user-signin';
+    import componentUserQrcode from '../components/user-qrcode/user-qrcode';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_base: null,
+                nav_list: [],
+                // 钱包明细
+                params: null,
+                current: 0,
+                propPullDownRefresh: false,
+                scroll_lower_bool: false,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentUserSignin,
+            componentUserQrcode,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 是否指定状态
+            if ((params.type || null) != null) {
+                this.setData({
+                    params: params,
+                    current: Number(params.type),
+                });
+            }
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+            this.setData({
+                propPullDownRefresh: !this.propPullDownRefresh,
+            });
+        },
+
+        methods: {
+            init(e) {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('center', 'user', 'signin'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_base: data.base || null,
+                                nav_list: data.nav_list || [],
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: false,
+                            });
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+            // 明细导航切换
+            nav_change(e) {
+                this.setData({
+                    current: e.currentTarget.dataset.index || 0,
+                });
+                app.globalData.update_query_string_parameter([{ key: 'type', value: e.currentTarget.dataset.index }]);
+            },
+            // 滚动加载
+            scroll_lower(e) {
+                this.setData({
+                    scroll_lower_bool: !this.scroll_lower_bool,
+                });
+            },
+        },
+    };
+</script>
+<style scoped>
+    @import './user.css';
+</style>
diff --git a/pages/plugins/thirdpartylogin/index/index.css b/pages/plugins/thirdpartylogin/index/index.css
new file mode 100644
index 0000000..4055207
--- /dev/null
+++ b/pages/plugins/thirdpartylogin/index/index.css
@@ -0,0 +1,7 @@
+page {
+    background: #fff;
+}
+.user-avatar {
+    width: 180rpx;
+    height: 180rpx !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/thirdpartylogin/index/index.vue b/pages/plugins/thirdpartylogin/index/index.vue
new file mode 100644
index 0000000..b3cd2c9
--- /dev/null
+++ b/pages/plugins/thirdpartylogin/index/index.vue
@@ -0,0 +1,150 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="(data || null) !== null && (user || null) !== null" class="tc padding-main padding-top-xxxl">
+            <image :src="user.avatar" mode="widthFix" class="circle br user-avatar" />
+            <view class="margin-top-xs">{{user.user_name_view}}</view>
+            <block v-if="data.status == 1">
+                <view class="margin-top-xxl">
+                    <view class="fw-b">{{$t('index.index.slf50q')}}{{application_title}}</view>
+                    <view class="cr-grey margin-top-sm">{{$t('index.index.rmv185')}}</view>
+                </view>
+                <view class="margin-top-xxxl padding-top-xl">
+                    <button type="default" class="bg-main br-main cr-white round text-size" @tap="status_record(2)">{{$t('login.login.i1deai')}}</button>
+                    <button type="default" class="bg-yellow br-yellow cr-white round text-size margin-top-lg" @tap="exit_event">{{$t('common.cancel')}}</button>
+                </view>
+            </block>
+            <block v-else>
+                <view class="margin-top-xxl">
+                    <iconfont name="icon-qiandao-yixuan" size="28rpx" propClass="cr-green circle"></iconfont>
+                    <text class="margin-left-xs">{{$t('index.index.n0vnl6')}}</text>
+                </view>
+                <view class="margin-top-xxxl padding-top-xl">
+                    <button type="default" class="bg-yellow br-yellow cr-white round text-size margin-top-lg" @tap="exit_event">{{$t('frequencycard-list.frequencycard-list.n36x3w')}}</button>
+                </view>
+            </block>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                // 基础配置
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                params: {},
+                application_title: app.globalData.get_application_title(),
+                user : null,
+                data: null
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params || {},
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        methods: {
+            init() {
+                // 用户信息
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.setData({
+                        user: user
+                    });
+                    // 记录状态
+                    this.status_record(1);
+                }
+            },
+
+            // 状态记录
+            status_record(status) {
+                // 加载loding
+                uni.showLoading({
+                    title: this.$t('common.loading_in_text'),
+                });
+                // 请求数据
+                var post_data = {
+                    ...this.params,
+                    status: status
+                };
+                uni.request({
+                    url: app.globalData.get_request_url('statusrecord', 'scan', 'thirdpartylogin'),
+                    method: 'POST',
+                    data: post_data,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            this.setData({
+                                data: res.data.data,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'status_record', status)) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 退出小程序
+            exit_event(e) {
+                uni.exitMiniProgram();
+            }
+        },
+    };
+</script>
+
+<style>
+    @import './index.css';
+</style>
\ No newline at end of file
diff --git a/pages/plugins/wallet/cash-auth/cash-auth.css b/pages/plugins/wallet/cash-auth/cash-auth.css
new file mode 100644
index 0000000..9da9327
--- /dev/null
+++ b/pages/plugins/wallet/cash-auth/cash-auth.css
@@ -0,0 +1,8 @@
+.verify-sub {
+    width: 35%;
+    height: 70rpx;
+    line-height: 70rpx !important;
+    top: 62rpx;
+    right: 20rpx;
+    z-index: 2;
+}
\ No newline at end of file
diff --git a/pages/plugins/wallet/cash-auth/cash-auth.vue b/pages/plugins/wallet/cash-auth/cash-auth.vue
new file mode 100644
index 0000000..527fc60
--- /dev/null
+++ b/pages/plugins/wallet/cash-auth/cash-auth.vue
@@ -0,0 +1,311 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="data_base != null" class="padding-main">
+            <view v-if="is_can_cash == 1">
+                <form v-if="check_account_list.length > 0" @submit="form_submit" class="form-container oh">
+                    <view class="bg-white border-radius-main">
+                        <view class="form-gorup">
+                            <view class="form-gorup-title">{{$t('cash-auth.cash-auth.b39a25')}}<text class="form-group-tips-must">*</text></view>
+                            <view class="section">
+                                <picker name="account_type" @change="select_check_account_event" :value="check_account_value" :range="check_account_list" range-key="msg">
+                                    <view :class="'picker name ' + (check_account_value == null ? 'cr-grey' : 'cr-base')">
+                                        <view v-if="check_account_value == null">{{$t('cash-auth.cash-auth.582q6x')}}</view>
+                                        <view v-else>{{ check_account_list[check_account_value]['msg'] }}</view>
+                                    </view>
+                                </picker>
+                            </view>
+                        </view>
+
+                        <view class="form-gorup pr">
+                            <view class="form-gorup-title">{{$t('cash-auth.cash-auth.d318op')}}<text class="form-group-tips-must">*</text></view>
+                            <input type="number" name="verify" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('cash-auth.cash-auth.2hc312')" maxlength="4" />
+                            <button :class="'bg-grey br-grey cr-base pa round text-size-sm verify-sub ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">
+                                {{ verify_submit_text }}
+                            </button>
+                        </view>
+                    </view>
+
+                    <view class="form-gorup form-gorup-submit margin-top-main">
+                        <button class="bg-main cr-white br-main round text-size" type="default" form-type="submit" hover-class="none" :disabled="form_submit_disabled_status">{{$t('form.form.4yd066')}}</button>
+                    </view>
+                </form>
+
+                <view class="margin-top-lg cr-base">
+                    <view class="fw-b text-size">{{$t('cash-auth.cash-auth.0j8388')}}</view>
+                    <view class="text-size-xs">
+                        <view>{{$t('cash-auth.cash-auth.59iipw')}}<text class="cr-red" data-value="/pages/login/login?opt_type=bind_email&opt_form=bind_email" @tap="url_event">{{$t('cash-auth.cash-auth.8qcte7')}}</text>{{$t('cash-auth.cash-auth.t8y3r7')}}<text class="cr-red" data-value="/pages/login/login?opt_form=bind_verify" @tap="url_event">{{$t('login.login.np9177')}}</text>{{$t('cash-auth.cash-auth.5wbuuy')}}</view>
+                        <view>{{$t('cash-auth.cash-auth.r569wz')}}</view>
+                        <view>{{$t('cash-auth.cash-auth.35837l')}}</view>
+                        <view>{{$t('cash-auth.cash-auth.q2a553')}}</view>
+                        <view>{{$t('cash-auth.cash-auth.lh6bjr')}}</view>
+                        <view>{{$t('cash-auth.cash-auth.ob4gn0')}}</view>
+                    </view>
+                </view>
+
+                <view v-if="check_account_list.length == 0" class="margin-top-xxxl">
+                    <button data-value="/pages/login/login?opt_form=bind_verify" @tap="url_event" class="bg-main br-main cr-white text-size round" type="default">{{$t('cash-auth.cash-auth.d2ng16')}}</button>
+                </view>
+            </view>
+            <view v-else>
+                <view class="margin-top-lg">
+                    <view>
+                        <text>{{$t('cash-auth.cash-auth.l2i4s8')}}</text>
+                        <text class="cr-green fw-b margin-left-sm margin-right-sm">{{ user_wallet.normal_money }}</text>
+                    </view>
+                    <view class="margin-top-sm">
+                        <text>{{$t('cash-auth.cash-auth.27b4w5')}}</text>
+                        <text class="cr-red fw-b margin-left-sm margin-right-sm">{{ data_base.cash_minimum_amount }}</text>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_base: null,
+                user_wallet: null,
+                check_account_list: [],
+                verify_submit_text: this.$t('login.login.s665h5'),
+                verify_loading: false,
+                verify_disabled: false,
+                form_submit_loading: false,
+                verify_time_total: 60,
+                temp_clear_time: null,
+                check_account_value: null,
+                form_submit_disabled_status: false,
+                is_can_cash: 0,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('auth', 'cash', 'wallet'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        this.setData({
+                            data_list_loding_status: 0,
+                        });
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var upd_data = {
+                                data_base: data.base || null,
+                                user_wallet: data.user_wallet || null,
+                                check_account_list: data.check_account_list || [],
+                            };
+                            if ((upd_data.data_base != null && upd_data.user_wallet != null && (upd_data.data_base.cash_minimum_amount || 0) <= 0) || parseFloat(upd_data.user_wallet.normal_money) >= parseFloat(upd_data.data_base.cash_minimum_amount)) {
+                                upd_data['is_can_cash'] = 1;
+                            }
+                            this.setData(upd_data);
+                        } else {
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        this.setData({
+                            data_list_loding_status: 2,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 身份认证方式事件
+            select_check_account_event(e) {
+                this.setData({
+                    check_account_value: e.detail.value || 0,
+                });
+            },
+
+            // 发送验证码
+            verify_send_event() {
+                // 数据验证
+                var self = this;
+                if (self.check_account_value == null) {
+                    app.globalData.showToast(this.$t('cash-auth.cash-auth.5dcsbd'));
+                    return false;
+                }
+
+                uni.showLoading({
+                    title: this.$t('common.sending_in_text'),
+                });
+                this.setData({
+                    verify_submit_text: this.$t('common.sending'),
+                    verify_loading: true,
+                    verify_disabled: true,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('verifysend', 'cash', 'wallet'),
+                    method: 'POST',
+                    data: {
+                        account_type: self.check_account_list[self.check_account_value]['field'],
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            this.setData({
+                                verify_loading: false,
+                            });
+                            var temp_time = this.verify_time_total;
+                            this.temp_clear_time = setInterval(function () {
+                                if (temp_time <= 1) {
+                                    clearInterval(self.temp_clear_time);
+                                    self.setData({
+                                        verify_submit_text: self.$t('login.login.s665h5'),
+                                        verify_disabled: false,
+                                    });
+                                } else {
+                                    temp_time--;
+                                    self.setData({
+                                        verify_submit_text: self.$t('login.login.n24i5u') + temp_time + self.$t('login.login.4306xr'),
+                                    });
+                                }
+                            }, 1000);
+                        } else {
+                            this.setData({
+                                verify_submit_text: this.$t('login.login.s665h5'),
+                                verify_loading: false,
+                                verify_disabled: false,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        this.setData({
+                            verify_submit_text: this.$t('login.login.s665h5'),
+                            verify_loading: false,
+                            verify_disabled: false,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 数据提交
+            form_submit(e) {
+                // 表单数据
+                var form_data = e.detail.value;
+
+                // 数据校验
+                var validation = [
+                    { fields: 'account_type', msg: this.$t('cash-auth.cash-auth.5dcsbd'), is_can_zero: 1 },
+                    { fields: 'verify', msg: this.$t('login.login.cesl5d') },
+                ];
+
+                // 验证提交表单
+                if (app.globalData.fields_check(form_data, validation)) {
+                    form_data['account_type'] = this.check_account_list[this.check_account_value]['field'];
+                    this.setData({
+                        form_submit_disabled_status: true,
+                    });
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('verifycheck', 'cash', 'wallet'),
+                        method: 'POST',
+                        data: form_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_disabled_status: false,
+                            });
+                            if (res.data.code == 0) {
+                                app.globalData.url_open('/pages/plugins/wallet/cash-create/cash-create', true);
+                            } else {
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            this.setData({
+                                form_submit_disabled_status: false,
+                            });
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import './cash-auth.css';
+</style>
diff --git a/pages/plugins/wallet/cash-create/cash-create.css b/pages/plugins/wallet/cash-create/cash-create.css
new file mode 100644
index 0000000..1ebd1e1
--- /dev/null
+++ b/pages/plugins/wallet/cash-create/cash-create.css
@@ -0,0 +1,6 @@
+/*
+ * 验证过期
+ */
+.overdue {
+    padding-top: 30%;
+}
\ No newline at end of file
diff --git a/pages/plugins/wallet/cash-create/cash-create.vue b/pages/plugins/wallet/cash-create/cash-create.vue
new file mode 100644
index 0000000..7e00091
--- /dev/null
+++ b/pages/plugins/wallet/cash-create/cash-create.vue
@@ -0,0 +1,332 @@
+<template>
+    <view :class="theme_view">
+        <view class="page-bottom-fixed">
+            <form v-if="check_status == 1" @submit="form_submit" class="form-container">
+                <view class="padding-main oh">
+                    <view class="form-gorup">
+                        <view class="form-gorup-title">{{$t('cash-create.cash-create.qg404q')}}<text class="form-group-tips-must">*</text></view>
+                        <input type="digit" name="money" :value="default_data.money || ''" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('cash-create.cash-create.cymbdz') + ((data_base.cash_minimum_amount || 0) <= 0 ? 0.01 : data_base.cash_minimum_amount) + $t('cash-create.cash-create.27ky42') + can_cash_max_money" @input="cash_money_event" />
+                        <view class="text-size-xs">
+                            <view v-if="(data_base || null) != null && data_base.cash_minimum_amount > 0">
+                                <text>{{$t('cash-auth.cash-auth.27b4w5')}}</text>
+                                <text class="cr-red fw-b margin-left-sm">{{ data_base.cash_minimum_amount }}</text>
+                            </view>
+                            <view>
+                                <text>{{$t('cash-create.cash-create.iaw845')}}</text>
+                                <text class="cr-main fw-b margin-left-sm">{{ can_cash_max_money }}</text>
+                            </view>
+                            <view>
+                                <text>{{$t('cash-create.cash-create.1dbkw2')}}</text>
+                                <text class="cr-green fw-b margin-left-sm">{{ user_wallet.normal_money }}</text>
+                            </view>
+                            <view>
+                                <text>{{$t('cash-create.cash-create.162f7o')}}</text>
+                                <text class="cr-base fw-b margin-left-sm">{{ user_wallet.give_money }}</text>
+                                <text v-if="(data_base || null) == null || data_base.is_cash_retain_give != 0" class="cr-red margin-left-lg">{{$t('cash-create.cash-create.5o1q52')}}</text>
+                            </view>
+                            <view v-if="(data_base || null) == null || data_base.cash_commission_rate != 0" class="margin-top-sm cr-red">
+                                <text>{{$t('cash-create.cash-create.678iu2')}}</text>
+                                <text class="fw-b margin-left-sm">{{cash_commission_value}}</text>
+                            </view>
+                        </view>
+                    </view>
+
+                    <view class="form-gorup">
+                        <view class="form-gorup-title">{{$t('cash-create.cash-create.yu2raf')}}<text class="form-group-tips-must">*</text></view>
+                        <radio-group name="cash_type" @change="cash_type_event">
+                            <block v-for="(item, index) in user_cash_type_list" :key="index">
+                                <label class="margin-right">
+                                    <radio :value="item.value" :color="theme_color" :checked="default_data.cash_type == item.value" style="transform: scale(0.7)" /> {{item.name}}
+                                </label>
+                            </block>
+                        </radio-group>
+                    </view>
+
+                    <view v-if="cash_type_0_status" class="form-gorup">
+                        <view class="form-gorup-title">{{$t('cash-create.cash-create.5mmir5')}}<text class="form-group-tips-must">*</text></view>
+                        <input type="text" name="bank_name" :value="default_data.bank_name || ''" placeholder-class="cr-grey" class="cr-base" maxlength="60" :placeholder="$t('cash-create.cash-create.u2rnlw')" />
+                        <view class="cr-grey-c text-size-xs">{{$t('cash-create.cash-create.14n20v')}}</view>
+                    </view>
+
+                    <view v-if="cash_type_0_status || cash_type_2_status" class="form-gorup">
+                        <view class="form-gorup-title">{{$t('cash-create.cash-create.36756z')}}<text class="form-group-tips-must">*</text></view>
+                        <input type="text" name="bank_accounts" :value="default_data.bank_accounts || ''" placeholder-class="cr-grey" class="cr-base" maxlength="60" :placeholder="$t('cash-create.cash-create.s72t44')" />
+                        <view class="cr-grey-c text-size-xs">{{$t('cash-create.cash-create.748r3i')}}</view>
+                    </view>
+
+                    <view class="form-gorup">
+                        <view class="form-gorup-title">{{$t('cash-create.cash-create.1xtff6')}}<text class="form-group-tips-must">*</text></view>
+                        <input type="text" name="bank_username" :value="default_data.bank_username || ''" placeholder-class="cr-grey" class="cr-base" maxlength="30" :placeholder="$t('cash-create.cash-create.f4605e')" />
+                        <view class="cr-grey-c text-size-xs">{{$t('cash-create.cash-create.445m7n')}}</view>
+                    </view>
+
+                    <view class="bottom-fixed" :style="bottom_fixed_style">
+                        <view class="bottom-line-exclude">
+                            <button class="item bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">{{$t('form.form.4yd066')}}</button>
+                        </view>
+                    </view>
+                </view>
+            </form>
+
+            <!-- 已过期 -->
+            <view v-else-if="check_status === 0" class="overdue tc">
+                <view class="padding-main">
+                    <view class="cr-red margin-top-xxxl">{{$t('cash-create.cash-create.858o54')}}</view>
+                    <button class="round bg-main cr-white cr-white text-size margin-top-xl" size="mini" type="default" hover-class="none" data-value="/pages/plugins/wallet/cash-auth/cash-auth" data-redirect="1" @tap="url_event">{{$t('cash-create.cash-create.ke15x5')}}</button>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: app.globalData.get_theme_color(),
+                params: null,
+                form_submit_loading: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                bottom_fixed_style: '',
+                data_base: null,
+                user_wallet: {},
+                default_data: {},
+                check_status: null,
+                can_cash_max_money: 0.00,
+                cash_commission_value: 0.00,
+                user_cash_type_list: [],
+                cash_type_0_status: false,
+                cash_type_2_status: false
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 2,
+                        data_list_loding_msg: this.$t('extraction-apply.extraction-apply.m3xdif'),
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('createinit', 'cash', 'wallet'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data || null;
+                            this.setData({
+                                data_list_loding_status: 3,
+                                data_base: data.base || null,
+                                check_status: data.check_status || 0,
+                                default_data: data.default_data || {},
+                                user_wallet: data.user_wallet || {},
+                                can_cash_max_money: parseFloat(data.can_cash_max_money) || 0.0,
+                                user_cash_type_list: data.user_cash_type_list || []
+                            });
+                            // 默认选中处理
+                            if(this.default_data.cash_type !== undefined) {
+                                this.cash_type_event(this.default_data.cash_type);
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 提现金额事件
+            cash_money_event(e) {
+                if((this.data_base || null) != null && (this.data_base.cash_commission_rate || 0) != 0) {
+                    var value = parseFloat(e.detail.value || 0);
+                    this.setData({
+                        cash_commission_value: app.globalData.price_two_decimal(value*parseFloat(this.data_base.cash_commission_rate)),
+                    })
+                }
+            },
+
+            // 提现方式事件
+            cash_type_event(e) {
+                var status_0 = false;
+                var status_2 = false;
+                var value = parseInt(typeof(e) == 'object' ? e.detail.value : e);
+                switch(value)
+                {
+                    // 其他方式
+                    case 0 :
+                        status_2 = false;
+                        status_0 = true;
+                        break;
+                    // 微信
+                    case 1 :
+                        status_0 = false;
+                        status_2 = false;
+                        break;
+                    // 支付宝
+                    case 2 :
+                        status_0 = false;
+                        status_2 = true;
+                        break;
+                }
+                this.setData({
+                    cash_type_0_status: status_0,
+                    cash_type_2_status: status_2
+                });
+            },
+
+            // 数据提交
+            form_submit(e) {
+                // 表单数据
+                var form_data = e.detail.value;
+
+                // 数据校验
+                var validation = [
+                    { fields: 'money', msg: this.$t('cash-create.cash-create.6t7x9u') },
+                    { fields: 'cash_type', msg: this.$t('cash-create.cash-create.thjid2'), is_can_zero: 1 }
+                ];
+                var cash_type = parseInt(form_data.cash_type);
+                if(cash_type == 0) {
+                    validation.push({ fields: 'bank_name', msg: this.$t('cash-create.cash-create.vbr59h') });
+                }
+                if(cash_type == 0 || cash_type == 2) {
+                    validation.push({ fields: 'bank_accounts', msg: this.$t('cash-create.cash-create.0mn186') });
+                }
+                validation.push({ fields: 'bank_username', msg: this.$t('cash-create.cash-create.c7h4mu') });
+
+                // 验证提交表单
+                if (app.globalData.fields_check(form_data, validation)) {
+                    // 提现金额不能小于最低金额、不能大于最大可提现金额
+                    if (parseFloat(this.data_base.cash_minimum_amount || 0) > 0 && parseFloat(form_data.money) < parseFloat(this.data_base.cash_minimum_amount)) {
+                        app.globalData.showToast(this.$t('cash-create.cash-create.724kn8') + this.data_base.cash_minimum_amount);
+                        return false;
+                    }
+                    if (parseFloat(form_data.money) > this.can_cash_max_money) {
+                        app.globalData.showToast(this.$t('cash-create.cash-create.duo0ts') + this.can_cash_max_money);
+                        return false;
+                    }
+
+                    // 远程请求
+                    this.setData({
+                        form_submit_loading: true,
+                    });
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('create', 'cash', 'wallet'),
+                        method: 'POST',
+                        data: form_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                                setTimeout(function () {
+                                    app.globalData.url_open('/pages/plugins/wallet/user/user?type=2', true);
+                                }, 1000);
+                            } else {
+                                this.setData({
+                                    form_submit_loading: false,
+                                });
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            this.setData({
+                                form_submit_loading: false,
+                            });
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import './cash-create';
+</style>
\ No newline at end of file
diff --git a/pages/plugins/wallet/components/transfer/transfer.vue b/pages/plugins/wallet/components/transfer/transfer.vue
new file mode 100644
index 0000000..46258a9
--- /dev/null
+++ b/pages/plugins/wallet/components/transfer/transfer.vue
@@ -0,0 +1,222 @@
+<!-- 转账 -->
+<template>
+    <view :class="theme_view">
+        <!-- 列表 -->
+        <view v-if="data_list.length > 0" class="data-list">
+            <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                <view class="base oh br-b-dashed padding-bottom-main flex-row jc-sb align-c">
+                    <text class="cr-grey-9">{{ item.add_time }}</text>
+                    <text v-if="(item.receive_user || null) != null">{{item.receive_user.user_name_view}}</text>
+                </view>
+                <view :data-value="'/pages/plugins/wallet/user-transfer-detail/user-transfer-detail?id=' + item.id" @tap="url_event" class="content margin-top cp">
+                    <view v-for="(fv, fi) in content_list" :key="fi">
+                        <view class="single-text margin-top-sm transfer-item">
+                            <text class="name cr-grey-9 margin-right-main dis-inline-block">{{ fv.name }}:</text>
+                            <text class="fw-b">{{ item[fv.field] }}</text>
+                            <text v-if="(fv.unit || null) != null" class="fw-b">{{ fv.unit }}</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+        </view>
+
+        <!-- 结尾 -->
+        <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+
+    export default {
+        props: {
+            propPullDownRefresh: {
+                type: Boolean,
+                default: false,
+            },
+            propScrollLower: {
+                type: Boolean,
+                default: false,
+            },
+        },
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                content_list: [
+                    { name: this.$t('transfer.transfer.678uyg'), field: 'transfer_no' },
+                    { name: this.$t('transfer.transfer.2q274j'), field: 'money' },
+                    { name: this.$t('transfer.transfer.t36tk2'), field: 'note' },
+                ],
+            };
+        },
+
+        components: {
+            componentNoData,
+            componentBottomLine,
+        },
+        created() {
+            this.init();
+        },
+        mounted() {
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+        watch: {
+            propPullDownRefresh(newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.setData({
+                        data_page: 1,
+                    });
+                    this.get_data_list(1);
+                }
+            },
+            propScrollLower(newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.get_data_list();
+                }
+            },
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'transfer', 'wallet'),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style scoped>
+    .nav-child .item {
+        height: 60rpx;
+        line-height: 60rpx;
+        padding: 0 30rpx;
+        min-width: 84rpx;
+        -o-text-overflow: ellipsis;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+    }
+    .transfer-item .name {
+        min-width: 112rpx;
+    }
+</style>
diff --git a/pages/plugins/wallet/components/user-cash/user-cash.vue b/pages/plugins/wallet/components/user-cash/user-cash.vue
new file mode 100644
index 0000000..f61ed96
--- /dev/null
+++ b/pages/plugins/wallet/components/user-cash/user-cash.vue
@@ -0,0 +1,248 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav-child flex-row align-c margin-bottom-lg">
+            <view v-for="(item, index) in nav_status_list" :key="index">
+                <view class="item dis-inline-block round margin-right-main tc" :class="nav_status_index == index ? 'cr-main bg-main-light' : 'cr-grey bg-grey-e'" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+            </view>
+        </view>
+
+        <!-- 列表 -->
+        <view v-if="data_list.length > 0" class="data-list">
+            <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                <view class="base oh br-b-dashed padding-bottom-main flex-row jc-sb align-c">
+                    <text class="cr-grey-9">{{ item.add_time }}</text>
+                    <text :class="item.status === 0 ? 'cr-black' : item.status === 1 ? 'cr-grey-c' : 'cr-red'">{{ item.status_name }}</text>
+                </view>
+                <view :data-value="'/pages/plugins/wallet/user-cash-detail/user-cash-detail?id=' + item.id" @tap="url_event" class="content margin-top cp">
+                    <view v-for="(fv, fi) in content_list" :key="fi">
+                        <view class="single-text margin-top-sm cash">
+                            <text class="name cr-grey-9 margin-right-main">{{ fv.name }}:</text>
+                            <text class="fw-b">{{ item[fv.field] }}</text>
+                            <text v-if="(fv.unit || null) != null" class="fw-b">{{ fv.unit }}</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+        </view>
+
+        <!-- 结尾 -->
+        <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+
+    export default {
+        props: {
+            propPullDownRefresh: {
+                type: Boolean,
+                default: false,
+            },
+            propScrollLower: {
+                type: Boolean,
+                default: false,
+            },
+        },
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                nav_status_list: [
+                    { name: this.$t('common.all'), value: '-1' },
+                    { name: this.$t('user-cash.user-cash.3v1gzc'), value: '0' },
+                    { name: this.$t('user-cash.user-cash.t7gtu0'), value: '1' },
+                    { name: this.$t('user-cash.user-cash.x47iu3'), value: '2' },
+                ],
+                nav_status_index: 0,
+                content_list: [
+                    { name: this.$t('user-cash-detail.user-cash-detail.e8a3e8'), field: 'cash_no' },
+                    { name: this.$t('cash-create.cash-create.qg404q'), field: 'money' },
+                    { name: this.$t('cash-create.cash-create.9ugssd'), field: 'commission' },
+                ],
+            };
+        },
+
+        components: {
+            componentNoData,
+            componentBottomLine,
+        },
+        created() {
+            this.init();
+        },
+        mounted() {
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+        watch: {
+            propPullDownRefresh(newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.setData({
+                        data_page: 1,
+                    });
+                    this.get_data_list(1);
+                }
+            },
+            propScrollLower(newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.get_data_list();
+                }
+            },
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 参数
+                var status = (this.nav_status_list[this.nav_status_index] || null) == null ? -1 : this.nav_status_list[this.nav_status_index]['value'];
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'cash', 'wallet'),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page,
+                        status: status,
+                        is_more: 1,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_status_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style scoped>
+    .nav-child .item {
+        height: 60rpx;
+        line-height: 60rpx;
+        padding: 0 30rpx;
+        min-width: 84rpx;
+    }
+    .cash-item .name {
+        min-width: 112rpx;
+    }
+</style>
diff --git a/pages/plugins/wallet/components/user-recharge/user-recharge.vue b/pages/plugins/wallet/components/user-recharge/user-recharge.vue
new file mode 100644
index 0000000..a2ff95c
--- /dev/null
+++ b/pages/plugins/wallet/components/user-recharge/user-recharge.vue
@@ -0,0 +1,428 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav-child flex-row align-c margin-bottom-lg">
+            <view v-for="(item, index) in nav_status_list" :key="index">
+                <view class="item dis-inline-block round margin-right-main tc" :class="nav_status_index == index ? 'cr-main bg-main-light' : 'cr-grey bg-grey-e'" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+            </view>
+        </view>
+
+        <!-- 列表 -->
+        <view v-if="data_list.length > 0" class="data-list">
+            <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                <view class="base oh br-b-dashed padding-bottom-main flex-row jc-sb align-c">
+                    <text class="cr-grey-9">{{ item.add_time }}</text>
+                    <text :class="item.status == 0 ? 'cr-main' : 'cr-grey-c'">{{ item.status_name }}</text>
+                </view>
+                <view :data-value="'/pages/plugins/wallet/user-recharge-detail/user-recharge-detail?id=' + item.id" @tap="url_event" class="content margin-top cp">
+                    <view v-for="(fv, fi) in content_list" :key="fi">
+                        <view class="single-text margin-top-sm recharge-item">
+                            <text class="name cr-grey-9 margin-right-main">{{ fv.name }}:</text>
+                            <text class="fw-b">{{ item[fv.field] }}</text>
+                            <text v-if="(fv.unit || null) != null" class="fw-b">{{ fv.unit }}</text>
+                        </view>
+                    </view>
+                </view>
+                <view v-if="item.status == 0" class="item-operation tr margin-top-main">
+                    <button class="round bg-white br-grey-9 text-size-md" type="default" size="mini" @tap="delete_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('common.del')}}</button>
+                    <button class="round bg-white cr-main br-main text-size-md" type="default" size="mini" @tap="pay_event" :data-price="item.money" :data-value="item.id" :data-index="index" :data-payment="item.payment_id" hover-class="none">{{$t('user-recharge.user-recharge.8y9dki')}}</button>
+                </view>
+            </view>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+        </view>
+
+        <!-- 结尾 -->
+        <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+
+        <!-- 支付弹窗 -->
+        <component-payment
+            ref="payment"
+            :propPayUrl="pay_url"
+            :propQrcodeUrl="qrcode_url"
+            propPayDataKey="recharge_id"
+            :propPaymentList="payment_list"
+            :propTempPayValue="temp_pay_value"
+            :propTempPayIndex="temp_pay_index"
+            :propPayPrice="pay_price"
+            :propPaymentId="payment_id"
+            :propToAppointPage="to_appoint_page"
+            :propDefaultPaymentId="default_payment_id"
+            :propIsShowPayment="is_show_payment_popup"
+            @close-payment-popup="payment_popup_event_close"
+            @pay-success="order_item_pay_success_handle"
+        ></component-payment>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentPopup from '@/components/popup/popup';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+
+    import componentPayment from '@/components/payment/payment';
+
+    export default {
+        props: {
+            propPullDownRefresh: {
+                type: Boolean,
+                default: false,
+            },
+            propScrollLower: {
+                type: Boolean,
+                default: false,
+            },
+            propCurrent: {
+                type: Number,
+                default: 0,
+            },
+        },
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                nav_status_list: [
+                    { name: this.$t('common.all'), value: '-1' },
+                    { name: this.$t('order.order.pjb15r'), value: '0' },
+                    { name: this.$t('order.order.s8g966'), value: '1' },
+                ],
+                nav_status_index: 0,
+                content_list: [
+                    { name: this.$t('user-recharge-detail.user-recharge-detail.ch84a8'), field: 'recharge_no' },
+                    { name: this.$t('user-recharge-detail.user-recharge-detail.7272ia'), field: 'money' },
+                    { name: this.$t('user-order-detail.user-order-detail.516tlr'), field: 'pay_money' },
+                ],
+
+                // 支付弹窗参数
+                pay_url: '',
+                qrcode_url: '',
+                payment_list: [],
+                temp_pay_value: '',
+                temp_pay_index: 0,
+                payment_id: 0,
+                default_payment_id: 0,
+                is_show_payment_popup: false,
+                pay_price: 0,
+                to_appoint_page: '/pages/plugins/wallet/user/user?type=1',
+            };
+        },
+
+        components: {
+            componentPopup,
+            componentNoData,
+            componentBottomLine,
+            componentPayment,
+        },
+
+        created() {
+            this.init();
+        },
+
+        mounted() {
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+        watch: {
+            propPullDownRefresh(newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.setData({
+                        data_page: 1,
+                    });
+                    this.get_data_list(1);
+                }
+            },
+            propScrollLower(newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.get_data_list();
+                }
+            },
+            propCurrent(newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.setData({
+                        nav_status_index: newVal,
+                    });
+                }
+            },
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.setData({
+                        pay_url: app.globalData.get_request_url('pay', 'recharge', 'wallet'),
+                        qrcode_url: app.globalData.get_request_url('paycheck', 'recharge', 'wallet'),
+                    });
+                    // 获取数据
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 参数
+                var order_status = (this.nav_status_list[this.nav_status_index] || null) == null ? -1 : this.nav_status_list[this.nav_status_index]['value'];
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'recharge', 'wallet'),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page,
+                        status: order_status,
+                        is_more: 1,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+
+                                this.setData({
+                                    payment_list: res.data.data.payment_list || [],
+                                    default_payment_id: res.data.data.default_payment_id || 0,
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+
+                                // 下订单支付处理
+                                var key = app.globalData.data.cache_page_pay_key;
+                                var pay_data = uni.getStorageSync(key) || null;
+                                if (pay_data != null && (pay_data.order_ids || null) != null && (pay_data.payment_id || null) != null) {
+                                    uni.removeStorageSync(key);
+                                    this.setData({
+                                        temp_pay_value: pay_data.order_ids,
+                                        payment_id: pay_data.payment_id,
+                                    });
+                                    if ((this.$refs.payment || null) != null) {
+                                        this.$refs.payment.pay_handle(pay_data.order_ids, pay_data.payment_id, this.payment_list);
+                                    }
+                                }
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 支付
+            pay_event(e) {
+                this.setData({
+                    is_show_payment_popup: true,
+                    temp_pay_value: e.currentTarget.dataset.value,
+                    temp_pay_index: e.currentTarget.dataset.index,
+                    pay_price: e.currentTarget.dataset.price,
+                    payment_id: e.currentTarget.dataset.payment || 0,
+                });
+            },
+
+            // 支付弹窗关闭
+            payment_popup_event_close(e) {
+                this.setData({
+                    is_show_payment_popup: false,
+                });
+            },
+            // 支付成功数据设置
+            order_item_pay_success_handle(data) {
+                var order_ids_arr = data.order_id.toString().split(',');
+                var temp_data_list = this.data_list;
+                for (var i in temp_data_list) {
+                    if (order_ids_arr.indexOf(temp_data_list[i]['id'].toString()) != -1) {
+                        temp_data_list[i]['pay_money'] = temp_data_list[i]['money'];
+                        temp_data_list[i]['status'] = 1;
+                        temp_data_list[i]['status_name'] = this.$t('order.order.s8g966');
+                    }
+                }
+                this.setData({
+                    data_list: temp_data_list,
+                });
+
+                // 成功回调事件
+                this.$emit('pay-success');
+            },
+
+            // 删除
+            delete_event(e) {
+                var self = this;
+                uni.showModal({
+                    title: self.$t('common.warm_tips'),
+                    content: self.$t('recommend-list.recommend-list.54d418'),
+                    confirmText: self.$t('common.confirm'),
+                    cancelText: self.$t('recommend-list.recommend-list.w9460o'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            // 参数
+                            var id = e.currentTarget.dataset.value;
+                            var index = e.currentTarget.dataset.index;
+
+                            // 加载loding
+                            uni.showLoading({
+                                title: self.$t('common.processing_in_text'),
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url('delete', 'recharge', 'wallet'),
+                                method: 'POST',
+                                data: {
+                                    id: id,
+                                },
+                                dataType: 'json',
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        var temp_data_list = self.data_list;
+                                        temp_data_list.splice(index, 1);
+                                        self.setData({
+                                            data_list: temp_data_list,
+                                        });
+                                        if (temp_data_list.length == 0) {
+                                            self.setData({
+                                                data_list_loding_status: 0,
+                                                data_bottom_line_status: false,
+                                            });
+                                        }
+                                        app.globalData.showToast(res.data.msg, 'success');
+                                    } else {
+                                        app.globalData.showToast(res.data.msg);
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(self.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_status_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 页面卸载
+            onUnload(e) {
+                clearInterval(this.popup_view_pay_timer);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style scoped>
+    .nav-child .item {
+        height: 60rpx;
+        line-height: 60rpx;
+        padding: 0 30rpx;
+        min-width: 84rpx;
+    }
+    .payment-list .item {
+        width: 50%;
+    }
+
+    .payment-list .item-content {
+        padding: 20rpx 10rpx;
+    }
+
+    .payment-list .item-content image {
+        width: 50rpx;
+        height: 50rpx !important;
+    }
+    .recharge-item .name {
+        min-width: 112rpx;
+    }
+</style>
diff --git a/pages/plugins/wallet/components/wallet-log/wallet-log.vue b/pages/plugins/wallet/components/wallet-log/wallet-log.vue
new file mode 100644
index 0000000..6fc90a4
--- /dev/null
+++ b/pages/plugins/wallet/components/wallet-log/wallet-log.vue
@@ -0,0 +1,248 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav-child flex-row align-c margin-bottom-lg">
+            <view v-for="(item, index) in nav_status_list" :key="index">
+                <view class="item dis-inline-block round margin-right-main tc" :class="nav_status_index == index ? 'cr-main bg-main-light' : 'cr-grey bg-grey-e'" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+            </view>
+        </view>
+
+        <!-- 列表 -->
+        <view v-if="data_list.length > 0" class="data-list">
+            <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                <view class="base oh br-b-dashed padding-bottom-main flex-row jc-sb align-c">
+                    <text class="cr-grey-9">{{ item.add_time }}</text>
+                </view>
+                <view :data-value="'/pages/plugins/wallet/wallet-log-detail/wallet-log-detail?id=' + item.id" @tap="url_event" class="content margin-top-main cp">
+                    <view v-for="(fv, fi) in content_list" :key="fi">
+                        <view class="single-text margin-top-sm log-item">
+                            <text class="name cr-grey-9 margin-right-main">{{ fv.name }}:</text>
+                            <text class="fw-b">{{ item[fv.field] }}</text>
+                            <text v-if="(fv.unit || null) != null" class="fw-b">{{ fv.unit }}</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+        </view>
+
+        <!-- 结尾 -->
+        <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+
+    export default {
+        props: {
+            propPullDownRefresh: {
+                type: Boolean,
+                default: false,
+            },
+            propScrollLower: {
+                type: Boolean,
+                default: false,
+            },
+        },
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                nav_status_index: 0,
+                nav_status_list: [
+                    { name: this.$t('common.all'), value: '-1' },
+                    { name: this.$t('wallet-log.wallet-log.9p865e'), value: '0' },
+                    { name: this.$t('wallet-log.wallet-log.1nm6c2'), value: '1' },
+                ],
+                content_list: [
+                    { name: this.$t('invoice.invoice.l3832z'), field: 'business_type_name' },
+                    { name: this.$t('wallet-log-detail.wallet-log-detail.744os7'), field: 'money_type_name' },
+                    { name: this.$t('wallet-log-detail.wallet-log-detail.ruq60b'), field: 'operation_money' },
+                    { name: this.$t('wallet-log-detail.wallet-log-detail.4q7pfq'), field: 'original_money' },
+                    { name: this.$t('wallet-log-detail.wallet-log-detail.r814ne'), field: 'latest_money' },
+                ],
+            };
+        },
+
+        components: {
+            componentNoData,
+            componentBottomLine,
+        },
+        created() {
+            this.init();
+        },
+        mounted() {
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+        watch: {
+            propPullDownRefresh(newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.setData({
+                        data_page: 1,
+                    });
+                    this.get_data_list(1);
+                }
+            },
+            propScrollLower(newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.get_data_list();
+                }
+            },
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 参数
+                var status = (this.nav_status_list[this.nav_status_index] || null) == null ? -1 : this.nav_status_list[this.nav_status_index]['value'];
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'walletlog', 'wallet'),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page,
+                        operation_type: status,
+                        is_more: 1,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_status_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style scoped>
+    .nav-child .item {
+        height: 60rpx;
+        line-height: 60rpx;
+        padding: 0 30rpx;
+        min-width: 84rpx;
+    }
+    .log-item .name {
+        min-width: 112rpx;
+    }
+</style>
diff --git a/pages/plugins/wallet/payment-code/payment-code.css b/pages/plugins/wallet/payment-code/payment-code.css
new file mode 100644
index 0000000..2b4f3ae
--- /dev/null
+++ b/pages/plugins/wallet/payment-code/payment-code.css
@@ -0,0 +1,12 @@
+.brcode {
+    width: 660rpx;
+    padding-top: 60rpx;
+}
+.qrcode {
+    width: 450rpx;
+    margin-top: 60rpx;
+    padding: 50rpx;
+}
+.bottom-fixed .btn {
+    width: 50%;
+}
\ No newline at end of file
diff --git a/pages/plugins/wallet/payment-code/payment-code.vue b/pages/plugins/wallet/payment-code/payment-code.vue
new file mode 100644
index 0000000..417fcab
--- /dev/null
+++ b/pages/plugins/wallet/payment-code/payment-code.vue
@@ -0,0 +1,230 @@
+<template>
+    <view :class="theme_view">
+        <view class="scroll-box bg-white">
+            <!-- 主体内容 -->
+            <block v-if="data_list_loding_status == 3">
+                <!-- 条码 -->
+                <view class="brcode auto">
+                    <w-barcode :options="barcode"></w-barcode>
+                    <view class="fw-b tc margin-top text-size-lg">{{ payment_code }}</view>
+                </view>
+
+                <!-- 二维码 -->
+                <view class="qrcode auto br radius">
+                    <w-qrcode :options="qrcode"></w-qrcode>
+                </view>
+
+                <!-- 提示信息 -->
+                <view class="cr-grey tc margin-top-xxxl">{{$t('member-code.member-code.oc4x18')}}</view>
+
+                <!-- 倒计时 -->
+                <view class="margin-top-xxxl cr-yellow tc">({{ scheduled_value }}{{$t('payment-code.payment-code.b74qxe')}}</view>
+
+                <!-- 导航 -->
+                <view v-if="(plugins_membershiplevelvip || null) != null" class="bottom-fixed" :style="bottom_fixed_style">
+                    <view class="bottom-line-exclude">
+                        <view class="bg-white br-grey-d round oh">
+                            <button type="default" class="btn bg-white round text-size fl br-0" size="mini" :data-value="'/pages/plugins/membershiplevelvip/member-code/member-code?screen_brightness_value=' + screen_brightness_value" data-redirect="1" @tap="url_event">{{$t('member-code.member-code.26bu38')}}</button>
+                            <button type="default" class="btn bg-main cr-white round text-size fr br-0" size="mini">{{$t('member-code.member-code.x58gqu')}}</button>
+                        </view>
+                    </view>
+                </view>
+            </block>
+
+            <!-- 错误提示 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            <view v-if="is_to_login == 1" class="margin-top-lg tc">
+                <button type="default" class="bg-main br-main cr-white" size="mini" data-value="/pages/login/login" @tap="url_event">{{$t('member-code.member-code.yj6g3a')}}</button>
+            </view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                bottom_fixed_style: '',
+                is_to_login: 0,
+                screen_brightness_value: 0,
+                plugins_membershiplevelvip: null,
+                scheduled_timer: null,
+                scheduled_value: 0,
+                payment_code: '',
+                barcode: {
+                    width: 660,
+                    height: 120,
+                    code: '',
+                },
+                qrcode: {
+                    code: '',
+                    size: 450,
+                },
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+        },
+
+        // 页面加载初始化
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 获取屏幕亮度
+            // #ifndef H5
+            var self = this;
+            if ((params || null) != null && (params.screen_brightness_value || null) == null) {
+                uni.getScreenBrightness({
+                    success: function (res) {
+                        self.setData({
+                            screen_brightness_value: res.value,
+                        });
+                    },
+                });
+            } else {
+                self.setData({
+                    screen_brightness_value: params.screen_brightness_value,
+                });
+            }
+            // #endif
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 初始化配置
+            this.init_config();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        methods: {
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    this.setData({
+                        plugins_membershiplevelvip: app.globalData.get_config('plugins_base.membershiplevelvip', null),
+                    });
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 获取数据
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    // 获取付款码
+                    this.get_data();
+
+                    // #ifndef H5
+                    // 设置屏幕亮度
+                    uni.setScreenBrightness({
+                        value: 1,
+                    });
+                    // #endif
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_list_loding_msg: this.$t('setup.setup.nwt4o1'),
+                        is_to_login: 1,
+                    });
+                }
+            },
+
+            // 获取付款码
+            get_data() {
+                clearInterval(this.scheduled_timer);
+                var self = this;
+                uni.request({
+                    url: app.globalData.get_request_url('paymentcode', 'user', 'wallet'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            var time = parseInt(res.data.data.time || 30);
+                            var timer = setInterval(function () {
+                                if (time <= 1) {
+                                    self.get_data();
+                                } else {
+                                    time--;
+                                    self.setData({ scheduled_value: time });
+                                }
+                            }, 1000);
+
+                            // 付款码数据
+                            var barcode = this.barcode;
+                            var qrcode = this.qrcode;
+                            barcode['code'] = res.data.data.code;
+                            qrcode['code'] = res.data.data.code;
+                            this.setData({
+                                data_list_loding_status: 3,
+                                is_to_login: 0,
+                                barcode: barcode,
+                                qrcode: qrcode,
+                                payment_code: res.data.data.code,
+                                scheduled_timer: timer,
+                                scheduled_value: time,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                                is_to_login: 0,
+                            });
+                        }
+                    },
+                    fail: () => {
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                            is_to_login: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+        },
+
+        // 页面销毁时执行
+        onUnload: function () {
+            clearInterval(this.scheduled_timer);
+            // #ifndef H5
+            // 恢复屏幕原始亮度
+            if (this.screen_brightness_value > 0) {
+                uni.setScreenBrightness({
+                    value: this.screen_brightness_value,
+                });
+            }
+            // #endif
+        },
+    };
+</script>
+<style>
+    @import './payment-code.css';
+</style>
diff --git a/pages/plugins/wallet/recharge/recharge.css b/pages/plugins/wallet/recharge/recharge.css
new file mode 100644
index 0000000..fab72aa
--- /dev/null
+++ b/pages/plugins/wallet/recharge/recharge.css
@@ -0,0 +1,69 @@
+/** 
+ * 充值头部
+ */
+.wallet-price {
+    padding: 104rpx 40rpx 0 40rpx;
+}
+
+.wallet-price .unit {
+    font-size: 42rpx;
+}
+
+.wallet-price .price {
+    font-size: 80rpx;
+}
+
+/** 
+ * 充值内容
+ */
+.recharge-content {
+    border-radius: 32rpx 32rpx 0 0;
+    padding: 48rpx 28rpx;
+}
+
+.recharge-price-list {
+    width: calc(100% / 3 - 24rpx);
+    height: 140rpx;
+    line-height: 140rpx;
+    padding: 18rpx 12rpx;
+}
+
+.recharge-price-content {
+    background: #F5F7F9;
+    border: 1px solid #F5F7F9;
+    transition: all 0.3s ease-in-out;
+}
+
+.recharge-price-content.active {
+    background: rgba(226, 44, 8, 0.06);
+    color: #E22C08;
+    border: 1px solid #E22C08;
+}
+
+.recharge-price-content .tips {
+    height: 32rpx;
+    line-height: 32rpx;
+    padding: 0 20rpx;
+    background: #D8D8D8 linear-gradient(107deg, #FC6F31 0%, #E22C08 100%);
+    border-radius: 16rpx 0 16rpx 0;
+    top: -16rpx;
+}
+
+.form-container .custom-price {
+    background: #F5F7F9 !important;
+}
+
+.form-container input {
+    height: 80rpx !important;
+    line-height: 80rpx !important;
+}
+
+.circle-poiont {
+    width: 6px;
+    height: 6px;
+}
+
+.recharge-desc-title,
+.recharge-desc-content {
+    padding-bottom: 16rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/wallet/recharge/recharge.vue b/pages/plugins/wallet/recharge/recharge.vue
new file mode 100644
index 0000000..8166e29
--- /dev/null
+++ b/pages/plugins/wallet/recharge/recharge.vue
@@ -0,0 +1,291 @@
+<template>
+    <view :class="theme_view">
+        <component-nav-back :propName="$t('recharge.recharge.otwkjn')"></component-nav-back>
+        <view v-if="data_list_loding_status == 3" class="weixin-nav-padding-top">
+            <view class="padding-top-xxxl">
+                <!-- 头部背景 -->
+                <image :src="wallet_static_url + 'rechage-bg.png'" mode="widthFix" class="pa top-0 bg-img wh-auto" />
+                <view class="pr padding-top-main">
+                    <view class="wallet-price cr-white">
+                        <view class="text-size-lg fw-b">{{$t('recharge.recharge.3shyx4')}}</view>
+                        <view class="margin-top-sm">
+                            <text class="unit">{{ currency_symbol }}</text>
+                            <text class="price fw-b">{{ user_wallet.normal_money }}</text>
+                        </view>
+                    </view>
+                    <view class="recharge-content bg-white spacing-mt">
+                        <block v-if="preset_data.length > 0">
+                            <view class="padding-horizontal-sm spacing-mb">{{$t('recharge.recharge.60k2v3')}}</view>
+                            <view class="flex-row flex-wrap tc spacing-mb">
+                                <view v-for="(item, index) in preset_data" :key="index" class="recharge-price-list" :data-index="index" :data-value="item.value" @tap="change_price_event">
+                                    <view class="recharge-price-content border-radius-main pr" :class="select_index === index ? 'active' : ''">
+                                        <view v-if="item.tips" class="tips cr-white dis-inline-block pa left-0 text-size-xss">{{ item.tips }}</view>
+                                        <view class="single-text">
+                                            <text class="text-size-md">{{ currency_symbol }}</text>
+                                            <text class="text-size-xl">{{ item.value }}</text>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                        </block>
+                        <view class="form-container padding-top-sm padding-horizontal-sm">
+                            <view class="form-gorup border-radius-main custom-price flex-row align-c">
+                                <view class="margin-right-xxl">{{preset_data.length > 0 ? $t('recharge.recharge.23zwpz') : $t('recharge.recharge.otwkjn')}}{{$t('recharge.recharge.qbw1x2')}}</view>
+                                <input type="digit" name="money" v-model="recharge_money_value" placeholder-class="cr-grey-9" class="cr-base text-size-md flex-1 flex-width" :placeholder="$t('recharge.recharge.73f4v9')" @input="recharge_money_value_input_event" maxlength="6" />
+                            </view>
+                            <view class="form-gorup form-gorup-submit spacing-mt">
+                                <button class="round cr-white bg-main br-main text-size" type="default" hover-class="none" :disabled="form_submit_disabled_status" @tap="form_submit_event">{{$t('recharge.recharge.x27b25')}}</button>
+                            </view>
+                        </view>
+                        <view v-if="((recharge_desc || null) != null && recharge_desc.length > 0)" class="recharge-desc padding-top-xxl padding-horizontal-sm">
+                            <view class="recharge-desc-title padding-bottom-sm">{{$t('recharge.recharge.4fm61g')}}</view>
+                            <view v-for="(item, index) in recharge_desc" :key="index" class="recharge-desc-content cr-grey-9 flex-row align-c">
+                                <text class="dis-inline-block circle bg-main circle-poiont margin-right-sm"></text>
+                                <text class="text-size-xs">{{ item }}</text>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+        <!-- 支付弹窗 -->
+        <component-payment
+            :propCurrencySymbol="currency_symbol"
+            :propPayUrl="pay_url"
+            :propQrcodeUrl="qrcode_url"
+            propPayDataKey="recharge_id"
+            :propPaymentList="payment_list"
+            :propTempPayValue="temp_pay_value"
+            :propPayPrice="pay_price"
+            :propPaymentId="payment_id"
+            :propIsRedirectTo="true"
+            :propToFailPage="to_fail_page"
+            :propToAppointPage="to_appoint_page"
+            :propIsShowPayment="is_show_payment_popup"
+            @close-payment-popup="payment_popup_event_close"
+        ></component-payment>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNavBack from '@/components/nav-back/nav-back';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentPayment from '@/components/payment/payment';
+    var wallet_static_url = app.globalData.get_static_url('wallet', true) + 'app/';
+
+    var currency_symbol = (app.globalData.data.is_wallet_use_fixed_currency_symbol == 1) ? app.globalData.data.currency_symbol : app.globalData.currency_symbol();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                wallet_static_url: wallet_static_url,
+                currency_symbol: currency_symbol,
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                recharge_money_value: '',
+                form_submit_disabled_status: false,
+                preset_data: [],
+                recharge_desc: '',
+                user_wallet: null,
+                select_index: null,
+
+                // 支付弹窗参数
+                pay_url: '',
+                qrcode_url: '',
+                payment_list: [],
+                temp_pay_value: '',
+                is_show_payment_popup: false,
+                pay_price: 0,
+                payment_id: 0,
+                // 支付失败跳转的页面
+                to_fail_page: '/pages/plugins/wallet/user/user',
+                to_appoint_page: '/pages/plugins/wallet/user/user?type=3',
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNavBack,
+            componentPayment,
+            componentNoData,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+                recharge_money_value: params.money || '',
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.setData({
+                        pay_url: app.globalData.get_request_url('pay', 'recharge', 'wallet'),
+                        qrcode_url: app.globalData.get_request_url('paycheck', 'recharge', 'wallet'),
+                    });
+                    this.get_data();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 2,
+                        data_list_loding_msg: this.$t('extraction-apply.extraction-apply.m3xdif'),
+                    });
+                }
+            },
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('rechargeconfigdata', 'recharge', 'wallet'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                preset_data: data.preset_data || [],
+                                recharge_desc: data.recharge_desc || '',
+                                user_wallet: data.user_wallet || null,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 3,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 选择充值金额
+            change_price_event(e) {
+                this.setData({
+                    select_index: e.currentTarget.dataset.index,
+                    recharge_money_value: e.currentTarget.dataset.value,
+                });
+            },
+
+            // 充值金额输入事件
+            recharge_money_value_input_event(e) {
+                this.setData({
+                    recharge_money_value: e.detail.value || '',
+                    select_index: null,
+                });
+            },
+
+            // 数据提交
+            form_submit_event(e) {
+                // 参数
+                if ((this.recharge_money_value || null) == null) {
+                    app.globalData.showToast(this.$t('recharge.recharge.73f4v9'));
+                    return false;
+                }
+
+                this.setData({
+                    form_submit_disabled_status: true,
+                });
+                uni.showLoading({
+                    title: this.$t('common.processing_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('create', 'recharge', 'wallet'),
+                    method: 'POST',
+                    data: {
+                        money: this.recharge_money_value,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        this.setData({
+                            form_submit_disabled_status: false,
+                        });
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            uni.setStorageSync(app.globalData.data.cache_page_pay_key, { type: 1 });
+                            var data = res.data.data;
+                            this.setData({
+                                pay_price: data.money,
+                                temp_pay_value: data.recharge_id,
+                                payment_id: data.default_payment_id || 0,
+                                payment_list: data.payment_list,
+                                is_show_payment_popup: true,
+                            });
+                        } else {
+                            if (app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            } else {
+                                app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                            }
+                        }
+                    },
+                    fail: () => {
+                        this.setData({
+                            form_submit_disabled_status: false,
+                        });
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            payment_popup_event_close() {
+                this.setData({
+                    is_show_payment_popup: false,
+                });
+            },
+
+            // 页面滚动监听
+            onPageScroll(e) {
+                var top = e.scrollTop > 47 ? 1 : e.scrollTop / 47;
+                this.setData({
+                    opacity: top,
+                });
+            },
+        },
+    };
+</script>
+<style>
+    @import './recharge.css';
+</style>
diff --git a/pages/plugins/wallet/transfer/transfer.css b/pages/plugins/wallet/transfer/transfer.css
new file mode 100644
index 0000000..163137b
--- /dev/null
+++ b/pages/plugins/wallet/transfer/transfer.css
@@ -0,0 +1,15 @@
+.img {
+    width: 60rpx;
+    height: 60rpx;
+}
+
+.buy-submit {
+    height: 88rpx;
+    line-height: 88rpx;
+}
+
+.error-msg {
+    color: #FF6C6C;
+    height: 34rpx;
+    line-height: 34rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/wallet/transfer/transfer.vue b/pages/plugins/wallet/transfer/transfer.vue
new file mode 100644
index 0000000..e97c987
--- /dev/null
+++ b/pages/plugins/wallet/transfer/transfer.vue
@@ -0,0 +1,232 @@
+<template>
+    <view :class="theme_view">
+        <view class="padding-main">
+            <block v-if="(data || null) != null">
+                <form @submit="form_submit" class="form-container">
+                    <view class="border-radius-main bg-white padding-vertical-main padding-left-main flex-row" :class="is_error_msg ? '' : 'spacing-mb'">
+                        <view class="title fw-b text-size margin-right-main">{{$t('cash-create.cash-create.36756z')}}</view>
+                        <view class="flex-1 flex-width padding-right-main">
+                            <view class="flex-row jc-sb align-c">
+                                <!-- #ifndef H5 -->
+                                <view class="margin-right-sm pr top-xs" @tap="scan_event">
+                                    <iconfont name="icon-scan" size="28rpx" color="#999" propClass="lh-il"></iconfont>
+                                </view>
+                                <!-- #endif -->
+                                <input name="keywords" :value="input_clear_value" class="text-size-md pr top-sm flex-1 flex-width" :placeholder="$t('transfer.transfer.t53ary')" placeholder-class="cr-grey-c" @input="input_account_event" />
+                                <text class="cr-main pr top-xs margin-left-sm" @tap="search_account_event">{{$t('common.confirm')}}</text>
+                            </view>
+                            <view v-if="(receive_user || null) != null && input_clear_value" class="br-t-e padding-top-main margin-top-main flex-row align-c">
+                                <image :src="receive_user.avatar" mode="widthFix" class="img margin-right-xs circle" />
+                                <text class="text-size-xs">{{ receive_user.user_name_view }}</text>
+                            </view>
+                        </view>
+                    </view>
+                    <view v-if="is_error_msg" class="error-msg text-size-xs padding-vertical">{{ error_msg }}</view>
+                    <view class="border-radius-main bg-white padding-main spacing-mb">
+                        <view class="title fw-b text-size margin-bottom-xxxl padding-bottom-xl">{{$t('transfer.transfer.2q274j')}}</view>
+                        <input name="money" type="number" class="text-size-xl tc cr-red" :placeholder="$t('transfer.transfer.g22y5v')" placeholder-class="cr-grey-c" />
+                        <view class="tc spacing-mt-10 margin-bottom-xxxl padding-bottom-main">
+                            <text class="cr-grey-9">{{$t('transfer.transfer.9xe2bl')}}</text>
+                            <text class="fw-b">{{ data.normal_money }}</text>
+                        </view>
+                        <input name="note" class="text-size-md bg-grey-f9 padding-main border-radius-sm" :placeholder="$t('transfer.transfer.2bwh7h')" placeholder-class="cr-grey-c" />
+                    </view>
+                    <view class="padding-main">
+                        <button type="default" form-type="submit" hover-class="none" size="mini" class="br-main bg-main cr-white round buy-submit text-size dis-block">{{$t('common.confirm')}}</button>
+                    </view>
+                </form>
+            </block>
+            <block v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </block>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data: null,
+                receive_user: null,
+                is_error_msg: false,
+                error_msg: '',
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                input_clear_value: '',
+            };
+        },
+        components: {
+            componentCommon,
+            componentNoData,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 加载数据
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.setData({
+                        is_user_login: true,
+                    });
+                    this.get_data();
+                }
+            },
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'user', 'wallet'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data: data.user_wallet || null,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+            // 账户输入事件
+            input_account_event(e) {
+                this.setData({
+                    input_clear_value: e.detail.value,
+                });
+            },
+            // 用户查询
+            search_account_event() {
+                if (this.is_user_login) {
+                    uni.request({
+                        url: app.globalData.get_request_url('userquery', 'transfer', 'wallet'),
+                        method: 'POST',
+                        data: {
+                            keywords: this.input_clear_value,
+                        },
+                        dataType: 'json',
+                        success: (res) => {
+                            if (res.data.code == 0) {
+                                this.setData({
+                                    receive_user: res.data.data || null,
+                                    is_error_msg: false,
+                                });
+                            } else {
+                                this.setData({
+                                    receive_user: null,
+                                    is_error_msg: true,
+                                    error_msg: res.data.msg,
+                                });
+                            }
+                        },
+                        fail: () => {
+                            this.setData({
+                                receive_user: null,
+                                is_error_msg: true,
+                                error_msg: this.$t('common.internet_error_tips'),
+                            });
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 扫码
+            scan_event(e) {
+                var self = this;
+                uni.scanCode({
+                	success: function (res) {
+                		self.setData({
+                            input_clear_value: res.result
+                        });
+                        self.search_account_event();
+                	}
+                });
+            },
+
+            // 转账表单提交
+            form_submit(e) {
+                if (this.is_user_login) {
+                    var new_data = {
+                        ...e.detail.value,
+                        receive_user_id: (this.receive_user || null) === null ? '' : this.receive_user.id,
+                    };
+                    var validation = [
+                        { fields: 'keywords', msg: this.$t('transfer.transfer.1aijp1') },
+                        { fields: 'receive_user_id', msg: this.$t('transfer.transfer.x4mzo9') },
+                        { fields: 'money', msg: this.$t('transfer.transfer.g22y5v') },
+                    ];
+                    if (app.globalData.fields_check(new_data, validation)) {
+                        uni.showLoading({
+                            title: this.$t('common.processing_in_text'),
+                        });
+                        uni.request({
+                            url: app.globalData.get_request_url('save', 'transfer', 'wallet'),
+                            method: 'POST',
+                            data: new_data,
+                            dataType: 'json',
+                            success: (res) => {
+                                uni.hideLoading();
+                                if (res.data.code == 0) {
+                                    app.globalData.url_open('/pages/plugins/wallet/user/user?type=3', true);
+                                } else {
+                                    if (app.globalData.is_login_check(res.data, this, 'form_submit', e)) {
+                                        app.globalData.showToast(res.data.msg);
+                                    }
+                                }
+                            },
+                            fail: () => {
+                                uni.hideLoading();
+                                app.globalData.showToast(this.$t('common.internet_error_tips'));
+                            },
+                        });
+                    }
+                }
+            },
+        },
+    };
+</script>
+<style scoped>
+    @import './transfer.css';
+</style>
diff --git a/pages/plugins/wallet/user-cash-detail/user-cash-detail.vue b/pages/plugins/wallet/user-cash-detail/user-cash-detail.vue
new file mode 100644
index 0000000..f2ce04f
--- /dev/null
+++ b/pages/plugins/wallet/user-cash-detail/user-cash-detail.vue
@@ -0,0 +1,143 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="detail != null">
+            <view class="padding-horizontal-main padding-top-main">
+                <view v-if="detail_list.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="panel-content oh">
+                        <view v-for="(item, index) in detail_list" :key="index" class="item br-b-dashed oh padding-vertical-main">
+                            <view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
+                            <view class="content fl br-l padding-left-main">{{ item.value }}</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                data_bottom_line_status: false,
+                detail: null,
+                detail_list: [],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("detail", "cash", "wallet"),
+                    method: "POST",
+                    data: {
+                        id: this.params.id,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                detail: data.data,
+                                detail_list: [
+                                    { name: this.$t('user-cash-detail.user-cash-detail.e8a3e8'), value: data.data.cash_no || "" },
+                                    { name: this.$t('user-cash-detail.user-cash-detail.wyad6w'), value: data.data.status_name || "" },
+                                    { name: this.$t('cash-create.cash-create.qg404q'), value: data.data.money || "" },
+                                    { name: this.$t('cash-create.cash-create.9ugssd'), value: data.data.commission || "" },
+                                    { name: this.$t('cash-create.cash-create.yu2raf'), value: data.data.cash_type_name || "" },
+                                    { name: this.$t('user-cash-detail.user-cash-detail.j5s3u6'), value: data.data.bank_name || "" },
+                                    { name: this.$t('user-cash-detail.user-cash-detail.53k647'), value: data.data.bank_username || "" },
+                                    { name: this.$t('user-cash-detail.user-cash-detail.m556tl'), value: data.data.bank_accounts || "" },
+                                    { name: this.$t('user-cash-detail.user-cash-detail.i308o1'), value: data.data.pay_money <= 0 ? "" : data.data.pay_money || "" },
+                                    { name: this.$t('user-cash-detail.user-cash-detail.451xxt'), value: data.data.pay_time || "" },
+                                    { name: this.$t('common.note'), value: data.data.msg || "" },
+                                    { name: this.$t('common.apply_time'), value: data.data.add_time || "" },
+                                    { name: this.$t('common.upd_time'), value: data.data.upd_time || "" },
+                                ],
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: "",
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "init")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+        },
+    };
+</script>
+<style></style>
diff --git a/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.vue b/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.vue
new file mode 100644
index 0000000..f1c82b3
--- /dev/null
+++ b/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.vue
@@ -0,0 +1,137 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="detail != null">
+            <view class="padding-horizontal-main padding-top-main">
+                <view v-if="detail_list.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="panel-content oh">
+                        <view v-for="(item, index) in detail_list" :key="index" class="item br-b-dashed oh padding-vertical-main">
+                            <view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
+                            <view class="content fl br-l padding-left-main">{{ item.value }}</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                data_bottom_line_status: false,
+                detail: null,
+                detail_list: [],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("detail", "recharge", "wallet"),
+                    method: "POST",
+                    data: {
+                        id: this.params.id,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                detail: data.data,
+                                detail_list: [
+                                    { name: this.$t('user-recharge-detail.user-recharge-detail.ch84a8'), value: data.data.recharge_no || "" },
+                                    { name: this.$t('user-recharge-detail.user-recharge-detail.dq5v2u'), value: data.data.status_name || "" },
+                                    { name: this.$t('user-recharge-detail.user-recharge-detail.7272ia'), value: data.data.money || "" },
+                                    { name: this.$t('user-order-detail.user-order-detail.516tlr'), value: data.data.pay_money <= 0 ? "" : data.data.pay_money || "" },
+                                    { name: this.$t('user-order-detail.user-order-detail.0e1sfs'), value: data.data.payment_name || "" },
+                                    { name: this.$t('user-order-detail.user-order-detail.h2c78h'), value: data.data.add_time || "" },
+                                    { name: this.$t('user-order-detail.user-order-detail.wn83rn'), value: data.data.pay_time || "" },
+                                ],
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: "",
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "init")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+        },
+    };
+</script>
+<style></style>
diff --git a/pages/plugins/wallet/user-transfer-detail/user-transfer-detail.vue b/pages/plugins/wallet/user-transfer-detail/user-transfer-detail.vue
new file mode 100644
index 0000000..ff107a1
--- /dev/null
+++ b/pages/plugins/wallet/user-transfer-detail/user-transfer-detail.vue
@@ -0,0 +1,136 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="detail != null">
+            <view class="padding-horizontal-main padding-top-main">
+                <view v-if="detail_list.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="panel-content oh">
+                        <view v-for="(item, index) in detail_list" :key="index" class="item br-b-dashed oh padding-vertical-main">
+                            <view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
+                            <view class="content fl br-l padding-left-main">{{ item.value }}</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                data_bottom_line_status: false,
+                detail: null,
+                detail_list: [],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("detail", "transfer", "wallet"),
+                    method: "POST",
+                    data: {
+                        id: this.params.id,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var receive_user = data.data.receive_user || {};
+                            this.setData({
+                                detail: data.data,
+                                detail_list: [
+                                    { name: this.$t('transfer.transfer.678uyg'), value: data.data.transfer_no || "" },
+                                    { name: this.$t('transfer.transfer.2q274j'), value: data.data.money || "" },
+                                    { name: this.$t('transfer.transfer.4g21cu'), value: receive_user.user_name_view || "" },
+                                    { name: this.$t('common.note'), value: data.data.note || "" },
+                                    { name: this.$t('user-transfer-detail.user-transfer-detail.x17599'), value: data.data.add_time || "" },
+                                ],
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: "",
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "init")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+        },
+    };
+</script>
+<style></style>
diff --git a/pages/plugins/wallet/user/user.css b/pages/plugins/wallet/user/user.css
new file mode 100644
index 0000000..f15f0d1
--- /dev/null
+++ b/pages/plugins/wallet/user/user.css
@@ -0,0 +1,87 @@
+/*
+* 基础
+*/
+.wallet-bg {
+    /* #ifdef H5 || APP */
+    top: -80rpx !important;
+    /* #endif */
+}
+
+.wallet-head .content {
+    border-radius: 24rpx;
+    padding: 24rpx;
+}
+
+.transfer-accounts {
+    border: 2rpx solid #fff;
+    height: 48rpx;
+    line-height: 48rpx;
+    padding: 0 28rpx;
+}
+
+.transfer-icon {
+    position: relative;
+    top: 6rpx;
+}
+
+.content-padding-1 {
+    padding: 2rpx;
+    left: -4rpx;
+    right: -4rpx;
+    top: -4rpx;
+}
+
+.filter-blur {
+    backdrop-filter: blur(40rpx);
+}
+
+.filter-blur-child {
+    top: 0;
+    bottom: 0;
+    filter: blur(0rpx);
+}
+
+.effective {
+    font-size: 72rpx;
+}
+
+.freeze,
+.give {
+    font-size: 42rpx;
+    text-shadow: 0px 1px 4px rgba(234, 44, 44, 0.46);
+}
+
+/*
+* 导航
+*/
+.nav .active {
+    width: 64px;
+    height: 4px;
+    bottom: 0;
+}
+
+/**
+* 媒体查询
+*/
+@media only screen and (min-width:960px) {
+    .wallet-bg {
+        /* #ifdef H5 */
+        top: -540rpx !important;
+        /* #endif */
+    }
+
+    .filter-blur-child {
+        /* #ifdef H5 */
+        left: -30rpx;
+        top: -30px;
+        right: -30px;
+        bottom: -30px;
+        /* #endif */
+    }
+
+    .wallet-child-bg {
+        /* #ifdef H5 */
+        height: 100% !important;
+        /* #endif */
+    }
+}
\ No newline at end of file
diff --git a/pages/plugins/wallet/user/user.vue b/pages/plugins/wallet/user/user.vue
new file mode 100644
index 0000000..673fbfe
--- /dev/null
+++ b/pages/plugins/wallet/user/user.vue
@@ -0,0 +1,296 @@
+<template>
+    <view :class="theme_view">
+        <component-nav-back :propIsShowBack="true" :propName="$t('pages.plugins-wallet-user')"></component-nav-back>
+        <block v-if="(data_base || null) != null">
+            <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60" @scroll="scroll_event">
+                <view class="page-bottom-fixed">
+                    <view class="weixin-nav-padding-top">
+                        <view class="padding-top-xxxl">
+                            <!-- 头部背景 -->
+                            <image :src="wallet_static_url + 'title-bg.png'" mode="widthFix" class="pa bg-img wh-auto" :class="status_bar_height > 0 ? 'top-0' : 'wallet-bg'" />
+                            <view class="pr padding-top-main">
+                                <!-- 钱包信息 -->
+                                <view class="padding-top-xxxl oh margin-top-main">
+                                    <view class="wallet-head padding-horizontal-xxxl">
+                                        <!-- 用户中心公告 -->
+                                        <view v-if="(data_base.user_center_notice || null) != null && data_base.user_center_notice.length > 0">
+                                            <uni-notice-bar class="padding-0" show-icon scrollable :text="data_base.user_center_notice.join('')" background-color="transparent" color="#fff" />
+                                        </view>
+                                        <view class="content oh cr-white pr filter-blur">
+                                            <view class="pa content-padding-1 oh filter-blur-child">
+                                                <image :src="wallet_static_url + 'wallet-bg.png'" mode="widthFix" class="wh-auto wallet-child-bg" />
+                                            </view>
+                                            <view class="pr z-i flex-row jc-c align-s">
+                                                <view class="flex-1 flex-width">
+                                                    <view>{{$t('frequencycard-list.frequencycard-list.954ewh')}}</view>
+                                                    <text class="fw-b effective">{{ is_price_show ? user_wallet.normal_money || '0.00' : '***' }}</text>
+                                                </view>
+                                                <view class="flex-row">
+                                                    <view @tap="price_change">
+                                                        <iconfont :name="is_price_show ? 'icon-wodeqianbao-eye' : 'icon-eye-half'" size="44rpx"></iconfont>
+                                                    </view>
+                                                    <view class="margin-left-xxxl" data-value="/pages/plugins/wallet/payment-code/payment-code" @tap="url_event">
+                                                        <iconfont name="icon-qrcode" size="44rpx"></iconfont>
+                                                    </view>
+                                                </view>
+                                            </view>
+                                            <view class="pr z-i flex-row jc-c align-c">
+                                                <view class="flex-1 flex-width flex-row jc-sb align-c margin-top-main">
+                                                    <view class="flex-1">
+                                                        <view class="tetx-size-xs">{{$t('user.user.mgx9x4')}}</view>
+                                                        <text class="freeze">{{ is_price_show ? user_wallet.frozen_money || '0.00' : '***' }}</text>
+                                                    </view>
+                                                    <view class="flex-1">
+                                                        <view class="tetx-size-xs">{{$t('user.user.424v6n')}}</view>
+                                                        <text class="give">{{ is_price_show ? user_wallet.give_money || '0.00' : '***' }}</text>
+                                                    </view>
+                                                </view>
+                                                <view v-if="(data_base || null) != null && (data_base.is_enable_transfer || 0) == 1" class="transfer-accounts cr-white va-m round flex-row align-c" data-value="/pages/plugins/wallet/transfer/transfer" @tap="url_event">
+                                                    <iconfont name="icon-transfer" size="28rpx" propClass="transfer-icon"></iconfont>
+                                                    <text class="margin-left-xs">{{$t('user.user.29f6n5')}}</text>
+                                                </view>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </view>
+                                <view class="padding-main padding-top-xxxl">
+                                    <!-- 导航 -->
+                                    <view v-if="nav_list.length > 0" class="nav oh margin-bottom-xl">
+                                        <view class="flex-row jc-sb align-c">
+                                            <block v-for="(item, index) in nav_list" :key="index">
+                                                <view class="text-size fw-b" :data-index="index" @tap="nav_change">
+                                                    <view class="pr dis-inline-block">
+                                                        {{ item.title }}
+                                                        <view v-if="current === index" class="pa active" :style="'background: linear-gradient(90deg, ' + theme_color + ' 0%, rgba(255, 255, 255, 0.27) 100%)'"></view>
+                                                    </view>
+                                                </view>
+                                            </block>
+                                        </view>
+                                    </view>
+                                    <!-- 明细 -->
+                                    <view class="nav-detail margin-bottom-lg">
+                                        <view v-if="current === 0">
+                                            <component-wallet-log :propPullDownRefresh="propPullDownRefresh" :propScrollLower="scroll_lower_bool"></component-wallet-log>
+                                        </view>
+                                        <view v-if="current === 1">
+                                            <component-user-recharge :propPullDownRefresh="propPullDownRefresh" :propScrollLower="scroll_lower_bool" @pay-success="pay_success_event"></component-user-recharge>
+                                        </view>
+                                        <view v-if="current === 2">
+                                            <component-user-cash :propPullDownRefresh="propPullDownRefresh" :propScrollLower="scroll_lower_bool"></component-user-cash>
+                                        </view>
+                                        <view v-if="current === 3">
+                                            <component-transfer :propPullDownRefresh="propPullDownRefresh" :propScrollLower="scroll_lower_bool"></component-transfer>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                            <view class="bottom-fixed" :style="bottom_fixed_style">
+                                <view class="bottom-line-exclude">
+                                    <view class="flex-row jc-sb align-c gap-10">
+                                        <button v-if="(data_base || null) != null && (data_base.is_enable_recharge || 0) == 1" class="item round cr-white bg-main br-main text-size wh-auto" type="default" hover-class="none" data-value="/pages/plugins/wallet/recharge/recharge" @tap="url_event">{{$t('recharge.recharge.otwkjn')}}</button>
+                                        <button v-if="(data_base || null) != null && (data_base.is_enable_cash || 0) == 1" class="item round cr-main bg-white br-main text-size wh-auto" type="default" hover-class="none" data-value="/pages/plugins/wallet/cash-auth/cash-auth" @tap="url_event">{{$t('user.user.8752a4')}}</button>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </scroll-view>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNavBack from '@/components/nav-back/nav-back';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentWalletLog from '../components/wallet-log/wallet-log';
+    import componentUserRecharge from '../components/user-recharge/user-recharge';
+    import componentUserCash from '../components/user-cash/user-cash';
+    import componentTransfer from '../components/transfer/transfer';
+    var wallet_static_url = app.globalData.get_static_url('wallet', true) + 'app/';
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
+    // #endif
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                wallet_static_url: wallet_static_url,
+                theme_color: app.globalData.get_theme_color(),
+                status_bar_height: bar_height,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                bottom_fixed_style: '',
+                data_base: null,
+                user_wallet: null,
+                nav_list: [],
+                submit_disabled_status: false,
+                // 是否显示价格
+                is_price_show: false,
+                // 账户明细
+                params: null,
+                current: 0,
+                propPullDownRefresh: false,
+                scroll_lower_bool: false,
+                payment_page_url: null,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNavBack,
+            componentNoData,
+            componentBottomLine,
+            componentWalletLog,
+            componentUserRecharge,
+            componentUserCash,
+            componentTransfer,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 是否指定状态
+            if ((params.type || null) != null) {
+                this.setData({
+                    params: params,
+                    current: Number(params.type),
+                });
+            }
+
+            var ck = app.globalData.data.cache_page_pay_key;
+            var pay_data = uni.getStorageSync(ck) || null;
+            if (pay_data !== null) {
+                uni.removeStorageSync(ck);
+                this.setData({
+                    current: pay_data.type || 0,
+                });
+                setTimeout(() => {
+                    app.globalData.update_query_string_parameter([{ key: 'type', value: pay_data.type }]);
+                }, 200);
+            }
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+            this.setData({
+                propPullDownRefresh: !this.propPullDownRefresh,
+            });
+        },
+        methods: {
+            init(e) {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'user', 'wallet'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_base: data.base || null,
+                                user_wallet: data.user_wallet || null,
+                                nav_list: data.nav_list || [],
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: false,
+                            });
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+            price_change() {
+                this.setData({
+                    is_price_show: !this.is_price_show,
+                });
+            },
+            // 明细导航切换
+            nav_change(e) {
+                this.setData({
+                    current: e.currentTarget.dataset.index || 0,
+                });
+                app.globalData.update_query_string_parameter([{ key: 'type', value: e.currentTarget.dataset.index }]);
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.setData({
+                    scroll_lower_bool: !this.scroll_lower_bool,
+                });
+            },
+
+            // 支付成功回调
+            pay_success_event() {
+                this.get_data();
+            },
+
+            // 页面滚动监听
+            scroll_event(e) {
+                uni.$emit('onPageScroll', e.detail);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+        },
+    };
+</script>
+<style>
+    @import './user.css';
+</style>
diff --git a/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.vue b/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.vue
new file mode 100644
index 0000000..f3b257d
--- /dev/null
+++ b/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.vue
@@ -0,0 +1,138 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="detail != null">
+            <view class="padding-horizontal-main padding-top-main">
+                <view v-if="detail_list.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="panel-content oh">
+                        <view v-for="(item, index) in detail_list" :key="index" class="item br-b-dashed oh padding-vertical-main flex-row align-c">
+                            <view class="padding-right-main cr-grey divider-r-f5">{{ item.name }}</view>
+                            <view class="padding-left-main">{{ item.value }}</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                detail: null,
+                detail_list: [],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('detail', 'walletlog', 'wallet'),
+                    method: 'POST',
+                    data: {
+                        id: this.params.id,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                detail: data.data,
+                                detail_list: [
+                                    { name: this.$t('invoice.invoice.l3832z'), value: data.data.business_type_name || '' },
+                                    { name: this.$t('wallet-log-detail.wallet-log-detail.tdf3wo'), value: data.data.operation_type_name || '' },
+                                    { name: this.$t('wallet-log-detail.wallet-log-detail.744os7'), value: data.data.money_type_name || '' },
+                                    { name: this.$t('wallet-log-detail.wallet-log-detail.ruq60b'), value: data.data.operation_money || '' },
+                                    { name: this.$t('wallet-log-detail.wallet-log-detail.4q7pfq'), value: data.data.original_money || '' },
+                                    { name: this.$t('wallet-log-detail.wallet-log-detail.r814ne'), value: data.data.latest_money || '' },
+                                    { name: this.$t('wallet-log-detail.wallet-log-detail.0ghn6g'), value: data.data.msg || '' },
+                                    { name: this.$t('wallet-log-detail.wallet-log-detail.i2kze7'), value: data.data.add_time || '' },
+                                ],
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: '',
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'init')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+        },
+    };
+</script>
+<style></style>
diff --git a/pages/plugins/weixinliveplayer/detail/detail.css b/pages/plugins/weixinliveplayer/detail/detail.css
new file mode 100644
index 0000000..185afbf
--- /dev/null
+++ b/pages/plugins/weixinliveplayer/detail/detail.css
@@ -0,0 +1,49 @@
+/**
+* 内容
+*/
+.base .item .item-icon {
+    width: 35rpx;
+    height: 35rpx !important;
+}
+
+.base .item .status {
+    color: #999;
+}
+
+.base .item .status-0 {
+    color: #0e90d2;
+}
+
+.base .item .status-1 {
+    color: #5eb95e;
+}
+
+.base .item .status-2 {
+    color: #F37B1D;
+}
+
+/**
+* 导航
+*/
+.nav button image {
+    width: 32rpx;
+    height: 32rpx !important;
+}
+
+.nav button.share-friend-submit,
+.nav button.share-poster-submit {
+    width: calc(30% - 20rpx);
+}
+
+.nav button.share-friend-submit {
+    background: #1bad18;
+}
+
+.nav button.share-poster-submit {
+    background: #6367f0;
+}
+
+.nav button.player-submit {
+    width: calc(40% - 40rpx);
+    background: #d2364c;
+}
\ No newline at end of file
diff --git a/pages/plugins/weixinliveplayer/detail/detail.vue b/pages/plugins/weixinliveplayer/detail/detail.vue
new file mode 100644
index 0000000..c6ae801
--- /dev/null
+++ b/pages/plugins/weixinliveplayer/detail/detail.vue
@@ -0,0 +1,282 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="detail != null" class="page-bottom-fixed">
+            <!-- 封面图片 -->
+            <image v-if="(detail || null) != null && (detail.share_img || null) != null" class="banner wh-auto dis-block" :src="detail.share_img" mode="widthFix" @tap="detail_images_view_event" :data-value="detail.share_img"></image>
+
+            <!-- 标题 -->
+            <view class="text-size fw-b padding-main">{{ detail.name }}</view>
+
+            <!-- 基础信息 -->
+            <view class="padding-horizontal-main">
+                <view class="base padding-horizontal-main border-radius-main bg-white oh pr">
+                    <view class="item padding-vertical-main flex-row jc-sb">
+                        <view>
+                            <image class="item-icon va-m margin-right-sm" :src="static_url + 'detail-status-icon.png'" mode="widthFix"></image>
+                            <text class="cr-grey va-m">{{$t('detail.detail.4u64dg')}}</text>
+                        </view>
+                        <view :class="'status status-' + detail.status">{{ detail.status_name }}</view>
+                    </view>
+                    <view class="item padding-vertical-main br-t oh flex-row jc-sb">
+                        <view class="">
+                            <image class="item-icon va-m margin-right-sm" :src="static_url + 'detail-time-icon.png'" mode="widthFix"></image>
+                            <text class="cr-grey va-m">{{$t('detail.detail.y2639j')}}</text>
+                        </view>
+                        <view class="flex-row flex-nowrap align-c flex-1 flex-width cr-grey-9 single-text padding-left-main"> {{ detail.start_time }} - {{ detail.end_time }} </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 导航 -->
+            <view class="nav pf pa-w left-0 right-0 bottom-0 wh-auto">
+                <view class="padding-main flex-row jc-sb">
+                    <button class="share-friend-submit cr-white text-size-sm round" type="default" hover-class="none" @tap="share_event">
+                        <image class="item-icon va-m margin-right-sm" :src="static_url + 'nav-share-friend-icon.png'" mode="widthFix"></image>
+                        <text class="va-m">{{$t('common.share')}}</text>
+                    </button>
+                    <button class="share-poster-submit cr-white text-size-sm round" type="default" hover-class="none" @tap="share_poster_event">
+                        <image class="item-icon va-m margin-right-sm" :src="static_url + 'nav-share-poster-icon.png'" mode="widthFix"></image>
+                        <text class="va-m">{{$t('detail.detail.fa8h7j')}}</text>
+                    </button>
+                    <button class="player-submit cr-white text-size-sm round" type="default" hover-class="none" @tap="player_event">
+                        <image class="item-icon va-m margin-right-sm" :src="static_url + 'nav-player-icon.png'" mode="widthFix"></image>
+                        <text class="va-m">{{$t('detail.detail.eg25j9')}}</text>
+                    </button>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+
+            <!-- 分享 -->
+            <component-share-popup ref="share"></component-share-popup>
+        </view>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentSharePopup from '@/components/share-popup/share-popup';
+
+    var static_url = app.globalData.get_static_url('weixinliveplayer', true);
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                static_url: static_url + 'app/',
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                detail: null,
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentSharePopup
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('detail', 'search', 'weixinliveplayer'),
+                    method: 'POST',
+                    data: {
+                        id: this.params.id,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                detail: data.data || null,
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: '',
+                            });
+
+                            if ((this.detail || null) != null) {
+                                // 基础自定义分享
+                                this.setData({
+                                    share_info: {
+                                        title: this.detail.seo_title || this.detail.name,
+                                        desc: this.detail.seo_desc,
+                                        path: '/pages/plugins/weixinliveplayer/detail/detail',
+                                        query: 'id=' + this.detail.id,
+                                        img: this.detail.share_img,
+                                    },
+                                });
+
+                                // 标题
+                                uni.setNavigationBarTitle({
+                                    title: this.detail.name,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+
+                        // 分享菜单处理
+                        app.globalData.page_share_handle(this.share_info);
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 详情图片查看
+            detail_images_view_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value != null) {
+                    uni.previewImage({
+                        current: value,
+                        urls: [value],
+                    });
+                }
+            },
+
+            // 进入直播
+            player_event(e) {
+                // 打开直播参数
+                var params = encodeURIComponent(
+                    JSON.stringify({
+                        type: 'detail',
+                    })
+                );
+                var url = `plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=${this.detail.roomid}&custom_params=${params}`;
+
+                // #ifdef APP
+                // APP则直接打开微信小程序直播
+                var weixin_original_id = app.globalData.get_config('config.common_app_mini_weixin_share_original_id', null);
+                if(weixin_original_id != null) {
+                    plus.share.getServices(res => {
+                        let sweixin = null;
+                        for(let i in res) {
+                            if(res[i].id == 'weixin') {
+                                sweixin = res[i];
+                            }
+                        }
+                        //唤醒微信小程序
+                        if(sweixin) {
+                            sweixin.launchMiniProgram({
+                                id: weixin_original_id,
+                                type: 0,
+                                path: url
+                            });
+                        } else {
+                            app.globalData.showToast(this.$t('detail.detail.86g7e1'));
+                        }
+                    });
+                }
+                return false;
+                // #endif
+
+                // #ifdef MP-WEIXIN
+                app.globalData.url_open(url);
+                return false;
+                // #endif
+
+                // 非微信环境和APP环境
+                app.globalData.showToast(this.$t('detail.detail.9d3o6w'));
+            },
+
+            // 海报分享
+            share_poster_event() {
+                uni.showLoading({
+                    title: this.$t('detail.detail.6xvl35'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('poster', 'index', 'weixinliveplayer'),
+                    method: 'POST',
+                    data: {
+                        id: this.detail.id,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            uni.previewImage({
+                                current: res.data.data,
+                                urls: [res.data.data],
+                            });
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 分享开启弹层
+            share_event(e) {
+                if ((this.$refs.share || null) != null) {
+                    this.$refs.share.init({
+                        share_info: this.share_info
+                    });
+                }
+            }
+        }
+    };
+</script>
+<style>
+    @import './detail.css';
+</style>
diff --git a/pages/plugins/weixinliveplayer/index/index.css b/pages/plugins/weixinliveplayer/index/index.css
new file mode 100644
index 0000000..6d7a720
--- /dev/null
+++ b/pages/plugins/weixinliveplayer/index/index.css
@@ -0,0 +1,93 @@
+/**
+ * 标题
+ */
+.player-title-icon {
+	width: 46rpx;
+	height: 44rpx;
+}
+
+/**
+* 数据列表
+*/
+.data-list .item image {
+	width: 208rpx;
+	height: 210rpx !important;
+}
+
+.live-content {
+	background: rgba(0, 0, 0, 0.2);
+	width: 40rpx;
+	height: 40rpx;
+	z-index: 1;
+}
+
+.live-action {
+	height: calc(100% - 20rpx);
+	padding: 10rpx 8rpx;
+}
+
+.live-1,
+.live-2,
+.live-3 {
+	width: 0;
+	border: 2rpx solid #fff;
+	height: 4rpx;
+	background-color: #fff;
+	border-radius: 6rpx 6rpx 0 0;
+}
+
+.live-1 {
+	animation: move 1s ease-in-out 0s infinite alternate;
+}
+
+.live-2 {
+	animation: move 1s ease-in-out 0.8s infinite alternate;
+}
+
+.live-3 {
+	animation: move 1s ease-in-out 0.4s infinite alternate;
+}
+
+@keyframes move {
+	0% {
+		height: 4rpx;
+	}
+
+	50% {
+		height: 20rpx;
+	}
+
+	100% {
+		height: 10rpx;
+	}
+}
+
+.data-list .item .expire {
+	opacity: 0.7;
+}
+
+.data-list .item .base {
+	padding: 24rpx 24rpx 24rpx 16rpx;
+}
+
+.data-list .ite .status-0 {
+	color: #FFCACA;
+}
+
+.data-list .item .status-1 {
+	color: #FF6E51;
+}
+
+.data-list .item .status-2 {
+	color: #999999;
+}
+
+.data-list .item .status-3 {
+	color: #DDDDDD;
+}
+
+.data-list .item .status-4,
+.data-list .item .status-5,
+.data-list .item .status-6 {
+	color: #DDDDDD;
+}
\ No newline at end of file
diff --git a/pages/plugins/weixinliveplayer/index/index.vue b/pages/plugins/weixinliveplayer/index/index.vue
new file mode 100644
index 0000000..ab56414
--- /dev/null
+++ b/pages/plugins/weixinliveplayer/index/index.vue
@@ -0,0 +1,209 @@
+<template>
+    <view :class="theme_view">
+		<!-- 轮播 -->
+		<block v-if="banner_list.length > 0">
+			<component-banner :propData="banner_list" propMode="round" propRadius=""></component-banner>
+		</block>
+
+		<view class="spacing-mt" v-if="data_list.length > 0">
+			<view class="padding-horizontal-main">
+				<!-- 导航 -->
+				<view class="spacing-nav-title flex-row jc-sb align-c">
+					<view class="flex-row align-c">
+						<image :src="weixinliveplayer_static_url + 'player-title-icon.png'" mode="scaleToFill" class="player-title-icon margin-right-xs"></image>
+						<text class="text-wrapper">{{$t('index.index.63g4m1')}}</text>
+					</view>
+					<text data-value="/pages/plugins/weixinliveplayer/search/search" @tap="url_event" class="arrow-right padding-right cr-grey text-size-xs cp">{{$t('common.more')}}</text>
+				</view>
+
+				<!-- 数据列表 -->
+				<view class="data-list">
+					<view v-for="(item, index) in data_list" :key="index" class="item border-radius-main bg-white oh pr spacing-mb">
+						<view class="flex-row jc-sb cp" :class="Number(item.status) > 3 ? 'expire' : '' " :data-value="'/pages/plugins/weixinliveplayer/detail/detail?id=' + item.id" @tap="url_event">
+							<!-- <view class="pr"> -->
+							<image class="radius" :src="item.share_img" mode="aspectFill"></image>
+							<view v-if="item.status==='1'" class="pa bottom-0 left-0 live-content circle">
+								<view class="live-action flex-row jc-sa align-e">
+									<view class="live-1"></view>
+									<view class="live-2"></view>
+									<view class="live-3"></view>
+								</view>
+							</view>
+							<!-- </view> -->
+							<view class="base flex-1 flex-width flex-col jc-sb">
+								<view>
+									<view class="single-text text-size-md fw-b">{{item.name}}</view>
+									<view class="margin-top-sm oh flex-row flex-nowrap align-c">
+										<iconfont name="icon-zhibo-time" color="#ccc" size="28rpx" class="margin-right-sm"></iconfont>
+										<view class="flex-row flex-nowrap align-c flex-1 flex-width cr-grey-9 single-text">
+											{{item.start_time}} - {{item.end_time}}
+										</view>
+									</view>
+								</view>
+								<view class="self-e text-size-xs cr-grey-9 flex-row align-c" :class="' status-' + item.status">
+									<!-- 未开始 -->
+									<iconfont v-if="item.status==='0'" name="icon-zhibo-time margin-right-xs pr top-xs"></iconfont>
+									<!-- 直播中 -->
+									<div v-else-if="item.status==='1'" class="spread margin-right-sm">
+										<div class="ring"></div>
+										<div class="ring"></div>
+										<div class="ring"></div>
+									</div>
+									<!-- 暂停中 -->
+									<iconfont v-else-if="item.status==='2'" name="icon-player-pause margin-right-xs pr top-xs"></iconfont>
+									<!-- 已结束 -->
+									<iconfont v-else-if="item.status==='3'" name="icon-player-end margin-right-xs pr top-xs"></iconfont>
+									<!-- 其他 -->
+									<iconfont v-else name="icon-zhibo-shixiao margin-right-xs pr top-xs"></iconfont>
+									{{item.status_name}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 结尾 -->
+			<component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+		</view>
+		<block v-else>
+			<!-- 提示信息 -->
+			<component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+		</block>
+
+		<!-- 公共 -->
+        <component-common ref="common"></component-common>
+	</view>
+</template>
+<script>
+	const app = getApp();
+	import componentCommon from '@/components/common/common';
+	import componentNoData from "@/components/no-data/no-data";
+	import componentBanner from "@/components/slider/slider";
+	import componentBottomLine from "@/components/bottom-line/bottom-line";
+	var weixinliveplayer_static_url = app.globalData.get_static_url('weixinliveplayer', true);
+
+	export default {
+		data() {
+			return {
+				theme_view: app.globalData.get_theme_value_view(),
+				weixinliveplayer_static_url: weixinliveplayer_static_url,
+				data_list_loding_status: 1,
+				data_bottom_line_status: false,
+				data_list_loding_msg: '',
+				data_list: [],
+				data_base: null,
+				banner_list: [],
+				// 自定义分享信息
+				share_info: {}
+			};
+		},
+
+		components: {
+			componentCommon,
+			componentNoData,
+			componentBanner,
+			componentBottomLine
+		},
+		
+		onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+		onShow() {
+			// 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+			this.init();
+
+			// 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+		},
+
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.init();
+		},
+
+		methods: {
+			init() {
+				// 获取数据
+				this.get_data_list();
+			},
+
+			// 获取数据
+			get_data_list() {
+				this.setData({
+					data_list_loding_status: 1
+				});
+				uni.request({
+					url: app.globalData.get_request_url("index", "index", "weixinliveplayer"),
+					method: 'POST',
+					data: {},
+					dataType: 'json',
+					success: res => {
+						uni.stopPullDownRefresh();
+						if (res.data.code == 0) {
+							var data = res.data.data;
+							var status = (data.data || null) == null || data.data.length == 0;
+							this.setData({
+								data_base: data.base || null,
+								banner_list: data.banner_list || [],
+								data_list: data.data,
+								data_list_loding_status: status ? 0 : 3,
+								data_bottom_line_status: !status
+							});
+
+							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/weixinliveplayer/index/index',
+										img: ((this.banner_list || null) != null && this.banner_list.length > 0) ? this.banner_list[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: true,
+								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: this.$t('common.internet_error_tips')
+						});
+					}
+				});
+			},
+
+			// url事件
+	        url_event(e) {
+	            app.globalData.url_event(e);
+	        }
+		}
+	};
+</script>
+<style>
+	@import './index.css';
+</style>
\ No newline at end of file
diff --git a/pages/plugins/weixinliveplayer/search/search.css b/pages/plugins/weixinliveplayer/search/search.css
new file mode 100644
index 0000000..1ec4bab
--- /dev/null
+++ b/pages/plugins/weixinliveplayer/search/search.css
@@ -0,0 +1,83 @@
+/*
+* 导航
+*/
+.nav {
+	height: 74rpx;
+	line-height: 74rpx;
+}
+
+.nav .item {
+	width: 20%;
+}
+
+/**
+* 数据列表
+*/
+.data-list .item image {
+	width: 208rpx;
+	height: 210rpx !important;
+}
+
+.live-content {
+	background: rgba(0, 0, 0, 0.2);
+	width: 40rpx;
+	height: 40rpx;
+	z-index: 1;
+}
+
+.live-action {
+	height: calc(100% - 20rpx);
+	padding: 10rpx 8rpx;
+}
+
+.live-1,
+.live-2,
+.live-3 {
+	width: 0;
+	border: 2rpx solid #fff;
+	height: 4rpx;
+	background-color: #fff;
+	border-radius: 6rpx 6rpx 0 0;
+}
+
+.live-1 {
+	animation: move 1s ease-in-out 0s infinite alternate;
+}
+
+.live-2 {
+	animation: move 1s ease-in-out 0.8s infinite alternate;
+}
+
+.live-3 {
+	animation: move 1s ease-in-out 0.4s infinite alternate;
+}
+
+.data-list .item .expire {
+	opacity: 0.7;
+}
+
+.data-list .item .base {
+	padding: 24rpx 24rpx 24rpx 16rpx;
+}
+
+.data-list .ite .status-0 {
+	color: #FFCACA;
+}
+
+.data-list .item .status-1 {
+	color: #FF6E51;
+}
+
+.data-list .item .status-2 {
+	color: #999999;
+}
+
+.data-list .item .status-3 {
+	color: #DDDDDD;
+}
+
+.data-list .item .status-4,
+.data-list .item .status-5,
+.data-list .item .status-6 {
+	color: #DDDDDD;
+}
\ No newline at end of file
diff --git a/pages/plugins/weixinliveplayer/search/search.vue b/pages/plugins/weixinliveplayer/search/search.vue
new file mode 100644
index 0000000..685d99f
--- /dev/null
+++ b/pages/plugins/weixinliveplayer/search/search.vue
@@ -0,0 +1,300 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav bg-white">
+            <block v-for="(item, index) in nav_status_list" :key="index">
+                <view :class="'item fl tc ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+            </block>
+        </view>
+
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="data-list padding-main">
+                <view v-for="(item, index) in data_list" :key="index" class="item border-radius-main bg-white oh pr spacing-mb">
+                    <view class="flex-row jc-sb cp" :class="Number(item.status) > 3 ? 'expire' : ''" :data-value="'/pages/plugins/weixinliveplayer/detail/detail?id=' + item.id" @tap="url_event">
+                        <image class="radius" :src="item.share_img" mode="aspectFill"></image>
+                        <view v-if="item.status === '1'" class="pa bottom-0 left-0 live-content circle">
+                            <view class="live-action flex-row jc-sa align-e">
+                                <view class="live-1"></view>
+                                <view class="live-2"></view>
+                                <view class="live-3"></view>
+                            </view>
+                        </view>
+                        <view class="base flex-1 flex-width flex-col jc-sb">
+                            <view>
+                                <view class="single-text text-size-md fw-b">{{ item.name }}</view>
+                                <view class="margin-top-sm oh flex-row flex-nowrap align-c">
+                                    <iconfont name="icon-zhibo-time" color="#ccc" size="28rpx" propClass="margin-right-sm"></iconfont>
+                                    <view class="flex-row flex-nowrap align-c flex-1 flex-width cr-grey-9 single-text"> {{ item.start_time }} - {{ item.end_time }} </view>
+                                </view>
+                            </view>
+                            <view class="self-e text-size-xs cr-grey-9 flex-row align-c" :class="'status-' + item.status"
+                                ><!-- 未开始 -->
+                                <iconfont v-if="item.status === '0'" name="icon-zhibo-time" propClass="margin-right-xs pr top-xs"></iconfont>
+                                <!-- 直播中 -->
+                                <div v-else-if="item.status === '1'" class="spread margin-right-sm">
+                                    <div class="ring"></div>
+                                    <div class="ring"></div>
+                                    <div class="ring"></div>
+                                </div>
+                                <!-- 暂停中 -->
+                                <iconfont v-else-if="item.status === '2'" name="icon-player-pause" propClass="margin-right-xs pr top-xs"></iconfont>
+                                <!-- 已结束 -->
+                                <iconfont v-else-if="item.status === '3'" name="icon-player-end" propClass="margin-right-xs pr top-xs"></iconfont>
+                                <!-- 其他 -->
+                                <iconfont v-else name="icon-zhibo-shixiao" propClass="margin-right-xs pr top-xs"></iconfont>
+                                {{ item.status_name }}
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                load_status: 0,
+                data_list: [],
+                data_base: null,
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                nav_status_list: [
+                    {
+                        name: this.$t('common.all'),
+                        value: "-1",
+                    },
+                    {
+                        name: this.$t('search.search.e415ir'),
+                        value: "0",
+                    },
+                    {
+                        name: this.$t('search.search.46g3i2'),
+                        value: "1",
+                    },
+                    {
+                        name: this.$t('search.search.v60305'),
+                        value: "2",
+                    },
+                    {
+                        name: this.$t('index.index.443683'),
+                        value: "3",
+                    },
+                ],
+                nav_status_index: 0,
+                // 自定义分享信息
+                share_info: {},
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 是否指定状态
+            var nav_status_index = 0;
+            if ((params.status || null) != null) {
+                for (var i in this.nav_status_list) {
+                    if (this.nav_status_list[i]["value"] == params.status) {
+                        nav_status_index = i;
+                        break;
+                    }
+                }
+            }
+            this.setData({
+                params: params,
+                nav_status_index: nav_status_index,
+            });
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            init() {
+                // 获取数据
+                this.get_data_list();
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                uni.showLoading({
+                    title: this.$t('common.loading_in_text'),
+                });
+
+                // 参数
+                var status = (this.nav_status_list[this.nav_status_index] || null) == null ? -1 : this.nav_status_list[this.nav_status_index]["value"];
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("index", "search", "weixinliveplayer"),
+                    method: "POST",
+                    data: {
+                        page: this.data_page,
+                        status: status,
+                        is_more: 1,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_base: res.data.data.base || null,
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+
+                                // 首次设置首次加载状态
+                                if (this.load_status == 0) {
+                                    // 基础自定义分享
+                                    this.setData({
+                                        load_status: 1,
+                                        share_info: {
+                                            title: this.data_base.seo_title || this.data_base.application_name,
+                                            desc: this.data_base.seo_desc,
+                                            path: "/pages/plugins/weixinliveplayer/search/search",
+                                            query: "status=" + this.nav_status_index,
+                                        },
+                                    });
+
+                                    // 分享菜单处理
+                                    app.globalData.page_share_handle(this.share_info);
+                                }
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_status_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import "./search.css";
+</style>
diff --git a/pages/setup/setup.css b/pages/setup/setup.css
new file mode 100644
index 0000000..41557f0
--- /dev/null
+++ b/pages/setup/setup.css
@@ -0,0 +1,19 @@
+.panel-item .item:not(:first-child) {
+    border-top: 1px solid #f5f5f5 !important;
+}
+.user-avatar {
+    width: 80rpx;
+    height: 80rpx !important;
+}
+
+/**
+ * 多语言
+ */
+.popup-language {
+    height: 100vh;
+}
+
+.popup-language .list {
+    height: calc(100vh - 95rpx);
+    overflow-y: auto;
+}
\ No newline at end of file
diff --git a/pages/setup/setup.vue b/pages/setup/setup.vue
new file mode 100644
index 0000000..baa5a86
--- /dev/null
+++ b/pages/setup/setup.vue
@@ -0,0 +1,336 @@
+<template>
+    <view :class="theme_view">
+        <view class="page padding-main">
+            <block v-if="(user || null) != null">
+                <view class="panel-item padding-horizontal-main border-radius-main bg-white oh spacing-mb">
+                    <view class="item padding-vertical-xxl padding-right-xxxl arrow-right oh" data-value="/pages/personal/personal" @tap="url_event">
+                        <image :src="user.avatar || default_avatar" mode="widthFix" class="circle br fl user-avatar"></image>
+                        <view class="fl margin-left margin-top">
+                            <view>{{ user.user_name_view || $t('login.login.6yfr9g') }}</view>
+                        </view>
+                    </view>
+
+                    <!-- 手机、邮箱、密码-->
+                    <view v-if="common_user_is_mandatory_bind_mobile == 1 || ((home_user_login_type || null) != null && home_user_login_type.length > 0 && home_user_login_type.indexOf('sms') != -1)" class="item padding-vertical-xxl padding-right-xxxl arrow-right" data-value="/pages/login/login?opt_form=bind_verify" @tap="url_event">
+                        <text>{{ $t('setup.setup.x81v6d') }}</text>
+                        <text class="fr cr-grey">{{ user.mobile_security || '' }} {{ (user.mobile_security || null) == null ? $t('setup.setup.dfg4wf') : $t('setup.setup.j6skqh') }}</text>
+                    </view>
+                    <view v-if="(home_user_login_type || null) != null && home_user_login_type.length > 0 && home_user_login_type.indexOf('email') != -1" class="item padding-vertical-xxl padding-right-xxxl arrow-right" data-value="/pages/login/login?opt_type=bind_email&opt_form=bind_email" @tap="url_event">
+                        <text>{{$t('setup.setup.5u59b1')}}</text>
+                        <text class="fr cr-grey">{{ user.email_security || '' }} {{ (user.email_security || null) == null ? $t('setup.setup.dfg4wf') : $t('setup.setup.j6skqh') }}</text>
+                    </view>
+                    <view class="item padding-vertical-xxl padding-right-xxxl arrow-right" data-value="/pages/password/password" @tap="url_event">
+                        <text>{{$t('setup.setup.v8438r')}}</text>
+                        <text class="fr cr-grey">{{ $t('setup.setup.j6skqh') }}</text>
+                    </view>
+
+                    <!-- 第三方账户绑定-->
+                    <!-- #ifdef APP || H5 -->
+                    <block v-if="(plugins_thirdpartylogin_data || null) != null">
+                        <block v-for="(item, index) in plugins_thirdpartylogin_data" :key="index">
+                            <block v-if="(item.bind_user_id || 0) == 0">
+                                <view class="item padding-vertical-xxl padding-right-xxxl arrow-right" :data-value="'/pages/login/login?opt_type=bind_platform&opt_form=bind_platform&platform_type='+index" @tap="url_event">
+                                    <text>{{item.name}}</text>
+                                    <text class="fr cr-grey">{{ $t('setup.setup.dfg4wf') }}</text>
+                                </view>
+                            </block>
+                            <block v-else>
+                                <view class="item padding-vertical-xxl padding-right-xxxl arrow-right" :data-value="item.bind_id" @tap="unbind_event">
+                                    <text>{{item.name}}</text>
+                                    <view class="fr">
+                                        <text class="cr-grey">{{item.bind_nickname}}</text>
+                                        <text class="cr-blue margin-left-sm">{{ $t('setup.setup.87ytgh') }}</text>
+                                    </view>
+                                </view>
+                            </block>
+                        </block>
+                    </block>
+                    <!-- #endif -->
+                    <view v-if="home_use_multilingual_status == 1" class="item padding-vertical-xxl padding-right-xxxl arrow-right" @tap="open_language_event">
+                        <text>{{ $t('setup.setup.r7jz13') }}</text>
+                        <text class="fr cr-grey">{{ language }}</text>
+                    </view>
+                </view>
+
+                <!-- 地址、发票-->
+                <view class="panel-item padding-horizontal-main border-radius-main bg-white oh spacing-mb">
+                    <view class="item padding-vertical-xxl padding-right-xxxl arrow-right" data-value="/pages/user-address/user-address" @tap="url_event">
+                        <text>{{ $t('setup.setup.42mba7') }}</text>
+                        <text class="fr cr-grey">{{ $t('setup.setup.5eltza') }}</text>
+                    </view>
+                    <view v-if="(plugins_invoice || null) != null" class="item padding-vertical-xxl padding-right-xxxl arrow-right" data-value="/pages/plugins/invoice/invoice/invoice" @tap="url_event">
+                        <text>{{ $t('setup.setup.t60222') }}</text>
+                        <text class="fr cr-grey">{{ $t('setup.setup.izg78g') }}</text>
+                    </view>
+                </view>
+            </block>
+
+            <!-- 权限管理、清除缓存、客服电话、账号注销 -->
+            <view class="panel-item padding-horizontal-main border-radius-main bg-white oh spacing-mb">
+                <!-- #ifdef MP || APP -->
+                <view class="item padding-vertical-xxl padding-right-xxxl arrow-right" @tap="open_setting_event">
+                    <text>{{ $t('setup.setup.377uwg') }}</text>
+                    <text class="fr cr-grey">{{ $t('setup.setup.5eltza') }}</text>
+                </view>
+                <!-- #endif -->
+                <view class="item padding-vertical-xxl padding-right-xxxl arrow-right" @tap="remove_user_cache_event">
+                    <text>{{ $t('setup.setup.5493ui') }}</text>
+                    <text class="fr cr-grey">{{ $t('setup.setup.f53166') }}</text>
+                </view>
+                <view v-if="(common_app_customer_service_tel || null) != null" class="item padding-vertical-xxl padding-right-xxxl arrow-right" @tap="call_event">
+                    <text>{{ $t('setup.setup.656fv1') }}</text>
+                    <text class="fr cr-grey">{{ common_app_customer_service_tel || '' }} {{ $t('setup.setup.f25wcx') }}</text>
+                </view>
+                <view v-if="(user || null) != null" class="item padding-vertical-xxl padding-right-xxxl arrow-right" data-value="/pages/logout/logout" @tap="url_event">
+                    <text>{{ $t('setup.setup.11k15d') }}</text>
+                    <text class="fr cr-grey">{{ $t('setup.setup.48r261') }}</text>
+                </view>
+                <view class="item padding-vertical-xxl padding-right-xxxl arrow-right" data-value="/pages/about/about" @tap="url_event">
+                    <text>{{ $t('setup.setup.tghrf2') }}</text>
+                </view>
+            </view>
+
+            <!-- 打开语言选择弹层-->
+            <component-popup :propShow="popup_language_status" propPosition="bottom" :propIsRadius="false" @onclose="popup_language_close_event">
+                <view class="popup-language">
+                    <view class="flex-row align-c jc-sb padding-main">
+                        <view @tap="popup_language_close_event">
+                            <iconfont name="icon-close-o" size="28rpx"></iconfont>
+                        </view>
+                        <view class="text-size" @tap="popup_sub_language_event">{{ $t('common.confirm') }}</view>
+                    </view>
+                    <view class="br-t-f5 padding-main list">
+                        <view v-for="(value, key) in language_list" :key="key" class="spacing-mb flex-row jc-sb align-c" :class="language_key == key ? 'cr-main' : ''" :data-key="key" :data-value="value" @tap="checked_language_event">
+                            {{ value }}
+                            <iconfont v-if="language_key == key" name="icon-checked" size="32rpx"></iconfont>
+                        </view>
+                    </view>
+                </view>
+            </component-popup>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentPopup from '@/components/popup/popup';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                default_avatar: app.globalData.data.default_user_head_src,
+                user: null,
+                common_app_customer_service_tel: null,
+                plugins_invoice: null,
+                home_user_login_type: [],
+                common_user_is_mandatory_bind_mobile: 0,
+
+                // 多语言
+                system_locale: '',
+                application_locale: '',
+                home_use_multilingual_status: 0,
+                // 语言选择
+                popup_language_status: false,
+                language_list: '',
+                language_key: '',
+                // 实际提交的语言字段
+                language: '',
+                
+                // 第三方登录插件
+                plugins_thirdpartylogin_data: null,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentPopup
+        },
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 多语言
+            let system_info = uni.getSystemInfoSync();
+            this.system_locale = system_info.language;
+            this.application_locale = app.globalData.get_language_value();
+            uni.onLocaleChange((e) => {
+                this.application_locale = e.locale;
+            });
+            var language_key = app.globalData.get_language_value();
+            var language_list = this.$t('language');
+            this.setData({
+                language_list: language_list,
+                language_key: language_key,
+                language: language_list[language_key],
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 初始化配置
+            app.globalData.init_config(0, this, 'init_config');
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        methods: {
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {                    
+                    this.setData({
+                        common_app_customer_service_tel: app.globalData.get_config('config.common_app_customer_service_tel'),
+                        home_use_multilingual_status: app.globalData.get_config('config.home_use_multilingual_status'),
+                        plugins_invoice: app.globalData.get_config('plugins_base.invoice', null),
+                        home_user_login_type: app.globalData.get_config('config.home_user_login_type'),
+                        common_user_is_mandatory_bind_mobile: app.globalData.get_config('config.common_user_is_mandatory_bind_mobile'),
+                        plugins_thirdpartylogin_data: app.globalData.get_config('plugins_thirdpartylogin_data') || null,
+                    });
+                    
+                    // 第三方登录
+                    // #ifdef APP
+                    if((this.plugins_thirdpartylogin_data || null) != null) {
+                        uni.getProvider({
+                            service: 'oauth',
+                            success: (result) => {
+                                // app第三方登录通道隔离
+                                var app_login_provider_list = result.provider || [];
+                                var thirdpartylogin = this.plugins_thirdpartylogin_data || {};
+                                if (Object.keys(thirdpartylogin).length) {
+                                    var temp_thirdpartylogin = Object.keys(thirdpartylogin).reduce((pre, cur) => {
+                                        if (this.app_login_provider_list.includes(cur)) {
+                                            pre[cur] = thirdpartylogin[cur];
+                                        }
+                                        return pre;
+                                    }, {});
+                                    this.setData({
+                                        plugins_thirdpartylogin_data: temp_thirdpartylogin,
+                                    });
+                                }
+                            },
+                            fail: (error) => {},
+                        });
+                    }
+                    // #endif
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 获取数据
+            init() {
+                var user = app.globalData.get_user_cache_info();
+                if (user != null) {
+                    this.setData({
+                        user: user
+                    });
+                }
+            },
+
+            // 解绑
+            unbind_event(e) {
+                uni.showLoading({
+                    title: this.$t('common.processing_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('unbind', 'index', 'thirdpartylogin'),
+                    method: 'POST',
+                    data: {id: e.currentTarget.dataset.value},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            app.globalData.showToast(res.data.msg, 'success');
+                            app.globalData.init_config(0, this, 'init_config');
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 打开权限管理中心
+            open_setting_event() {
+                app.globalData.open_setting_event();
+            },
+
+            // 客服电话
+            call_event() {
+                if (this.common_app_customer_service_tel == null) {
+                    app.globalData.showToast(this.$t('setup.setup.utnr7g'));
+                } else {
+                    app.globalData.call_tel(this.common_app_customer_service_tel);
+                }
+            },
+
+            // 清除缓存
+            remove_user_cache_event(e) {
+                app.globalData.remove_user_cache_event(false);
+            },
+
+            // 打开语言选择弹窗
+            open_language_event() {
+                this.setData({
+                    popup_language_status: !this.popup_language_status,
+                });
+            },
+
+            // 关闭语言弹窗
+            popup_language_close_event() {
+                this.setData({
+                    popup_language_status: false,
+                });
+            },
+
+            // 选择语言
+            checked_language_event(e) {
+                this.setData({
+                    language_key: e.currentTarget.dataset.key,
+                });
+            },
+
+            // 提交语言选择
+            popup_sub_language_event() {
+                this.language_change(this.language_key);
+                var language_list = this.$t('language');
+                this.setData({
+                    language_list: language_list,
+                    language: language_list[this.language_key],
+                    popup_language_status: false,
+                });
+                // 重新设置当前页面导航标题
+                app.globalData.set_pages_navigation_bar_title();
+                // 重新读取数据配置
+                app.globalData.init_config();
+            },
+
+            // 多语言切换
+            language_change(key) {
+                uni.setLocale(key);
+                this.$i18n.locale = key;
+            },
+        },
+    };
+</script>
+<style>
+    @import './setup.css';
+</style>
\ No newline at end of file
diff --git a/pages/user-address-save/user-address-save.css b/pages/user-address-save/user-address-save.css
new file mode 100644
index 0000000..2006c00
--- /dev/null
+++ b/pages/user-address-save/user-address-save.css
@@ -0,0 +1,159 @@
+/*
+* 表单
+*/
+.form-container .form-gorup .form-gorup-title {
+    width: 120rpx;
+    font-weight: 500;
+}
+
+/*
+* 三级联动
+*/
+.select-address {
+    box-sizing: border-box;
+    height: 70rpx;
+    line-height: 70rpx;
+    padding: 0 10rpx;
+}
+
+.select-address .section {
+    width: 33.33%;
+    box-sizing: border-box;
+}
+
+.select-address .section:not(:first-child) {
+    padding: 0 5rpx;
+}
+
+/**
+ * 地址信息
+ */
+.address-value {
+    padding-right: 110rpx;
+}
+
+.intelligent-identification .btn {
+    width: 96rpx;
+    height: 44rpx;
+    line-height: 44rpx;
+}
+
+/*
+* 身份信息
+*/
+.idcard-container .form-gorup-title {
+    width: 200rpx !important;
+}
+
+.idcard-container .form-upload-data .item .image {
+    width: 256rpx;
+    height: 170rpx;
+    border: 1px dashed #c2c2c2;
+}
+
+/**
+ * 地址编号搜索
+ */
+.code-search {
+    width: 220rpx;
+}
+
+.code-search .code-input {
+    width: 100% !important;
+    border-radius: 50rpx !important;
+    padding-right: 106rpx;
+}
+
+.code-search .code-input,
+.code-search .btn {
+    height: 50rpx !important;
+    min-height: 50rpx !important;
+    line-height: 48rpx !important;
+}
+
+.code-search .btn {
+    top: 0;
+    right: 0;
+    border-radius: 50rpx !important;
+    padding: 0 !important;
+    width: 100rpx !important;
+}
+
+/**
+ * 智能识别
+ */
+.intelligent-identification {
+    transition-property: height;
+    transition-duration: .3s;
+    will-change: height;
+}
+
+/**
+ * 别名
+ */
+.alias-title {
+    width: 100rpx;
+}
+
+.alias-btn {
+    width: 120rpx;
+    height: 48rpx;
+    line-height: 48rpx;
+    border-radius: 13px;
+    text-align: center;
+    margin-right: 24rpx;
+}
+
+.alias-add .input-alias {
+    height: 48rpx;
+    line-height: 48rpx;
+    width: 100% !important;
+    border-radius: 50rpx !important;
+    padding-left: 24rpx;
+    padding-right: 105rpx;
+}
+
+.alias-add .btn {
+    height: 48rpx !important;
+    min-height: 48rpx !important;
+    line-height: 48rpx !important;
+    top: 0;
+    right: 0;
+    border-radius: 50rpx !important;
+    padding: 0 !important;
+    width: 100rpx !important;
+}
+
+.alias-edit .btn {
+    margin: 0;
+    height: 48rpx !important;
+    min-height: 48rpx !important;
+    line-height: 48rpx !important;
+    padding: 0 24rpx;
+}
+
+.alias-edit .btn:first-child {
+    border-top-left-radius: 50rpx;
+    border-bottom-left-radius: 50rpx;
+}
+
+.alias-edit .btn:last-child {
+    border-top-right-radius: 50rpx;
+    border-bottom-right-radius: 50rpx;
+}
+
+.default-title {
+    width: 200rpx !important;
+}
+
+.label-edit-right {
+    padding-right: 130rpx;
+}
+
+/**
+ * 底部保存按钮
+ */
+.bottom-line-exclude .btn {
+    height: 88rpx;
+    line-height: 88rpx;
+}
\ No newline at end of file
diff --git a/pages/user-address-save/user-address-save.vue b/pages/user-address-save/user-address-save.vue
new file mode 100644
index 0000000..947a50c
--- /dev/null
+++ b/pages/user-address-save/user-address-save.vue
@@ -0,0 +1,861 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="data_list_loding_status === 3">
+            <form @submit="form_submit" class="form-container">
+                <view class="padding-main oh">
+                    <view class="border-radius-main bg-white spacing-mb oh">
+                        <view class="form-gorup">
+                            <view class="flex-row jc-sb align-c br-b-f5 padding-bottom-sm">
+                                <view class="form-gorup-title">{{$t('user-address-save.user-address-save.5yhgps')}}<text class="form-group-tips-must">*</text></view>
+                                <input type="text" name="name" :value="address_data.name || ''" maxlength="16" placeholder-class="cr-grey-9" class="cr-base flex-1 flex-width" :placeholder="$t('user-address-save.user-address-save.wii4sp')" />
+                            </view>
+                            <view class="flex-row jc-sb align-c padding-top-sm">
+                                <view class="form-gorup-title">{{$t('promotion-user.promotion-user.62c8m1')}}<text class="form-group-tips-must">*</text></view>
+                                <input type="text" name="tel" :value="address_data.tel || ''" maxlength="30" placeholder-class="cr-grey-9" class="cr-base flex-1 flex-width" :placeholder="$t('user-address-save.user-address-save.65507o')" />
+                            </view>
+                        </view>
+                    </view>
+
+                    <view class="border-radius-main bg-white spacing-mb oh">
+                        <view class="form-gorup">
+                            <view class="flex-row jc-sb br-b-f5 padding-vertical-sm pr">
+                                <view class="form-gorup-title">
+                                    <text>{{$t('user-address-save.user-address-save.h8f148')}}</text>
+                                    <text class="form-group-tips-must">*</text>
+                                </view>
+                                <view class="flex-1 flex-width flex-col">
+                                    <view v-if="home_user_address_map_status == 1" @tap="choose_user_location_event" class="flex-row jc-sb align-c">
+                                        <view v-if="home_user_address_map_status == 1" class="cr-main" @tap="choose_user_location_event">{{$t('user-address-save.user-address-save.13rpdw')}}</view>
+                                        <iconfont name="icon-xzdz-dingwei" size="28rpx"></iconfont>
+                                    </view>
+                                    <block v-if="is_user_address_forbid_choice_region == 0">
+                                        <view class="flex-row align-c" :class="home_user_address_map_status == 1 ? 'br-t-dashed padding-top-sm margin-top-sm' : ''">
+                                            <view class="flex-1 flex-width">
+                                                <view @tap="open_ragion" class="single-text">
+                                                    <text v-if="province_name"> {{ province_name }}{{ city_name ? '-' + city_name : '' }}{{ county_name ? '-' + county_name : '' }} </text>
+                                                    <text v-else class="cr-grey-9">{{$t('extraction-apply.extraction-apply.cy87k6')}}</text>
+                                                </view>
+                                                <component-region-picker :propProvinceId="province_id" :propCityId="city_id" :propCountyId="county_id" :propShow="region_picker_show" @onclose="close_event" @call-back="region_event"></component-region-picker>
+                                            </view>
+                                            <view class="code-search oh pr">
+                                                <input type="text" :value="address_data.address_last_code || ''" maxlength="30" placeholder-class="cr-grey-9" class="code-input cr-base dis-inline-block bg-base text-size-xs padding-left-sm va-m" :placeholder="$t('user-address-save.user-address-save.he685s')" @input="region_code_value_event" />
+                                                <button type="default" size="mini" class="btn bg-black br-black cr-white text-size-xs pa" @tap="region_code_event" :disabled="form_submit_disabled_status">{{$t('user-address-save.user-address-save.mb7cjx')}}</button>
+                                            </view>
+                                        </view>
+                                    </block>
+                                    <block v-else>
+                                        <view v-if="(address_data.province_name || null) != null" :class="home_user_address_map_status == 1 ? 'br-t-dashed padding-top-sm margin-top-sm' : ''">
+                                            {{ address_data.province_name }}{{ (address_data.city_name || null) === null ? '' : '-' + address_data.city_name }}{{ (address_data.county_name || null) === null ? '' : '-' + address_data.county_name }}
+                                        </view>
+                                    </block>
+                                </view>
+                            </view>
+                            <view class="flex-row jc-sb align-c br-b-f5 padding-vertical-sm">
+                                <view class="form-gorup-title">{{$t('user-address-save.user-address-save.4rc269')}}<text class="form-group-tips-must">*</text></view>
+                                <view class="flex-1 flex-width">
+                                    <input type="text" name="address" :value="address_data.address || ''" maxlength="80" placeholder-class="cr-grey-9" :class="'cr-base bs-bb ' + (home_user_address_map_status == 1 ? 'address-value' : '')" :placeholder="$t('user-address-save.user-address-save.vdkv32')" />
+                                </view>
+                            </view>
+                            <!-- 智能识别 -->
+                            <view v-if="is_user_address_discern == 1" class="pr padding-top-sm">
+                                <view class="intelligent-identification oh" :style="identfication_show ? 'height:254rpx;' : 'height:0;'">
+                                    <view class="bg-base border-radius-main padding-main oh">
+                                        <textarea @input="address_discern_value_event" :value="address_discern_value" class="margin-0" :placeholder="$t('user-address-save.user-address-save.b32r6v')" placeholder-class="cr-grey" />
+                                        <view class="padding-top-sm tr" :class="identfication_show ? '' : 'dis-none'">
+                                            <button type="default" size="mini" class="btn round cr-base text-size-xs margin-right-sm padding-0 tc" @tap="clear_discern_submit_event">{{$t('goods-search.goods-search.pxk051')}}</button>
+                                            <button type="default" size="mini" class="btn round bg-main cr-white text-size-xs padding-0 tc" @tap="address_discern_submit_event">{{$t('user-address-save.user-address-save.s3o1p5')}}</button>
+                                        </view>
+                                    </view>
+                                </view>
+                                <view class="tc padding-top-main" @tap="identfication_change">
+                                    <text class="padding-right-sm">{{$t('user-address-save.user-address-save.42l857')}}</text>
+                                    <iconfont :name="identfication_show ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="28rpx" color="#666"></iconfont>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+
+                    <view class="border-radius-main bg-white spacing-mb oh">
+                        <view class="form-gorup">
+                            <view class="flex-row br-b-f5 padding-top-sm padding-bottom-main">
+                                <view class="form-gorup-title padding-top-sm alias-title">{{$t('user-address-save.user-address-save.231435')}}</view>
+                                <view class="flex-1 flex-width">
+                                    <view class="flex-row">
+                                        <view v-for="(item, index) in alias_list" :key="index" class="alias-btn" :class="item === (address_data.alias || null) ? 'bg-main cr-white br-main' : 'bg-white cr-black br-grey-d'" :data-value="item" @tap="alias_change">{{ item }}</view>
+                                    </view>
+                                    <view class="padding-top-lg label-edit-right">
+                                        <view v-if="alias_eidt_bool" class="flex-row align-c alias-add pr">
+                                            <input type="text" v-model="alias_eidt_text" maxlength="16" placeholder-class="cr-grey-9" class="input-alias cr-base dis-inline-block bg-base text-size-xs padding-left-sm va-m" :placeholder="$t('user-address-save.user-address-save.l6vjlm')" />
+                                            <button type="default" size="mini" class="btn round cr-white text-size-xs pa" :class="(alias_eidt_text || null) !== null ? 'br-main bg-main' : 'bg-grey br-grey'" @tap="alias_add_submit_event">{{$t('index.index.7w75zb')}}</button>
+                                        </view>
+                                        <view v-else>
+                                            <view v-if="alias_eidt_text">
+                                                <view class="flex-row align-c alias-edit">
+                                                    <button type="default" size="mini" class="btn text-size-xs" :class="alias_eidt_text === (address_data.alias || '') ? 'bg-main cr-white br-main' : 'bg-white cr-black br-grey-d'" @tap="alias_checked_change">{{ alias_eidt_text }}</button>
+                                                    <button type="default" size="mini" class="btn bg-main-pair cr-white br-main-pair text-size-xs" @tap="alias_edit_submit_event">{{$t('common.edit')}}</button>
+                                                </view>
+                                            </view>
+                                            <view v-else class="alias-btn bg-white cr-black br-grey-d" @tap="alias_add">
+                                                <iconfont name="icon-xzdz-tianjiabiaoq" size="28rpx"></iconfont>
+                                            </view>
+                                        </view>
+                                        <input type="hidden" name="alias" :value="address_data.alias" class="dis-none"  />
+                                    </view>
+                                </view>
+                            </view>
+                            <view class="flex-row jc-sb align-c padding-top-main">
+                                <view class="form-gorup-title default-title">{{$t('user-address-save.user-address-save.g43klm')}}</view>
+                                <switch :color="theme_color" :checked="(address_data.is_default || 0) == 1 ? true : false" @change="default_ads_change_event" />
+                            </view>
+                        </view>
+                    </view>
+
+                    <!-- 身份证信息 -->
+                    <view v-if="home_user_address_idcard_status == 1" class="idcard-container border-radius-main bg-white oh">
+                        <view class="form-gorup">
+                            <view class="flex-row align-c br-b-f5 padding-vertical-sm">
+                                <view class="form-gorup-title">{{$t('user-address-save.user-address-save.3w7r14')}}<text class="form-group-tips-must">*</text></view>
+                                <input type="text" name="idcard_name" :value="address_data.idcard_name || ''" maxlength="16" placeholder-class="cr-grey-9" class="cr-base flex-1 flex-width" :placeholder="$t('user-address-save.user-address-save.c73v42')" />
+                            </view>
+                            <view class="flex-row align-c br-b-f5 padding-vertical-sm">
+                                <view class="form-gorup-title">{{$t('user-address-save.user-address-save.0y1vl6')}}<text class="form-group-tips-must">*</text></view>
+                                <input type="idcard" name="idcard_number" :value="address_data.idcard_number || ''" maxlength="18" placeholder-class="cr-grey-9" class="cr-base flex-1 flex-width" :placeholder="$t('user-address-save.user-address-save.c742c8')" />
+                            </view>
+                            <view class="flex-row align-c padding-vertical-sm margin-bottom-lg">
+                                <view class="form-gorup-title">{{$t('user-address-save.user-address-save.761ek6')}}<text class="form-group-tips-must">*</text></view>
+                                <view class="form-upload-data cr-grey-9 text-size-xs">{{$t('user-address-save.user-address-save.c811s5')}}</view>
+                            </view>
+                            <view class="flex-row align-c">
+                                <view class="flex-width-half oh padding-right-main pr">
+                                    <view v-if="(idcard_images_data.idcard_front || null) != null" class="pa top-0 right-0 z-i padding-right-main" @tap="upload_delete_event" data-value="idcard_front">
+                                        <iconfont name="icon-bjdz-guanbi" size="28rpx" color="cr-grey-d"></iconfont>
+                                    </view>
+                                    <image class="image wh-auto" :src="(idcard_images_data.idcard_front || null) != null ? idcard_images_data.idcard_front : common_static_url + 'idcard-front.jpg'" data-value="idcard_front" mode="widthFix" @tap="file_upload_event"></image>
+                                </view>
+                                <view class="flex-width-half oh padding-left-main pr">
+                                    <view v-if="(idcard_images_data.idcard_back || null) != null" class="pa top-0 right-0 z-i" @tap="upload_delete_event" data-value="idcard_back">
+                                        <iconfont name="icon-bjdz-guanbi" size="28rpx" color="cr-grey-d"></iconfont>
+                                    </view>
+                                    <image class="image wh-auto" :src="(idcard_images_data.idcard_back || null) != null ? idcard_images_data.idcard_back : common_static_url + 'idcard-back.jpg'" data-value="idcard_back" mode="widthFix" @tap="file_upload_event"></image>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+
+                    <view class="padding-vertical-main margin-top-sm spacing-mb">
+                        <view class="bottom-line-exclude oh">
+                            <button class="btn cr-white round text-size" type="default" form-type="submit" hover-class="none" :disabled="form_submit_disabled_status" :style="btn_bg_color">{{$t('common.save')}}</button>
+                            <button v-if="params && (params.id || null) !== null && params.id !== '0'" class="btn round bg-white cr-main br-main spacing-mt" type="default" @tap="address_delete_event" hover-class="none">{{$t('common.del')}}</button>
+                        </view>
+                    </view>
+                </view>
+            </form>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+        </view>
+
+        <!-- 位置选择 -->
+        <component-choice-location ref="choice_location" :propIsShowAddressChoice="false" @onBack="user_back_choice_location"></component-choice-location>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentRegionPicker from '@/components/region-picker/region-picker';
+    import componentChoiceLocation from '@/components/choice-location/choice-location';
+    var common_static_url = app.globalData.get_static_url('common');
+    const theme_color = app.globalData.get_theme_color();
+    const theme_color_light = app.globalData.get_theme_color(null, true);
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                theme_color: app.globalData.get_theme_color(),
+                params: {},
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                editor_path_type: '',
+                address_data: {},
+                // id
+                province_id: null,
+                city_id: null,
+                county_id: null,
+                // name
+                province_name: '',
+                city_name: '',
+                county_name: '',
+                idcard_images_data: {},
+                user_location: null,
+                address_discern_value: '',
+                form_submit_disabled_status: false,
+                region_code_value: '',
+                // 基础配置
+                home_user_address_map_status: 0,
+                home_user_address_idcard_status: 0,
+                is_user_address_discern: 0,
+                is_user_address_location_discern: 0,
+                is_user_address_forbid_choice_region: 0,
+                // 多列选择器
+                region_picker_show: false,
+                // 智能识别
+                identfication_show: false,
+                // 别名
+                alias_list: [this.$t('user-address-save.user-address-save.t1loj5'), this.$t('user-address-save.user-address-save.6t396c'), this.$t('user-address-save.user-address-save.34rqp8')],
+                alias_eidt_bool: false,
+                alias_eidt_text: '',
+                btn_bg_color: 'background:linear-gradient(107deg, ' + theme_color_light + ' 0%, ' + theme_color + ' 100%)',
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentRegionPicker,
+            componentChoiceLocation
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params || {},
+            });
+
+            // 设置标题
+            uni.setNavigationBarTitle({
+                title: this.$t('user-address-save.user-address-save.4rc269') + ((this.params.id || null) == null ? this.$t('invoice-saveinfo.invoice-saveinfo.004t56') : this.$t('common.edit')),
+            });
+
+            // 初始化配置
+            this.init_config();
+
+            // 清除位置缓存信息
+            this.choose_user_location_remove();
+
+            // 初始化
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 用户位置初始化
+            this.user_location_init();
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        methods: {
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    this.setData({
+                        home_user_address_map_status: app.globalData.get_config('config.home_user_address_map_status'),
+                        home_user_address_idcard_status: app.globalData.get_config('config.home_user_address_idcard_status'),
+                        is_user_address_discern: app.globalData.get_config('plugins_base.intellectstools.data.is_user_address_discern', 0),
+                        is_user_address_location_discern: app.globalData.get_config('plugins_base.intellectstools.data.is_user_address_location_discern', 0),
+                        is_user_address_forbid_choice_region: app.globalData.get_config('plugins_base.intellectstools.data.is_user_address_forbid_choice_region', 0),
+                        data_list_loding_status: 3,
+                    });
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 获取数据
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data();
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('detail', 'useraddress'),
+                    method: 'POST',
+                    data: {...this.params, ...{is_lang: 0}},
+                    dataType: 'json',
+                    success: (res) => {
+                        if (res.data.code == 0) {
+                            var data = res.data.data || null;
+                            var ads_data = data.data || null;
+                            var idcard_images = {
+                                idcard_front: ads_data == null ? '' : ads_data.idcard_front || '',
+                                idcard_back: ads_data == null ? '' : ads_data.idcard_back || '',
+                            };
+                            var alias = '';
+                            if (ads_data) {
+                                alias = ads_data.alias || '';
+                            }
+                            this.setData({
+                                address_data: ads_data || {},
+                                idcard_images_data: idcard_images,
+                                editor_path_type: data.editor_path_type || '',
+                                data_list_loding_status: 3,
+                            });
+                            if (this.alias_list.indexOf(alias) === -1) {
+                                this.setData({
+                                    alias_eidt_text: alias || '',
+                                });
+                            }
+
+                            // 数据设置
+                            if (ads_data != null) {
+                                this.setData({
+                                    province_id: ads_data.province || null,
+                                    city_id: ads_data.city || null,
+                                    county_id: ads_data.county || null,
+                                    city_name: ads_data.city_name || '',
+                                    province_name: ads_data.province_name || '',
+                                    county_name: ads_data.county_name || '',
+                                });
+
+                                // 地理位置
+                                var lng = ads_data.lng || 0;
+                                var lat = ads_data.lat || 0;
+                                if (lng != 0 && lat != 0) {
+                                    this.setData({
+                                        user_location: {
+                                            lng: lng,
+                                            lat: lat,
+                                            address: ads_data.address || '',
+                                        },
+                                    });
+                                }
+                            }
+                        } else {
+                            if (app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast(this.$t('user-address-save.user-address-save.2pey0m'));
+                    },
+                });
+            },
+
+            // 选择地理位置
+            choose_user_location_event(e) {
+                if ((this.$refs.choice_location || null) != null) {
+                    this.$refs.choice_location.choose_user_location();
+                }
+            },
+
+            // 清除位置缓存信息
+            choose_user_location_remove() {
+                app.globalData.choice_user_location_remove();
+            },
+
+            // 选择用户地理位置回调
+            user_back_choice_location(e) {
+                this.setData({
+                    user_location: e
+                });
+
+                // 是否开启地理位置选择后自动识别
+                if (this.user_location.status == 1 && this.is_user_address_location_discern == 1) {
+                    this.address_discern_handle(this.user_location, 0, 1);
+                }
+            },
+
+            // 地址信息初始化
+            user_location_init() {
+                this.setData({
+                    user_location: app.globalData.choice_user_location_init()
+                });
+
+                // 是否开启地理位置选择后自动识别
+                if (this.user_location.status == 1 && this.is_user_address_location_discern == 1) {
+                    this.address_discern_handle(this.user_location, 0, 1);
+                }
+            },
+
+            // 文件上传
+            file_upload_event(e) {
+                var form_name = e.currentTarget.dataset.value || null;
+                if (form_name == null) {
+                    app.globalData.showToast(this.$t('user-address-save.user-address-save.7w01kd'));
+                    return false;
+                }
+
+                var self = this;
+                uni.chooseImage({
+                    count: 1,
+                    success(res) {
+                        var success = 0;
+                        var fail = 0;
+                        var length = res.tempFilePaths.length;
+                        var count = 0;
+                        self.upload_one_by_one(res.tempFilePaths, success, fail, count, length, form_name);
+                    },
+                });
+            },
+
+            // 采用递归的方式上传多张
+            upload_one_by_one(img_paths, success, fail, count, length, form_name) {
+                var self = this;
+                uni.uploadFile({
+                    url: app.globalData.get_request_url('index', 'ueditor'),
+                    filePath: img_paths[count],
+                    name: 'upfile',
+                    formData: {
+                        action: 'uploadimage',
+                        path_type: self.editor_path_type,
+                    },
+                    success: function (res) {
+                        success++;
+                        if (res.statusCode == 200) {
+                            var data = typeof res.data == 'object' ? res.data : JSON.parse(res.data);
+                            if (data.code == 0 && (data.data.url || null) != null) {
+                                var temp_idcard_images_data = self.idcard_images_data || {};
+                                temp_idcard_images_data[form_name] = data.data.url;
+                                self.setData({
+                                    idcard_images_data: temp_idcard_images_data,
+                                });
+                            } else {
+                                app.globalData.showToast(data.msg);
+                            }
+                        }
+                    },
+                    fail: function (e) {
+                        fail++;
+                    },
+                    complete: function (e) {
+                        count++;
+                        // 下一张
+                        if (count >= length) {
+                            // 上传完毕，作一下提示
+                            //app.showToast('上传成功' + success +'张', 'success');
+                        } else {
+                            // 递归调用，上传下一张
+                            self.upload_one_by_one(img_paths, success, fail, count, length, form_name);
+                        }
+                    },
+                });
+            },
+
+            // 图片删除
+            upload_delete_event(e) {
+                var form_name = e.currentTarget.dataset.value || null;
+                if (form_name == null) {
+                    app.globalData.showToast(this.$t('user-address-save.user-address-save.7w01kd'));
+                    return false;
+                }
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('order.order.psi67g'),
+                    success(res) {
+                        if (res.confirm) {
+                            var temp_idcard_images_data = self.idcard_images_data || {};
+                            temp_idcard_images_data[form_name] = '';
+                            self.setData({
+                                idcard_images_data: temp_idcard_images_data,
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 默认地址设置改变
+            default_ads_change_event(e) {
+                var temp_ads = this.address_data;
+                temp_ads['is_default'] = (temp_ads.is_default || 0) == 1 ? 0 : 1;
+                this.setData({
+                    address_data: temp_ads,
+                });
+            },
+
+            // 地址信息识别输入事件
+            address_discern_value_event(e) {
+                this.setData({
+                    address_discern_value: e.detail.value,
+                });
+            },
+
+            // 地址信息识别确认事件
+            address_discern_submit_event(e) {
+                if ((this.address_discern_value || null) == null) {
+                    app.globalData.showToast(this.$t('user-address-save.user-address-save.z687lv'));
+                    return false;
+                }
+
+                // 地址识别处理
+                this.address_discern_handle({ address: this.address_discern_value }, 1, 0);
+            },
+            // 清除
+            clear_discern_submit_event() {
+                this.setData({
+                    address_discern_value: '',
+                });
+            },
+
+            // 地址识别处理
+            // data 地址信息
+            // is_user 是否解析用户信息（0, 1）
+            // type 0 用户输入地址信息识别, 1用户选择地理位置识别
+            address_discern_handle(data, is_user = 0, type = 0) {
+                data['is_user'] = is_user;
+                uni.showLoading({
+                    title: this.$t('common.processing_in_text'),
+                    mask: true,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('address', 'index', 'intellectstools'),
+                    method: 'POST',
+                    data: data,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            var temp_ads = this.address_data || {};
+                            var ads_data = res.data.data;
+                            var upd_data = {
+                                province_id: ads_data.province || null,
+                                city_id: ads_data.city || null,
+                                county_id: ads_data.county || null,
+                                city_name: ads_data.city_name || '',
+                                province_name: ads_data.province_name || '',
+                                county_name: ads_data.county_name || '',
+                            };
+                            // 地址赋值
+                            var arr = ['province', 'city', 'county', 'province_name', 'city_name', 'county_name', 'address', 'name', 'tel'];
+                            for (var i in arr) {
+                                if ((ads_data[arr[i]] || null) != null) {
+                                    temp_ads[arr[i]] = ads_data[arr[i]];
+                                }
+                            }
+
+                            // 用户手动识别操作
+                            // 识别成功后清除用户选择的地理位置信息、避免坐标与识别的地址不相符
+                            if (type == 0) {
+                                // 已有的地址坐标也清除
+                                temp_ads['lng'] = '';
+                                temp_ads['lat'] = '';
+                                // 已获取的数据置为null
+                                upd_data['user_location'] = null;
+                                // 清除位置缓存信息
+                                this.choose_user_location_remove();
+                            }
+                            upd_data['address_data'] = temp_ads;
+                            this.setData(upd_data);
+                        } else {
+                            if (app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            } else {
+                                app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 数据提交
+            form_submit(e) {
+                // 表单数据
+                var form_data = e.detail.value;
+                // 加入页面请求参数
+                form_data['params'] = this.params;
+
+                // 数据校验
+                var validation = [
+                    { fields: 'name', msg: this.$t('extraction-apply.extraction-apply.q15b4n') },
+                    { fields: 'tel', msg: this.$t('extraction-apply.extraction-apply.3or25c') },
+                    { fields: 'province', msg: this.$t('extraction-apply.extraction-apply.m99d2g') },
+                    { fields: 'city', msg: this.$t('extraction-apply.extraction-apply.03587o') },
+                    { fields: 'address', msg: this.$t('extraction-apply.extraction-apply.v1g617') },
+                ];
+
+                // 是否开启了地理位置选择
+                if (this.home_user_address_map_status == 1) {
+                    validation.push({ fields: 'lng', msg: this.$t('extraction-apply.extraction-apply.8831v6') });
+                    validation.push({ fields: 'lat', msg: this.$t('extraction-apply.extraction-apply.8831v6') });
+                }
+
+                // 是否开启了用户身份证信息
+                if (this.home_user_address_idcard_status == 1) {
+                    // 验证
+                    validation.push({ fields: 'idcard_name', msg: this.$t('user-address-save.user-address-save.lrlmxf') });
+                    validation.push({ fields: 'idcard_number', msg: this.$t('user-address-save.user-address-save.0x8i97') });
+                    validation.push({ fields: 'idcard_front', msg: this.$t('user-address-save.user-address-save.224l36') });
+                    validation.push({ fields: 'idcard_back', msg: this.$t('user-address-save.user-address-save.glf52g') });
+
+                    // 数据
+                    form_data['idcard_front'] = this.idcard_images_data.idcard_front || '';
+                    form_data['idcard_back'] = this.idcard_images_data.idcard_back || '';
+                }
+
+                form_data['province'] = this.province_id;
+                form_data['city'] = this.city_id;
+                form_data['county'] = this.county_id;
+                form_data['id'] = this.params.id || 0;
+
+                // 默认地址信息
+                var temp_ads = this.address_data || {};
+                form_data['is_default'] = temp_ads.is_default || 0;
+
+                // 地理位置
+                var lng = temp_ads.lng || 0;
+                var lat = temp_ads.lat || 0;
+                if ((this.user_location || null) != null) {
+                    lng = this.user_location.lng || 0;
+                    lat = this.user_location.lat || 0;
+                }
+                form_data['lng'] = lng;
+                form_data['lat'] = lat;
+
+                // 验证提交表单
+                if (app.globalData.fields_check(form_data, validation)) {
+                    // 数据保存
+                    this.setData({
+                        form_submit_disabled_status: true,
+                    });
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('save', 'useraddress'),
+                        method: 'POST',
+                        data: form_data,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                                this.back_prev_event();
+                            } else {
+                                this.setData({
+                                    form_submit_disabled_status: false,
+                                });
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            this.setData({
+                                form_submit_disabled_status: false,
+                            });
+                            uni.hideLoading();
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 地址编号输入事件
+            region_code_value_event(e) {
+                this.setData({
+                    region_code_value: e.detail.value,
+                });
+            },
+            // 地址编号搜索
+            region_code_event(e) {
+                if ((this.region_code_value || null) == null) {
+                    app.globalData.showToast(this.$t('user-address-save.user-address-save.wkfi45'));
+                    return false;
+                }
+                this.setData({
+                    form_submit_disabled_status: true,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('codedata', 'region'),
+                    method: 'POST',
+                    data: { code: this.region_code_value },
+                    dataType: 'json',
+                    success: (res) => {
+                        this.setData({
+                            form_submit_disabled_status: false,
+                        });
+                        if (res.data.code == 0) {
+                            app.globalData.showToast(res.data.msg, 'success');
+                            var ads = res.data.data;
+                            var province = ads.province || {};
+                            var city = ads.city || {};
+                            var county = ads.county || {};
+                            this.setData({
+                                province_id: province.id || null,
+                                city_id: city.id || null,
+                                county_id: county.id || null,
+                                province_name: province.name || null,
+                                city_name: city.name || null,
+                                county_name: county.name || null,
+                            });
+                            if (!this.province_id || !this.city_id) {
+                                this.setData({
+                                    region_picker_show: true,
+                                });
+                            }
+                        } else {
+                            if (app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            } else {
+                                app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                            }
+                        }
+                    },
+                    fail: () => {
+                        this.setData({
+                            form_submit_disabled_status: false,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+            open_ragion(e) {
+                this.setData({
+                    region_picker_show: true,
+                });
+            },
+            close_event(data) {
+                this.setData({
+                    region_picker_show: false,
+                });
+            },
+            region_event(address1, address2, address3) {
+                if((address1 || null) == null) {
+                    address1 = {};
+                }
+                if((address2 || null) == null) {
+                    address2 = {};
+                }
+                if((address3 || null) == null) {
+                    address3 = {};
+                }
+                this.setData({
+                    province_id: address1.id || null,
+                    city_id: address2.id || null,
+                    county_id: address3.id || null,
+                    province_name: address1.name || '',
+                    city_name: address2.name || '',
+                    county_name: address3.name || '',
+                });
+            },
+            // 地址粘贴板
+            identfication_change() {
+                this.setData({
+                    identfication_show: !this.identfication_show,
+                });
+            },
+            // 别名
+            alias_change(e) {
+                let val = e.currentTarget.dataset.value || null;
+                this.$set(this.address_data, 'alias', val);
+                this.setData({
+                    alias_eidt_bool: false,
+                });
+            },
+            // 新增别名选中
+            alias_checked_change() {
+                this.$set(this.address_data, 'alias', this.alias_eidt_text);
+            },
+            // 新增别名
+            alias_add(e) {
+                this.setData({
+                    alias_eidt_bool: true,
+                });
+            },
+            // 别名提交
+            alias_add_submit_event() {
+                this.setData({
+                    alias_eidt_bool: false,
+                });
+                this.$set(this.address_data, 'alias', this.alias_eidt_text);
+            },
+            // 别名编辑
+            alias_edit_submit_event() {
+                this.setData({
+                    alias_eidt_bool: true,
+                });
+            },
+            // 删除地址
+            address_delete_event() {
+                var value = this.params.id || null;
+                if (value == null) {
+                    app.globalData.showToast(this.$t('user-address-save.user-address-save.620370'));
+                    return false;
+                }
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('recommend-list.recommend-list.54d418'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('recommend-list.recommend-list.w9460o'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            // 加载loding
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text'),
+                            });
+
+                            // 获取数据
+                            uni.request({
+                                url: app.globalData.get_request_url('delete', 'useraddress'),
+                                method: 'POST',
+                                data: {
+                                    id: value,
+                                },
+                                dataType: 'json',
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        app.globalData.showToast(res.data.msg, 'success');
+                                        this.back_prev_event();
+                                    } else {
+                                        if (app.globalData.is_login_check(res.data)) {
+                                            app.globalData.showToast(res.data.msg);
+                                        } else {
+                                            app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                        }
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                });
+            },
+            back_prev_event() {
+                var pages = app.globalData.prev_page();
+                if (pages) {
+                    setTimeout(function () {
+                        uni.navigateBack();
+                    }, 1000);
+                } else {
+                    setTimeout(function () {
+                        app.globalData.url_open('/pages/user-address/user-address', true);
+                    }, 1000);
+                }
+            },
+        },
+    };
+</script>
+<style scoped>
+    @import './user-address-save.css';
+</style>
diff --git a/pages/user-address/user-address.css b/pages/user-address/user-address.css
new file mode 100644
index 0000000..ea1b323
--- /dev/null
+++ b/pages/user-address/user-address.css
@@ -0,0 +1,22 @@
+.default-address {
+    display: inline-block;
+    padding: 0 10rpx;
+    height: 32rpx;
+    line-height: 32rpx;
+    background: #FFEFC2;
+    color: #B77717;
+}
+
+.address-alias {
+    display: inline-block;
+    padding: 0 10rpx;
+    height: 32rpx;
+    line-height: 32rpx;
+}
+
+/**
+ * 底部按钮 
+ */
+.bottom-fixed .submit-list .btn {
+    width: calc(50% - 10rpx);
+}
\ No newline at end of file
diff --git a/pages/user-address/user-address.vue b/pages/user-address/user-address.vue
new file mode 100644
index 0000000..883cb8c
--- /dev/null
+++ b/pages/user-address/user-address.vue
@@ -0,0 +1,349 @@
+<template>
+    <view :class="theme_view">
+        <view class="page-bottom-fixed padding-main">
+            <view v-if="data_list.length > 0">
+                <view v-for="(item, index) in data_list" :key="index" class="item padding-vertical-xl padding-left-xl bg-white spacing-mb flex-row jc-sb align-c border-radius-main">
+                    <view class="flex-1 flex-width" @tap="address_conent_event" :data-index="index">
+                        <view class="flex-row align-c">
+                            <text v-if="is_default == item.id" class="default-address margin-right-sm text-size-xss border-radius-sm">{{$t('user-address.user-address.e8qg73')}}</text>
+                            <text v-if="(item.alias || null) != null" class="address-alias br-main cr-main margin-right-sm text-size-xss border-radius-sm">{{ item.alias }}</text>
+                            <view class="single-text flex-1 flex-width fw-b">
+                                <text>{{ item.province_name || '' }}{{ item.city_name || '' }}{{ item.county_name || '' }}{{ item.address || '' }}</text>
+                            </view>
+                        </view>
+                        <view class="flex-row align-c flex-wrap padding-top-main">
+                            <view class="padding-right-main">{{ item.name }}</view>
+                            <view class="cr-grey">{{ item.tel }}</view>
+                            <view v-if="(item.distance_value || null) != null && (item.distance_unit || null) != null" class="cr-grey text-size-xs flex-1 tr">{{$t('extraction-switch.extraction-switch.w94x36')}}{{ item.distance_value }}{{ item.distance_unit }}</view>
+                        </view>
+                    </view>
+                    <view class="padding-vertical-main padding-left-main padding-right-xl" @tap="address_edit_event" :data-index="index">
+                        <iconfont name="icon-wddz-bianji" size="24rpx"></iconfont>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </view>
+
+        <!-- 底部操作 -->
+        <view class="bottom-fixed">
+            <view class="bottom-line-exclude">
+                <block v-if="common_user_address_platform_import_list.length > 0 && common_user_address_platform_import_list.indexOf(client_value) != -1">
+                    <view class="flex-row jc-sb align-c gap-10">
+                        <button class="item cr-white round text-size wh-auto" type="default" hover-class="none" @tap="address_add_event" :style="btn_bg_color">{{$t('user-address.user-address.3i4x2r')}}</button>
+                        <button class="item br-main cr-main bg-white round text-size wh-auto" type="default" hover-class="none" @tap="choose_system_address_event">{{$t('user-address.user-address.1rwt3l')}}</button>
+                    </view>
+                </block>
+                <block v-else>
+                    <button class="item cr-white round text-size wh-auto" type="default" hover-class="none" @tap="address_add_event" :style="btn_bg_color">{{$t('user-address.user-address.3i4x2r')}}</button>
+                </block>
+            </view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    const theme_color = app.globalData.get_theme_color();
+    const theme_color_light = app.globalData.get_theme_color(null, true);
+    var common_static_url = app.globalData.get_static_url('common');
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: theme_color,
+                theme_color_light: theme_color_light,
+                btn_bg_color: 'background:linear-gradient(107deg, ' + theme_color_light + ' 0%, ' + theme_color + ' 100%)',
+                common_static_url: common_static_url,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                common_user_address_platform_import_list: [],
+                client_value: app.globalData.application_client_type(),
+                data_list: [],
+                params: null,
+                // 当前默认地址id
+                is_default: 0,
+                // 自动导入系统地址并选择
+                is_auto_import_system_address_choose: 0,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 异步初始化配置
+            this.init_config();
+
+            // 数据初始化
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data_list();
+        },
+
+        methods: {
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    this.setData({
+                        common_user_address_platform_import_list: app.globalData.get_config('config.common_user_address_platform_import_list', []),
+                    });
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 初始化
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据列表
+            get_data_list() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'useraddress'),
+                    method: 'POST',
+                    data: this.params,
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var data_list = data.data || [];
+                            if (data_list.length > 0) {
+                                // 获取当前默认地址
+                                var is_default = 0;
+                                for (var i in data_list) {
+                                    if (data_list[i]['is_default'] == 1) {
+                                        is_default = data_list[i]['id'];
+                                    }
+                                }
+
+                                // 设置数据
+                                this.setData({
+                                    data_list: data_list,
+                                    is_default: is_default,
+                                    data_list_loding_status: 3,
+                                    data_bottom_line_status: true,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list: [],
+                                    data_list_loding_status: 0,
+                                    data_bottom_line_status: false,
+                                });
+
+                                // 没有地址：当前不是选择地址自动返回模式下、是否下单选择地址、并且开启了系统地址选择则导入系统地址
+                                if(this.is_auto_import_system_address_choose == 0 && (this.params.is_back || 0) == 1 && this.common_user_address_platform_import_list.length > 0 && this.common_user_address_platform_import_list.indexOf(this.client_value) != -1) {
+                                    this.setData({
+                                        is_auto_import_system_address_choose: 1,
+                                    });
+                                    this.choose_system_address_event();
+                                }
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 地址内容事件
+            address_conent_event(e) {
+                // 基础数据
+                var index = e.currentTarget.dataset.index || 0;
+                var data = this.data_list[index];
+                // 地址选择存储缓存并返回
+                if ((this.params.is_back || 0) == 1) {
+                    // 地址状态是否禁用
+                    if(parseInt(data.address_disable_status || 0) == 1 && (data.address_disable_msg || null) != null) {
+                        app.globalData.showToast(data.address_disable_msg);
+                    } else {
+                        // 存储缓存并返回
+                        this.address_choose_cache_save_back(data);
+                    }
+                } else {
+                    // 点击复制地址
+                    var copy_val = this.$t('user-address.user-address.7r29v8') + data.name + '\n' + this.$t('user-address.user-address.2nmsi1') + data.tel + '\n' + this.$t('user-address.user-address.s150l6') + data.province_name + data.city_name + data.county_name + data.address;
+                    app.globalData.text_copy_event(copy_val);
+                }
+            },
+
+            // 地址选择存储并返回
+            address_choose_cache_save_back(address) {
+                uni.setStorage({
+                    key: app.globalData.data.cache_buy_user_address_select_key,
+                    data: address,
+                });
+                uni.navigateBack();
+            },
+
+            // 获取系统地址事件
+            choose_system_address_event(e) {
+                // 百度、头条则需要验证授权
+                // #ifdef MP-BAIDU || MP-TOUTIAO
+                // 去验证授权
+                if (e != 1) {
+                    app.globalData.auth_check(this, 'choose_system_address_event', 'scope.address');
+                    return false;
+                }
+                // #endif
+
+                // 获取地址授权信息
+                var self = this;
+                uni.chooseAddress({
+                    success(res) {
+                        var data = {
+                            name: res.userName || '',
+                            tel: res.telNumber || '',
+                            province: res.provinceName || '',
+                            city: res.cityName || '',
+                            county: res.countyName || '',
+                            address: res.detailInfo || '',
+                        };
+                        if((Object.values(data).join('') || null) != null) {
+                            uni.showLoading({
+                                title: self.$t('common.processing_in_text'),
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url('outsystemadd', 'useraddress'),
+                                method: 'POST',
+                                data: data,
+                                dataType: 'json',
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        // 是否自动选择地址并返回
+                                        if(self.is_auto_import_system_address_choose == 1) {
+                                            // 存储缓存并返回
+                                            self.address_choose_cache_save_back(res.data.data);
+                                        } else {
+                                            // 重新拉取列表数据
+                                            self.get_data_list();
+                                        }
+                                    } else {
+                                        if (app.globalData.is_login_check(res.data)) {
+                                            app.globalData.showToast(res.data.msg);
+                                        } else {
+                                            app.globalData.showToast(self.$t('common.sub_error_retry_tips'));
+                                        }
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(self.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 添加地址事件
+            address_add_event(e) {
+                var temp_params = this.params;
+                temp_params['id'] = 0;
+                var query = app.globalData.json_to_url_params(temp_params);
+                app.globalData.url_open('/pages/user-address-save/user-address-save?' + query);
+            },
+
+            // 地址编辑
+            address_edit_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var data = this.data_list[index] || null;
+                if (data == null) {
+                    app.globalData.showToast(this.$t('user-order-detail.user-order-detail.i876o3'));
+                    return false;
+                }
+
+                // 进入编辑页面
+                var temp_params = this.params;
+                temp_params['id'] = data.id;
+                var query = app.globalData.json_to_url_params(temp_params);
+                app.globalData.url_open('/pages/user-address-save/user-address-save?' + query);
+            },
+
+            // 地图查看
+            address_map_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var data = this.data_list[index] || null;
+                if (data == null) {
+                    app.globalData.showToast(this.$t('user-order-detail.user-order-detail.i876o3'));
+                    return false;
+                }
+
+                // 打开地图
+                var name = data.alias || data.name || '';
+                var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || '');
+                app.globalData.open_location(data.lng, data.lat, name, address);
+            },
+        },
+    };
+</script>
+<style>
+    @import './user-address.css';
+</style>
diff --git a/pages/user-favor/user-favor.css b/pages/user-favor/user-favor.css
new file mode 100644
index 0000000..3744111
--- /dev/null
+++ b/pages/user-favor/user-favor.css
@@ -0,0 +1,8 @@
+.goods-base {
+    min-height: 160rpx;
+    margin-left: 180rpx;
+}
+.goods-image {
+    width: 160rpx;
+    height: 160rpx;
+}
\ No newline at end of file
diff --git a/pages/user-favor/user-favor.vue b/pages/user-favor/user-favor.vue
new file mode 100644
index 0000000..b0162e8
--- /dev/null
+++ b/pages/user-favor/user-favor.vue
@@ -0,0 +1,329 @@
+<template>
+    <view :class="theme_view">
+        <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="padding-main border-radius-main oh bg-white pr spacing-mb">
+                    <view :data-value="item.goods_url" @tap="url_event" class="cp">
+                        <image class="goods-image fl radius" :src="item.images" mode="aspectFill"></image>
+                        <view class="goods-base">
+                            <view class="goods-title multi-text padding-right-xxxxl">{{item.title}}</view>
+                            <view class="oh margin-top-sm">
+                                <block v-if="(item.show_field_price_status || 0) == 1">
+                                    <text class="sales-price">{{item.show_price_symbol}}{{item.price}}</text>
+                                    <text class="cr-grey text-size-xs">{{item.show_price_unit}}</text>
+                                </block>
+                                <text v-if="(item.show_field_original_price_status || 0) == 1 && item.original_price > 0" class="original-price margin-left">{{item.show_price_symbol}}{{item.original_price}}{{item.show_original_price_unit}}</text>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="dis-inline-block pa top-xxxxl right-xxxxl" @tap="cancel_event" :data-value="item.goods_id" :data-index="index">
+                        <iconfont name="icon-ellipsis" size="40rpx" color="#999"></iconfont>
+                    </view>
+                    <view v-if="(item.is_error || 0) == 0" class="dis-inline-block pa right-xxxxl bottom-xxxxl" :data-index="index" @tap.stop="goods_cart_event">
+                        <iconfont name="icon-cart-inc" size="48rpx" :color="theme_color"></iconfont>
+                        <view class="pa top-0-xxxl right-xs">
+                            <component-badge :propNumber="item.user_cart_count || 0"></component-badge>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+
+            <!-- 商品购买 -->
+            <component-goods-buy ref="goods_buy" v-on:CartSuccessEvent="goods_cart_back_event"></component-goods-buy>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+    import componentBadge from '@/components/badge/badge';
+    import componentGoodsBuy from '@/components/goods-buy/goods-buy';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: app.globalData.get_theme_color(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                // 基础配置
+                currency_symbol: app.globalData.currency_symbol()
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentBadge,
+            componentGoodsBuy
+        },
+        
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 初始化配置
+            this.init_config();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+            
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1
+            });
+            this.get_data_list(1);
+        },
+
+        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');
+                }
+            },
+
+            // 获取数据
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+                
+                // 是否加载中
+                if(this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1
+                });
+                
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+                
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("index", "usergoodsfavor"),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page
+                    },
+                    dataType: 'json',
+                    success: res => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0
+                                });
+                                
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total)
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_is_loading: 0
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    }
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 取消
+            cancel_event(e) {
+                var self = this;
+                wx.showActionSheet({
+                    itemList: [self.$t('cart.cart.87rfg3')],
+                    success (res) {
+                        // 参数
+                        var id = e.currentTarget.dataset.value;
+                        var index = e.currentTarget.dataset.index;
+                        // 加载loding
+                        uni.showLoading({
+                            title: self.$t('common.processing_in_text')
+                        });
+                        uni.request({
+                            url: app.globalData.get_request_url("cancel", "usergoodsfavor"),
+                            method: 'POST',
+                            data: {
+                                id: id
+                            },
+                            dataType: 'json',
+                            success: res => {
+                                uni.hideLoading();
+                                if (res.data.code == 0) {
+                                    var temp_data_list = self.data_list;
+                                    temp_data_list.splice(index, 1);
+                                    self.setData({
+                                        data_list: temp_data_list
+                                    });
+                                    if (temp_data_list.length == 0) {
+                                        self.setData({
+                                            data_list_loding_status: 0,
+                                            data_bottom_line_status: false
+                                        });
+                                    }
+                                    app.globalData.showToast(res.data.msg, 'success');
+                                } else {
+                                    app.globalData.showToast(res.data.msg);
+                                }
+                            },
+                            fail: () => {
+                                uni.hideLoading();
+                                app.globalData.showToast(self.$t('common.internet_error_tips'));
+                            }
+                        });
+                    }
+                });
+            },
+            
+            // 加入购物车
+            goods_cart_event(e) {
+                if ((this.$refs.goods_buy || null) != null) {
+                    var index = e.currentTarget.dataset.index || 0;
+                    var goods = this.data_list[index];
+                        goods['id'] = goods.goods_id;
+                    this.$refs.goods_buy.init(
+                        goods,
+                        {
+                            buy_event_type: 'cart',
+                            is_direct_cart: 1,
+                        },
+                        {
+                            index: index,
+                            pos: e,
+                        }
+                    );
+                }
+            },
+
+            // 加入购物车成功回调
+            goods_cart_back_event(e) {
+                // 增加数量
+                var back = e.back_data;
+                var temp_data_list = this.data_list;
+                var goods = temp_data_list[back.index];
+                goods['user_cart_count'] = parseInt(goods['user_cart_count'] || 0) + parseInt(e.stock);
+                if (goods['user_cart_count'] > 99) {
+                    goods['user_cart_count'] = '99+';
+                }
+                temp_data_list[back.index] = goods;
+                this.setData({
+                    data_list: temp_data_list,
+                });
+                // 购物车导航角标
+                app.globalData.set_tab_bar_badge('cart', e.cart_number || 0);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        }
+    };
+</script>
+<style>
+    @import './user-favor.css';
+</style>
\ No newline at end of file
diff --git a/pages/user-goods-browse/user-goods-browse.css b/pages/user-goods-browse/user-goods-browse.css
new file mode 100644
index 0000000..3744111
--- /dev/null
+++ b/pages/user-goods-browse/user-goods-browse.css
@@ -0,0 +1,8 @@
+.goods-base {
+    min-height: 160rpx;
+    margin-left: 180rpx;
+}
+.goods-image {
+    width: 160rpx;
+    height: 160rpx;
+}
\ No newline at end of file
diff --git a/pages/user-goods-browse/user-goods-browse.vue b/pages/user-goods-browse/user-goods-browse.vue
new file mode 100644
index 0000000..dc8455f
--- /dev/null
+++ b/pages/user-goods-browse/user-goods-browse.vue
@@ -0,0 +1,364 @@
+<template>
+    <view :class="theme_view">
+        <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="padding-main border-radius-main oh bg-white pr spacing-mb">
+                    <view :data-value="item.goods_url" @tap="url_event" class="cp">
+                        <image class="goods-image fl radius" :src="item.images" mode="aspectFill"></image>
+                        <view class="goods-base">
+                            <view class="goods-title multi-text padding-right-xxxxl">{{item.title}}</view>
+                            <view class="oh margin-top-sm">
+                                <block v-if="(item.show_field_price_status || 0) == 1">
+                                    <text class="sales-price">{{item.show_price_symbol}}{{item.price}}</text>
+                                    <text class="cr-grey text-size-xs">{{item.show_price_unit}}</text>
+                                </block>
+                                <text v-if="(item.show_field_original_price_status || 0) == 1 && item.original_price > 0" class="original-price margin-left">{{item.show_price_symbol}}{{item.original_price}}{{item.show_original_price_unit}}</text>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="dis-inline-block pa top-xxxxl right-xxxxl" @tap="item_event" :data-value="item.id" :data-index="index">
+                        <iconfont name="icon-ellipsis" size="40rpx" color="#999"></iconfont>
+                    </view>
+                    <view v-if="(item.is_error || 0) == 0" class="dis-inline-block pa right-xxxxl bottom-xxxxl" :data-index="index" @tap.stop="goods_cart_event">
+                        <iconfont name="icon-cart-inc" size="48rpx" :color="theme_color"></iconfont>
+                        <view class="pa top-0-xxxl right-xs">
+                            <component-badge :propNumber="item.user_cart_count || 0"></component-badge>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+
+            <!-- 商品购买 -->
+            <component-goods-buy ref="goods_buy" v-on:CartSuccessEvent="goods_cart_back_event"></component-goods-buy>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+    import componentBadge from '@/components/badge/badge';
+    import componentGoodsBuy from '@/components/goods-buy/goods-buy';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: app.globalData.get_theme_color(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                // 基础配置
+                currency_symbol: app.globalData.currency_symbol()
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+            componentBadge,
+            componentGoodsBuy
+        },
+        
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+            
+            // 初始化配置
+            this.init_config();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+            
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1
+            });
+            this.get_data_list(1);
+        },
+
+        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');
+                }
+            },
+
+            // 获取数据
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+                
+                // 是否加载中
+                if(this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1
+                });
+                
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+                
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("index", "usergoodsbrowse"),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page
+                    },
+                    dataType: 'json',
+                    success: res => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0
+                                });
+                                
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total)
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_is_loading: 0
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    }
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 列表数据事件
+            item_event(e) {
+                var self = this;
+                wx.showActionSheet({
+                    itemList: [self.$t('cart.cart.8tt78i'), self.$t('common.del_record')],
+                    success (res) {
+                        var id = e.currentTarget.dataset.value;
+                        var index = e.currentTarget.dataset.index;
+                        if(res.tapIndex == 0) {
+                            self.goods_favor_handle(self, id, index);
+                        } else {
+                            self.goods_delete_handle(self, id, index);
+                        }
+                    }
+                });
+            },
+            
+            // 删除处理
+            goods_delete_handle(self, id, index, success_msg = null) {
+                uni.showLoading({
+                    title: self.$t('common.processing_in_text')
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("delete", "usergoodsbrowse"),
+                    method: 'POST',
+                    data: {
+                        ids: id
+                    },
+                    dataType: 'json',
+                    success: res => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            var temp_data_list = self.data_list;
+                            temp_data_list.splice(index, 1);
+                            self.setData({
+                                data_list: temp_data_list
+                            });
+                            if (temp_data_list.length == 0) {
+                                self.setData({
+                                    data_list_loding_status: 0,
+                                    data_bottom_line_status: false
+                                });
+                            }
+                            app.globalData.showToast(success_msg || res.data.msg, 'success');
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast(self.$t('common.internet_error_tips'));
+                    }
+                });
+            },
+
+            // 收藏操作
+            goods_favor_handle(self, id, index) {
+                uni.showLoading({
+                    title: self.$t('common.processing_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('favor', 'goods'),
+                    method: 'POST',
+                    data: {
+                        id: self.data_list[index]['goods_id'],
+                        is_mandatory_favor: 1
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            self.goods_delete_handle(self, id, index, res.data.msg);
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast(self.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 加入购物车
+            goods_cart_event(e) {
+                if ((this.$refs.goods_buy || null) != null) {
+                    var index = e.currentTarget.dataset.index || 0;
+                    var goods = this.data_list[index];
+                        goods['id'] = goods.goods_id;
+                    this.$refs.goods_buy.init(
+                        goods,
+                        {
+                            buy_event_type: 'cart',
+                            is_direct_cart: 1,
+                        },
+                        {
+                            index: index,
+                            pos: e,
+                        }
+                    );
+                }
+            },
+
+            // 加入购物车成功回调
+            goods_cart_back_event(e) {
+                // 增加数量
+                var back = e.back_data;
+                var temp_data_list = this.data_list;
+                var goods = temp_data_list[back.index];
+                goods['user_cart_count'] = parseInt(goods['user_cart_count'] || 0) + parseInt(e.stock);
+                if (goods['user_cart_count'] > 99) {
+                    goods['user_cart_count'] = '99+';
+                }
+                temp_data_list[back.index] = goods;
+                this.setData({
+                    data_list: temp_data_list,
+                });
+                // 购物车导航角标
+                app.globalData.set_tab_bar_badge('cart', e.cart_number || 0);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        }
+    };
+</script>
+<style>
+    @import './user-goods-browse.css';
+</style>
\ No newline at end of file
diff --git a/pages/user-goods-comments-form/user-goods-comments-form.css b/pages/user-goods-comments-form/user-goods-comments-form.css
new file mode 100644
index 0000000..6e9119e
--- /dev/null
+++ b/pages/user-goods-comments-form/user-goods-comments-form.css
@@ -0,0 +1,11 @@
+.avatar {
+    width: 80rpx;
+    height: 80rpx;
+}
+.input-height {
+    min-height: 200rpx;
+}
+.sub-btn .btn {
+    height: 88rpx;
+    line-height: 88rpx;
+}
\ No newline at end of file
diff --git a/pages/user-goods-comments-form/user-goods-comments-form.vue b/pages/user-goods-comments-form/user-goods-comments-form.vue
new file mode 100644
index 0000000..51fd871
--- /dev/null
+++ b/pages/user-goods-comments-form/user-goods-comments-form.vue
@@ -0,0 +1,223 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="goods_id" class="padding-main">
+            <form v-if="data_list_loding_status == 3" @submit="formSubmit" class="form-container">
+                <view class="bg-white border-radius-main padding-main flex-row align-c spacing-mb">
+                    <image v-if="goods_images" class="avatar dis-block margin-right-xs br-f5 padding-xs radius" :src="goods_images" mode="aspectFit"></image>
+                    <view class="flex-1 flex-width flex-row align-c">
+                        <view class="margin-right-sm">{{ $t('goods-comments.goods-comments.31ees6') }}</view>
+                        <uni-rate :value="rate_value" @change="rate_change_event" />
+                    </view>
+                </view>
+                <view class="bg-white border-radius-main padding-main">
+                    <textarea name="content" @input="text_input_event" maxlength="230" :value="content" auto-height :placeholder="$t('goods-comments.goods-comments.6p942c')" placeholder-class="cr-grey-9" class="wh-auto input-height" />
+                    <view class="tr text-size-xs cr-grey-c">{{ text_num }}/230</view>
+                    <view class="tr">
+                        <checkbox-group @change="is_anonymous_change_event">
+                            <label class="cr-grey-9 text-size-xs">
+                                <checkbox :value="is_anonymous" :checked="is_anonymous === '1' ? true : false" :color="theme_color" style="transform: scale(0.5)" />
+                                <text class="pr top-xs">{{ $t('form.form.2f52v3') }}</text>
+                            </label>
+                        </checkbox-group>
+                    </view>
+                </view>
+                <view class="sub-btn margin-top-xxxxl">
+                    <button class="btn bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">{{ $t('form.form.4yd066') }}</button>
+                </view>
+            </form>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data propStatus="0"></component-no-data>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: app.globalData.get_theme_color(),
+                goods_images: '',
+                rate_value: 0,
+                goods_id: '',
+                is_anonymous: '0',
+                content: '',
+                text_num: 0,
+                data_list_loding_status: 1,
+                data_list_loding_msg: this.$t('form.form.bniyyt'),
+                form_submit_loading: false,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            if (params !== null && params.id) {
+                this.setData({
+                    goods_id: params.id,
+                });
+                this.get_data_list();
+            }
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        // 页面销毁时执行
+        onUnload: function () {},
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user == false) {
+                    // 提示错误
+                    this.setData({
+                        data_list_loding_status: 2,
+                        data_list_loding_msg: this.$t('form.form.8l3ul5'),
+                    });
+                }
+            },
+            get_data_list() {
+                uni.request({
+                    url: app.globalData.get_request_url('detail', 'usergoodscomments'),
+                    method: 'POST',
+                    data: { id: this.goods_id },
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        var data = res.data.data || null;
+                        if (res.data.code == 0 && data !== null) {
+                            this.setData({
+                                goods_images: (data.goods || null) !== null ? data.goods.images : '',
+                                rate_value: data.rating || '',
+                                content: data.content || '',
+                                text_num: data.content ? data.content.length : 0,
+                                is_anonymous: data.is_anonymous,
+                                data_list_loding_status: 3,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                            });
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 表单提交
+            formSubmit(e) {
+                // 数据验证
+                var validation = [
+                    { fields: 'rating', msg: this.$t('goods-comments.goods-comments.pe5p52') },
+                    { fields: 'content', msg: this.$t('goods-comments.goods-comments.1wut9j') },
+                ];
+                var validate = {
+                    rating: this.rate_value,
+                    content: e.detail.value.content,
+                };
+                if (app.globalData.fields_check(validate, validation)) {
+                    uni.showLoading({
+                        title: this.$t('buy.buy.r79t77'),
+                    });
+                    this.setData({
+                        form_submit_loading: true,
+                    });
+                    var newData = {
+                        id: this.goods_id,
+                        is_anonymous: this.is_anonymous,
+                        ...validate,
+                    };
+                    // 网络请求
+                    uni.request({
+                        url: app.globalData.get_request_url('save', 'usergoodscomments'),
+                        method: 'POST',
+                        data: newData,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                                setTimeout(function () {
+                                    app.globalData.page_back_prev_event();
+                                }, 2000);
+                            } else {
+                                this.setData({
+                                    form_submit_loading: false,
+                                });
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_loading: false,
+                            });
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+            text_input_event(e) {
+                this.setData({
+                    text_num: e.detail.cursor,
+                });
+            },
+            rate_change_event(e) {
+                this.setData({
+                    rate_value: e.value,
+                });
+            },
+            is_anonymous_change_event(e) {
+                this.setData({
+                    is_anonymous: e.detail.value.length > 0 ? e.detail.value[0] : 0,
+                });
+            },
+        },
+    };
+</script>
+<style>
+    @import './user-goods-comments-form.css';
+</style>
diff --git a/pages/user-goods-comments/user-goods-comments.css b/pages/user-goods-comments/user-goods-comments.css
new file mode 100644
index 0000000..274603e
--- /dev/null
+++ b/pages/user-goods-comments/user-goods-comments.css
@@ -0,0 +1,4 @@
+.goods-img {
+    width: 40rpx;
+    height: 40rpx;
+}
\ No newline at end of file
diff --git a/pages/user-goods-comments/user-goods-comments.vue b/pages/user-goods-comments/user-goods-comments.vue
new file mode 100644
index 0000000..c6c26ef
--- /dev/null
+++ b/pages/user-goods-comments/user-goods-comments.vue
@@ -0,0 +1,280 @@
+<template>
+    <view :class="theme_view">
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
+                    <view class="base oh br-b padding-bottom-main">
+                        <text class="cr-base">{{ item.add_time_time }}</text>
+                        <text class="fr">{{ item.rating_text }}</text>
+                    </view>
+                    <view class="content margin-top">
+                        <view v-if="(item.goods || null) !== null" :data-value="item.goods.goods_url" @tap="url_event">
+                            <view class="margin-top-xs flex-row align-c">
+                                <view class="cr-grey margin-right-xl">{{$t('user-order-detail.user-order-detail.7f8p26')}}</view>
+                                <view class="cr-base flex-1 flex-width flex-row align-c">
+                                    <image class="br radius margin-right-sm goods-img" :src="item.goods.images" mode="aspectFit"></image>
+                                    <text class="single-text flex-1 flex-width">{{ item.goods.title }}</text>
+                                </view>
+                            </view>
+                        </view>
+                        <block v-for="(fv, fi) in content_list" :key="fi">
+                            <view class="margin-top-xs flex-row align-c">
+                                <view class="cr-grey margin-right-xl">{{ fv.name }}</view>
+                                <view class="cr-base flex-1 flex-width ">{{ item[fv.field] || '' }}</view>
+                            </view>
+                        </block>
+                    </view>
+                    <view class="item-operation tr br-t padding-top-main margin-top-main">
+                        <button :data-value="'/pages/user-goods-comments-form/user-goods-comments-form?id=' + item.id" @tap="url_event" class="round bg-white br-main cr-main margin-left-lg" type="default" size="mini" hover-class="none">{{ $t('common.edit') }}</button>
+                        <button class="round bg-white br-red cr-red margin-left-lg" type="default" size="mini" hover-class="none" @tap="delete_event" :data-index="index">{{ $t('common.del') }}</button>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                params: null,
+                content_list: [
+                    { name: this.$t('user-goods-comments.user-goods-comments.58804r'), field: 'is_show_text' },
+                    { name: this.$t('user-goods-comments.user-goods-comments.jnk6da'), field: 'is_reply_text' },
+                    { name: this.$t('user-goods-comments.user-goods-comments.yyjemb'), field: 'is_anonymous_text' },
+                    { name: this.$t('user-goods-comments.user-goods-comments.0nhrj0'), field: 'content' },
+                    { name: this.$t('user-detail.user-detail.u411r2'), field: 'reply' },
+                    { name: this.$t('user-detail.user-detail.teo6qd'), field: 'reply_time_time' },
+                ],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 先解绑自定义事件
+            uni.$off('refresh');
+
+            // 初始数据
+            this.init();
+            // 监听自定义事件并进行页面刷新操作
+            uni.$on('refresh', (data) => {
+                // 重新请求数据
+                this.init();
+            });
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    // 获取数据
+                    this.setData({
+                        data_page: 1,
+                    });
+                    this.get_data_list(1);
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 参数
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'usergoodscomments'),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page,
+                        is_more: 1,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 删除数据
+            delete_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var temp_data = this.data_list;
+                var data = temp_data[index] || null;
+                if (data == null) {
+                    app.globalData.showToast(this.$t('extraction-switch.extraction-switch.613b58'));
+                    return false;
+                }
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('recommend-list.recommend-list.54d418'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('recommend-list.recommend-list.w9460o'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text'),
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url('delete', 'usergoodscomments'),
+                                method: 'POST',
+                                data: { ids: data.id },
+                                dataType: 'json',
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        temp_data.splice(index, 1);
+                                        this.setData({
+                                            data_list: temp_data,
+                                        });
+                                        app.globalData.showToast(res.data.msg, 'success');
+                                    } else {
+                                        app.globalData.showToast(res.data.msg);
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import './user-goods-comments.css';
+</style>
diff --git a/pages/user-integral/user-integral.css b/pages/user-integral/user-integral.css
new file mode 100644
index 0000000..dc4f967
--- /dev/null
+++ b/pages/user-integral/user-integral.css
@@ -0,0 +1,8 @@
+.points-integral .list {
+    border-bottom: 2rpx solid #eee;
+    padding: 30rpx 0;
+}
+
+.points-integral .list:last-of-type {
+    border: 0;
+}
\ No newline at end of file
diff --git a/pages/user-integral/user-integral.vue b/pages/user-integral/user-integral.vue
new file mode 100644
index 0000000..8437b2d
--- /dev/null
+++ b/pages/user-integral/user-integral.vue
@@ -0,0 +1,191 @@
+<template>
+    <view :class="theme_view">
+        <view class="padding-main">
+            <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+                <view v-if="data_list.length > 0" class="padding-horizontal-main points-integral bg-white border-radius-main">
+                    <view v-for="(item,index) in data_list" class="list" :key="index">
+                        <view class="flex-row jc-sb align-c">
+                            <view class="cr-grey-9">{{$t('index.index.srd2ch')}}<text class="cr-black fw-b padding-left-sm">{{item.original_integral}}</text>
+                                <text class="padding-horizontal-sm">/</text>{{$t('goods-category.goods-category.5p4ksj')}}<text class="cr-black fw-b padding-left-sm">{{item.new_integral}}</text>
+                            </view>
+                            <view class="cr-grey-9">{{item.add_time_time}}</view>
+                        </view>
+                        <view class="flex-row jc-sb align-c margin-top-main">
+                            <view>{{item.msg}}</view>
+                            <view class="cr-main text-size fw-b" :class="item.type == 1 ? 'cr-green' : 'cr-red'">{{item.type == 1 ? '+' : '-'}} {{item.operation_integral}}</view>
+                        </view>
+                    </view>
+                </view>
+                <view v-else>
+                    <!-- 提示信息 -->
+                    <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+                </view>
+
+                <!-- 结尾 -->
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            </scroll-view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false
+            };
+        },
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine
+        },
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1
+            });
+            this.get_data_list(1);
+        },
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false
+                    });
+                }
+            },
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1
+                });
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("index", "userintegral"),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page
+                    },
+                    dataType: 'json',
+                    success: res => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0
+                                });
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total)
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_is_loading: 0
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    }
+                });
+            },
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            }
+        }
+    };
+</script>
+<style>
+    @import './user-integral.css';
+</style>
\ No newline at end of file
diff --git a/pages/user-order-comments/user-order-comments.css b/pages/user-order-comments/user-order-comments.css
new file mode 100644
index 0000000..f3c1e6b
--- /dev/null
+++ b/pages/user-order-comments/user-order-comments.css
@@ -0,0 +1,21 @@
+.goods-image {
+    width: 80rpx;
+    height: 80rpx;
+}
+.item-base .xingxing-icon {
+    width: 60rpx;
+    height: 60rpx;
+    margin: 0 15rpx;
+}
+.form-content textarea {
+    height: 160rpx !important;
+    min-height: 160rpx !important;
+}
+.form-container-upload .form-upload-data image {
+    width: 100rpx;
+    height: 100rpx;
+}
+.form-container-upload .upload-icon {
+    width: 110rpx;
+    height: 110rpx;
+}
\ No newline at end of file
diff --git a/pages/user-order-comments/user-order-comments.vue b/pages/user-order-comments/user-order-comments.vue
new file mode 100644
index 0000000..0f99100
--- /dev/null
+++ b/pages/user-order-comments/user-order-comments.vue
@@ -0,0 +1,421 @@
+<template>
+    <view :class="theme_view">
+        <view class="padding-main">
+            <view v-if="detail != null">
+                <form @submit="form_submit" class="form-container">
+                    <view v-for="(item, index) in detail.items" :key="index" class="form-gorup oh">
+                        <view class="oh">
+                            <view :data-value="item.goods_url" @tap="url_event" class="cp">
+                                <image class="goods-image fl radius br margin-right-sm" :src="item.images" mode="aspectFill"></image>
+                            </view>
+                            <view class="item-base fl margin-top-sm">
+                                <block v-for="(tv, ti) in [1, 2, 3, 4, 5]" :key="ti">
+                                    <image class="xingxing-icon va-m" :src="common_static_url + 'stars' + (form_rating_list[index] != undefined && form_rating_list[index] >= tv ? '-active' : '') + '-icon.png'" mode="aspectFill" @tap="rating_event" :data-index="index" :data-value="tv"></image>
+                                </block>
+                                <text v-if="form_rating_list[index] != undefined" class="cr-grey va-m margin-left-xs">{{ rating_msg[form_rating_list[index] - 1] }}</text>
+                            </view>
+                        </view>
+                        <view class="margin-top-main br-t">
+                            <textarea @input="form_content_event" :data-index="index" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('user-order-comments.user-order-comments.r9r3h0')" maxlength="230"></textarea>
+                            <view class="form-container-upload">
+                                <view class="form-upload-data oh">
+                                    <block v-if="(form_images_list[index] || null) != null && form_images_list[index].length > 0">
+                                        <view v-for="(iv, ix) in form_images_list[index]" :key="ix" class="item fl">
+                                            <text class="delete-icon" @tap="upload_delete_event" :data-index="index" :data-ix="ix">x</text>
+                                            <image :src="iv" @tap="upload_show_event" :data-index="index" :data-ix="ix" mode="aspectFill" class="padding-xs dis-block"></image>
+                                        </view>
+                                    </block>
+                                    <image v-if="(form_images_list[index] || null) == null || form_images_list[index].length < 3" class="item fl upload-icon" :src="common_static_url + 'upload-icon.png'" mode="aspectFill" @tap="file_upload_event" :data-index="index"></image>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+
+                    <view class="form-gorup anonymous">
+                        <switch class="va-m" name="is_anonymous" @change="anonymous_event"></switch>
+                        <text class="cr-base va-m">{{$t('user-order-comments.user-order-comments.uboc44')}}</text>
+                        <text class="fr cr-grey margin-top-sm">{{ anonymous_msg_list[anonymous_value] }}</text>
+                    </view>
+
+                    <view class="form-gorup form-gorup-submit">
+                        <button form-type="submit" class="bg-main br-main cr-white round text-size" type="default" hover-class="none" :disabled="form_button_disabled">{{$t('form.form.4yd066')}}</button>
+                    </view>
+                </form>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </view>
+        </view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    var common_static_url = app.globalData.get_static_url("common");
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                params: null,
+                detail: null,
+                editor_path_type: "",
+                rating_msg: [this.$t('user-order-comments.user-order-comments.si255j'), this.$t('user-order-comments.user-order-comments.42b0x1'), this.$t('user-order-comments.user-order-comments.72mov3'), this.$t('user-order-comments.user-order-comments.16cmv6'), this.$t('user-order-comments.user-order-comments.e4i88f')],
+                anonymous_value: 0,
+                anonymous_msg_list: [this.$t('user-order-comments.user-order-comments.021i2d'), this.$t('user-order-comments.user-order-comments.h2ci83')],
+                form_rating_list: [],
+                form_images_list: [],
+                form_content_list: [],
+                form_button_disabled: false,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("comments", "order"),
+                    method: "POST",
+                    data: {
+                        id: this.params.id,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                editor_path_type: data.editor_path_type || "",
+                                detail: data.data,
+                                data_list_loding_status: 3,
+                                data_list_loding_msg: "",
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "init")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 上传图片预览
+            upload_show_event(e) {
+                var index = e.currentTarget.dataset.index;
+                var ix = e.currentTarget.dataset.ix;
+                uni.previewImage({
+                    current: this.form_images_list[index][ix],
+                    urls: this.form_images_list[index],
+                });
+            },
+
+            // 图片删除
+            upload_delete_event(e) {
+                var index = e.currentTarget.dataset.index;
+                var ix = e.currentTarget.dataset.ix;
+                var self = this;
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('order.order.psi67g'),
+                    success(res) {
+                        if (res.confirm) {
+                            var list = self.form_images_list;
+                            list[index].splice(ix, 1);
+                            self.setData({
+                                form_images_list: list,
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 文件上传
+            file_upload_event(e) {
+                // 数据初始化
+                var index = e.currentTarget.dataset.index;
+                var temp_list = this.form_images_list;
+                var length = this.detail.items.length;
+                for (var i = 0; i < length; i++) {
+                    if (temp_list[i] == undefined) {
+                        temp_list[i] = [];
+                    }
+                }
+                this.setData({
+                    form_images_list: temp_list,
+                });
+
+                // 处理上传文件
+                var self = this;
+                uni.chooseImage({
+                    count: 3,
+                    success(res) {
+                        var success = 0;
+                        var fail = 0;
+                        var length = res.tempFilePaths.length;
+                        var count = 0;
+                        self.upload_one_by_one(index, res.tempFilePaths, success, fail, count, length);
+                    },
+                });
+            },
+
+            // 采用递归的方式上传多张
+            upload_one_by_one(index, img_paths, success, fail, count, length) {
+                var self = this;
+                if ((self.form_images_list[index] || null) == null || self.form_images_list[index].length < 3) {
+                    uni.uploadFile({
+                        url: app.globalData.get_request_url("index", "ueditor"),
+                        filePath: img_paths[count],
+                        name: "upfile",
+                        formData: {
+                            action: "uploadimage",
+                            path_type: self.editor_path_type,
+                        },
+                        success: function (res) {
+                            success++;
+                            if (res.statusCode == 200) {
+                                var data = typeof res.data == "object" ? res.data : JSON.parse(res.data);
+                                if (data.code == 0 && (data.data.url || null) != null) {
+                                    var list = self.form_images_list;
+                                    if ((list[index] || null) == null) {
+                                        list[index] = [];
+                                    }
+                                    list[index].push(data.data.url);
+                                    self.setData({
+                                        form_images_list: list,
+                                    });
+                                } else {
+                                    app.globalData.showToast(data.msg);
+                                }
+                            }
+                        },
+                        fail: function (e) {
+                            fail++;
+                        },
+                        complete: function (e) {
+                            count++;
+
+                            // 下一张
+                            if (count >= length) {
+                                // 上传完毕，作一下提示
+                                //app.showToast('上传成功' + success +'张', 'success');
+                            } else {
+                                // 递归调用，上传下一张
+                                self.upload_one_by_one(index, img_paths, success, fail, count, length);
+                            }
+                        },
+                    });
+                }
+            },
+
+            // 是否匿名事件
+            anonymous_event(e) {
+                this.setData({
+                    anonymous_value: e.detail.value == true ? 1 : 0,
+                });
+            },
+
+            // 评分事件
+            rating_event(e) {
+                // 参数
+                var index = e.currentTarget.dataset.index;
+                var value = e.currentTarget.dataset.value;
+
+                // 数据初始化/赋值
+                var temp_list = this.form_rating_list;
+                var length = this.detail.items.length;
+                for (var i = 0; i < length; i++) {
+                    if (index == i) {
+                        temp_list[i] = value;
+                    }
+                }
+                this.setData({
+                    form_rating_list: temp_list,
+                });
+            },
+
+            // 评论内容
+            form_content_event(e) {
+                // 参数
+                var index = e.currentTarget.dataset.index;
+                var value = e.detail.value;
+
+                // 数据初始化/赋值
+                var temp_list = this.form_content_list;
+                var length = this.detail.items.length;
+                for (var i = 0; i < length; i++) {
+                    if (temp_list[i] == undefined) {
+                        temp_list[i] = "";
+                    }
+                    if (index == i) {
+                        temp_list[i] = value;
+                    }
+                }
+                this.setData({
+                    form_content_list: temp_list,
+                });
+            },
+
+            // 表单
+            form_submit(e) {
+                // 商品数量
+                var length = this.detail.items.length;
+
+                // 评分校验
+                var count = this.form_rating_list.length;
+                if (count < length) {
+                    app.globalData.showToast(this.$t('user-order-comments.user-order-comments.34ne4c'));
+                    return false;
+                }
+                var max = Math.max.apply(null, this.form_rating_list);
+                var min = Math.min.apply(null, this.form_rating_list);
+
+                if (min < 1 || max > 5) {
+                    app.globalData.showToast(this.$t('user-order-comments.user-order-comments.x6fwbf'));
+                    return false;
+                }
+
+                // 内容校验
+                var count = this.form_content_list.length;
+                if (count < length) {
+                    app.globalData.showToast(this.$t('user-order-comments.user-order-comments.8f303u'));
+                    return false;
+                }
+
+                for (var i in this.form_content_list) {
+                    var count = this.form_content_list[i].length;
+                    if (count < 6 || count > 230) {
+                        app.globalData.showToast(this.$t('user-order-comments.user-order-comments.39y6ym'));
+                        return false;
+                    }
+                }
+
+                // 图片校验
+                if (this.form_images_list.length > 0) {
+                    for (var i in this.form_images_list) {
+                        if (this.form_images_list[i].length > 3) {
+                            app.globalData.showToast(this.$t('user-order-comments.user-order-comments.488j15'));
+                            return false;
+                        }
+                    }
+                }
+
+                // 表单数据
+                var form_data = e.detail.value;
+                form_data["is_anonymous"] = form_data["is_anonymous"] == true ? 1 : 0;
+                form_data["id"] = this.detail.id;
+                form_data["goods_id"] = JSON.stringify(
+                    this.detail.items.map(function (v) {
+                        return v.goods_id;
+                    })
+                );
+                form_data["rating"] = JSON.stringify(this.form_rating_list);
+                form_data["content"] = JSON.stringify(this.form_content_list);
+                form_data["images"] = this.form_images_list.length > 0 ? JSON.stringify(this.form_images_list) : "";
+
+                // 提交表单
+                var self = this;
+                uni.showLoading({
+                    title: this.$t('common.processing_in_text'),
+                });
+                self.setData({
+                    form_button_disabled: true,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("commentssave", "order"),
+                    method: "POST",
+                    data: form_data,
+                    dataType: "json",
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            app.globalData.showToast(res.data.msg, "success");
+                            setTimeout(function () {
+                                uni.navigateBack();
+                            }, 2000);
+                        } else {
+                            self.setData({
+                                form_button_disabled: false,
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        self.setData({
+                            form_button_disabled: false,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import "./user-order-comments.css";
+</style>
diff --git a/pages/user-order-detail/user-order-detail.css b/pages/user-order-detail/user-order-detail.css
new file mode 100644
index 0000000..e71eaec
--- /dev/null
+++ b/pages/user-order-detail/user-order-detail.css
@@ -0,0 +1,66 @@
+/*
+* 地址信息
+*/
+.address-detail .icon {
+    width: 30rpx;
+    height: 35rpx !important;
+}
+.address-detail .text {
+    width: calc(100% - 40rpx);
+}
+.address-detail .text {
+    line-height: 36rpx;
+}
+.no-address {
+    height: 85rpx;
+    line-height: 85rpx;
+}
+.address-alias,
+.address-map-submit {
+    padding: 0 15rpx;
+    line-height: 40rpx;
+}
+
+/*
+* 商品信息
+*/
+.goods-base {
+    min-height: 160rpx;
+    margin-left: 180rpx;
+}
+.goods .goods-item:last-child {
+    border-bottom: 0;
+}
+.goods-image {
+    width: 160rpx;
+    height: 160rpx;
+}
+.orderaftersale-btn-text {
+    right: 0;
+    bottom: 0;
+    z-index: 1;
+}
+
+/*
+* 虚拟销售信息
+*/
+.site-fictitious .panel-content .tips-value {
+    color: #f37b1d;
+    background-color: #fff2e9;
+    border-color: #ffebdb;
+}
+.site-fictitious .panel-content .left-image {
+    width: 80rpx;
+    height: 80rpx;
+}
+.site-fictitious .panel-content .right-value {
+    width: calc(100% - 100rpx);
+}
+
+/*
+* 自提信息
+*/
+.site-extraction .panel-content .qrcode {
+    width: 260rpx;
+    height: 260rpx;
+}
\ No newline at end of file
diff --git a/pages/user-order-detail/user-order-detail.vue b/pages/user-order-detail/user-order-detail.vue
new file mode 100644
index 0000000..78ea960
--- /dev/null
+++ b/pages/user-order-detail/user-order-detail.vue
@@ -0,0 +1,349 @@
+<template>
+    <view :class="theme_view">
+        <block v-if="detail != null">
+            <view class="padding-horizontal-main padding-top-main">
+                <!-- 地址 -->
+                <view v-if="(detail.address_data || null) != null" class="address bg-white padding-horizontal-main padding-top-main border-radius-main spacing-mb">
+                    <view class="address-base padding-top-xs padding-bottom oh">
+                        <text v-if="(detail.address_data.alias || null) != null" class="address-alias round br-main cr-main bg-white margin-right-sm">{{ detail.address_data.alias }}</text>
+                        <text>{{ detail.address_data.name }}</text>
+                        <text class="fr">{{ detail.address_data.tel }}</text>
+                    </view>
+                    <view class="address-detail oh margin-bottom-main">
+                        <image class="icon fl" :src="common_static_url + 'map-icon.png'" mode="widthFix"></image>
+                        <view class="text fr">
+                            <text>{{ detail.address_data.province_name }}{{ detail.address_data.city_name }}{{ detail.address_data.county_name }}{{ detail.address_data.address }}</text>
+                            <text v-if="(detail.address_data.lng || 0) != 0 && (detail.address_data.lat || 0) != 0" class="address-map-submit cr-base br round bg-white margin-left-sm text-size-xs" @tap="address_map_event">{{$t('user-order-detail.user-order-detail.7lp6gw')}}</text>
+                        </view>
+                    </view>
+                    <view v-if="(detail.address_data.extraction_contact_name || null) != null || (detail.address_data.extraction_contact_tel || null) != null || (detail.address_data.appoint_time || null) != null" class="padding-vertical-main br-t-dashed">
+                        <view>
+                            <text v-if="(detail.address_data.extraction_contact_name || null) != null" class="margin-right-xxl">{{detail.address_data.extraction_contact_name}}</text>
+                            <text v-if="(detail.address_data.extraction_contact_tel || null) != null">{{detail.address_data.extraction_contact_tel}}</text>
+                        </view>
+                        <view v-if="(detail.address_data.tel || null) != null" class="cr-red">{{detail.address_data.appoint_time}}</view>
+                    </view>
+                    <view class="address-divider spacing-mb"></view>
+                </view>
+
+                <!-- 商品列表 -->
+                <view class="goods bg-white padding-main border-radius-main spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.7f8p26')}}</view>
+                    <view v-for="(item, index) in detail.items" :key="index" class="goods-item br-b-dashed oh padding-main">
+                        <view :data-value="item.goods_url" @tap="url_event" class="cp">
+                            <image class="goods-image fl radius" :src="item.images" mode="aspectFill"></image>
+                            <view class="goods-base pr">
+                                <view class="multi-text">{{ item.title }}</view>
+                                <view v-if="item.spec != null" class="margin-top-sm">
+                                    <block v-for="(sv, si) in item.spec" :key="si">
+                                        <text v-if="si > 0" class="cr-grey padding-left-xs padding-right-xs">;</text>
+                                        <text class="cr-grey">{{ sv.value }}</text>
+                                    </block>
+                                </view>
+                                <view class="margin-top-sm">
+                                    <text class="fw-b">{{ detail.currency_data.currency_symbol }}{{ item.price }}</text>
+                                    <text class="margin-left-sm">x{{ item.buy_number }}</text>
+                                </view>
+                                <view v-if="detail.is_can_launch_aftersale == 1 && (item.orderaftersale_btn_text || null) != null" class="orderaftersale-btn-text cr-blue pa bg-white" @tap.stop="orderaftersale_event" :data-oid="detail.id" :data-did="item.id">{{ item.orderaftersale_btn_text }}</view>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="padding-top-main tr cr-base text-size">
+                        <text>{{$t('user-order-detail.user-order-detail.423rmr')}}<text class="fw-b">{{ detail.buy_number_count }}</text>{{$t('user-order-detail.user-order-detail.41ty94')}}<text class="sales-price margin-right-xs">{{ detail.currency_data.currency_symbol }}{{ detail.total_price }}</text></text>
+                    </view>
+                </view>
+
+                <!-- 服务信息 -->
+                <view v-if="(detail.service_data || null) != null" class="service-data panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.567ygf')}}</view>
+                    <view class="panel-content oh padding-top-main">
+                        <view class="item br-b-dashed oh padding-vertical-main">
+                            <view class="title fl padding-right-main cr-grey">{{$t('user-order-detail.user-order-detail.gsfw4d')}}</view>
+                            <view class="content fl br-l padding-left-main">{{ detail.service_data.service_name }}</view>
+                        </view>
+                        <view class="item br-b-dashed oh padding-vertical-main">
+                            <view class="title fl padding-right-main cr-grey">{{$t('user-order-detail.user-order-detail.6ygfew')}}</view>
+                            <view class="content fl br-l padding-left-main" :data-value="detail.service_data.service_mobile" @tap="text_copy_event">
+                                <text>{{ detail.service_data.service_mobile }}</text>
+                                <text class="bg-white br-green cr-green round padding-horizontal-sm text-size-xs margin-left-sm">{{$t('common.copy')}}</text>
+                            </view>
+                        </view>
+                        <view v-if="(detail.service_data.service_duration_minute_text || null) != null" class="item br-b-dashed oh padding-vertical-main">
+                            <view class="title fl padding-right-main cr-grey">{{$t('user-order-detail.user-order-detail.67ujfr')}}</view>
+                            <view class="content fl br-l padding-left-main">{{ detail.service_data.service_duration_minute_text }}</view>
+                        </view>
+                        <view class="item br-b-dashed oh padding-vertical-main">
+                            <view class="title fl padding-right-main cr-grey">{{$t('common.service_time')}}</view>
+                            <view class="content fl br-l padding-left-main">
+                                <view v-if="(detail.service_data.service_start_time || null) != null">{{ detail.service_data.service_start_time }}</view>
+                                <view v-if="(detail.service_data.service_end_time || null) != null">{{ detail.service_data.service_end_time }}</view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 虚拟销售数据 -->
+                <view v-if="(site_fictitious || null) != null" class="site-fictitious panel-item padding-horizontal-main padding-top-main border-radius-main bg-white spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{ site_fictitious.title || $t('user-order-detail.user-order-detail.y9woor') }}</view>
+                    <view class="panel-content oh padding-top-main">
+                        <view v-if="(site_fictitious.tips || null) != null" class="tips-value radius padding-main margin-bottom-main">
+                            <mp-html :content="site_fictitious.tips" />
+                        </view>
+                        <view v-for="(item, index) in detail.items" :key="index" class="item br-b-dashed oh padding-bottom-main margin-bottom-main">
+                            <image class="left-image br fl radius" :src="item.images" mode="aspectFill"></image>
+                            <view class="right-value fr">
+                                <view v-if="(item.spec_text || null) != null" class="text-base fw-b margin-bottom-sm text-size-xs">{{item.spec_text}}</view>
+                                <mp-html v-if="(item.fictitious_goods_value || null) != null" :content="item.fictitious_goods_value" />
+                                <text v-else class="cr-grey text-size-xs">{{$t('user-order-detail.user-order-detail.7xtnjt')}}</text>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 自提信息 -->
+                <view v-if="(detail.extraction_data || null) != null" class="site-extraction panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.7dikfm')}}</view>
+                    <view class="panel-content oh padding-top-main">
+                        <image v-if="(detail.extraction_data.images || null) != null" class="qrcode br radius margin-bottom-sm" :src="detail.extraction_data.images" mode="aspectFill"></image>
+                        <view>
+                            <text>{{$t('user-order-detail.user-order-detail.o38952')}}</text>
+                            <text class="radius bg-green cr-white padding-left-sm padding-right-sm">{{ detail.extraction_data.code || $t('user-order-detail.user-order-detail.hpq62x') }}</text>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 订单基础数据 -->
+                <view v-if="detail_list.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.0f26j2')}}</view>
+                    <view class="panel-content oh">
+                        <view v-for="(item, index) in detail_list" :key="index" class="item br-b-dashed oh padding-vertical-main">
+                            <view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
+                            <view v-if="(item.is_copy || 0) == 1" class="content fl br-l padding-left-main" :data-value="item.value" @tap="text_copy_event">
+                                <text>{{ item.value }}</text>
+                                <text class="bg-white br-green cr-green round padding-horizontal-sm text-size-xs margin-left-sm">{{$t('common.copy')}}</text>
+                            </view>
+                            <view v-else class="content fl br-l padding-left-main">{{ item.value }}</view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 快递信息 -->
+                <view v-if="(detail.express_data || null) != null && detail.express_data.length > 0" class="express-data panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.0876xf')}}</view>
+                    <view class="panel-content">
+                        <view v-for="(item, index) in detail.express_data" :key="index" class="item br-b-dashed oh padding-vertical-main">
+                            <view class="item oh padding-vertical-main">
+                                <view class="title fl padding-right-main cr-grey">{{$t('user-order-detail.user-order-detail.12d445')}}</view>
+                                <view class="content fl br-l padding-left-main" :data-value="item.express_name" @tap="text_copy_event">{{item.express_name}}</view>
+                            </view>
+                            <view class="item oh padding-vertical-main">
+                                <view class="title fl padding-right-main cr-grey">{{$t('user-order-detail.user-order-detail.2byl8l')}}</view>
+                                <view class="content fl br-l padding-left-main" :data-value="item.express_number" @tap="text_copy_event">
+                                    <text>{{item.express_number}}</text>
+                                    <text class="bg-white br-green cr-green round padding-horizontal-sm text-size-xs margin-left-sm">{{$t('common.copy')}}</text>
+                                </view>
+                            </view>
+                            <view v-if="(item.note || null) != null" class="item oh padding-vertical-main">
+                                <view class="title fl padding-right-main cr-grey">{{$t('common.note')}}:</view>
+                                <view class="content fl br-l padding-left-main" :data-value="item.note" @tap="text_copy_event">{{item.note}}</view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 扩展数据 -->
+                <view v-if="extension_data.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.ct34n5')}}</view>
+                    <view class="panel-content oh">
+                        <view v-for="(item, index) in extension_data" :key="index" class="item br-b-dashed oh padding-vertical-main cr-base">
+                            <text>{{ item.name }}</text>
+                            <text v-if="(item.tips || null) != null">：{{ item.tips }}</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </block>
+        <block v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    var common_static_url = app.globalData.get_static_url('common');
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                detail: null,
+                detail_list: [],
+                extension_data: [],
+                site_fictitious: null,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            // 获取数据
+            init() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('detail', 'order'),
+                    method: 'POST',
+                    data: {
+                        id: this.params.id,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                detail: data.data,
+                                detail_list: [
+                                    { name: this.$t('user-order-detail.user-order-detail.346376'), value: data.data.warehouse_name || '' },
+                                    { name: this.$t('user-order-detail.user-order-detail.io6p5k'), value: data.data.order_model_name || '' },
+                                    { name: this.$t('user-order-detail.user-order-detail.n18sd2'), value: data.data.order_no || '', is_copy: 1 },
+                                    { name: this.$t('user-order-detail.user-order-detail.yxwu8n'), value: data.data.status_name || '' },
+                                    { name: this.$t('user-order-detail.user-order-detail.23qj7m'), value: data.data.pay_status_name || '' },
+                                    { name: this.$t('user-order-detail.user-order-detail.vg4jb1'), value: data.data.price || '' },
+                                    { name: this.$t('user-order-detail.user-order-detail.2y7l13'), value: data.data.total_price || '' },
+                                    { name: this.$t('user-order-detail.user-order-detail.6ub2j0'), value: data.data.preferential_price || '' },
+                                    { name: this.$t('user-order-detail.user-order-detail.8b18q8'), value: data.data.increase_price || '' },
+                                    { name: this.$t('user-order-detail.user-order-detail.516tlr'), value: data.data.pay_price || '' },
+                                    { name: this.$t('user-order-detail.user-order-detail.0e1sfs'), value: (data.data.payment_name || '') + ((data.data.is_under_line_text || null) == null || (data.data.payment_name || null) == null ? '' : '（' + data.data.is_under_line_text + '）') },
+                                    { name: this.$t('user-order-detail.user-order-detail.2b5fc8'), value: data.data.user_note || '' },
+                                    { name: this.$t('user-order-detail.user-order-detail.h2c78h'), value: data.data.add_time || '' },
+                                    { name: this.$t('user-order-detail.user-order-detail.9vivhl'), value: data.data.confirm_time || '' },
+                                    { name: this.$t('user-order-detail.user-order-detail.wn83rn'), value: data.data.pay_time || '' },
+                                    { name: this.$t('user-order-detail.user-order-detail.1674dc'), value: data.data.delivery_time || '' },
+                                    { name: this.$t('user-order-detail.user-order-detail.0i938r'), value: data.data.collect_time || '' },
+                                    { name: this.$t('user-order-detail.user-order-detail.1jpv4n'), value: data.data.cancel_time || '' },
+                                    { name: this.$t('user-order-detail.user-order-detail.8o2of3'), value: data.data.close_time || '' },
+                                ],
+                                extension_data: data.data.extension_data || [],
+                                site_fictitious: data.site_fictitious || null,
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: '',
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'init')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        self.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 售后订单事件
+            orderaftersale_event(e) {
+                var oid = e.currentTarget.dataset.oid || 0;
+                var did = e.currentTarget.dataset.did || 0;
+                if (oid == 0 || did == 0) {
+                    app.globalData.showToast(this.$t('user-order-detail.user-order-detail.5k6k56'));
+                    return false;
+                }
+
+                // 进入售后页面
+                app.globalData.url_open('/pages/user-orderaftersale-detail/user-orderaftersale-detail?oid=' + oid + '&did=' + did);
+            },
+
+            // 地图查看
+            address_map_event(e) {
+                if ((this.detail.address_data || null) == null) {
+                    app.globalData.showToast(this.$t('user-order-detail.user-order-detail.i876o3'));
+                    return false;
+                }
+
+                // 打开地图
+                var data = this.detail.address_data;
+                var name = data.alias || data.name || '';
+                var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || '');
+                app.globalData.open_location(data.lng, data.lat, name, address);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 文本复制
+            text_copy_event(e) {
+                if((e.currentTarget.dataset.value || null) != null) {
+                    app.globalData.text_copy_event(e);
+                }
+            }
+        },
+    };
+</script>
+<style>
+    @import './user-order-detail.css';
+</style>
diff --git a/pages/user-order/user-order.css b/pages/user-order/user-order.css
new file mode 100644
index 0000000..fcdbe4f
--- /dev/null
+++ b/pages/user-order/user-order.css
@@ -0,0 +1,50 @@
+/*
+* 导航
+*/
+.nav-base .item {
+    width: 16.66%;
+}
+
+.order-scroll {
+    height: calc(100vh - 80rpx);
+}
+
+/*
+* 列表
+*/
+.goods-base {
+    min-height: 160rpx;
+    margin-left: 180rpx;
+}
+
+.goods-image {
+    width: 160rpx;
+    height: 160rpx;
+}
+
+.warehouse-group-icon {
+    width: 30rpx;
+    height: 30rpx;
+}
+
+.orderaftersale-btn-text {
+    right: 0;
+    bottom: 0;
+    z-index: 1;
+}
+
+/**
+* 支付方式
+*/
+.payment-list .item {
+    width: 50%;
+}
+
+.payment-list .item-content {
+    padding: 20rpx 10rpx;
+}
+
+.payment-list .item-content image {
+    width: 50rpx;
+    height: 50rpx !important;
+}
\ No newline at end of file
diff --git a/pages/user-order/user-order.vue b/pages/user-order/user-order.vue
new file mode 100644
index 0000000..4e93e2c
--- /dev/null
+++ b/pages/user-order/user-order.vue
@@ -0,0 +1,830 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav-base bg-white">
+            <block v-for="(item, index) in nav_status_list" :key="index">
+                <view v-if="nav_status_index == index" class="item fl tc cr-main nav-active-line" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+                <view v-else class="item fl tc" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+            </block>
+        </view>
+
+        <!-- 订单列表 -->
+        <scroll-view :scroll-y="true" class="order-scroll" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view :class="nav_status_index == 1 && order_select_ids.length > 0 && home_is_enable_order_bulk_pay == 1 ? 'page-bottom-fixed' : ''">
+                <view v-if="data_list.length > 0" class="padding-horizontal-main padding-top-main">
+                    <view v-for="(item, index) in data_list" :key="index" class="list-item padding-horizontal-main padding-top-main border-radius-main bg-white oh spacing-mb">
+                        <view class="item-base oh br-b padding-bottom-main">
+                            <!-- 选择 -->
+                            <view v-if="nav_status_index == 1 && home_is_enable_order_bulk_pay == 1" :data-price="item.total_price" :data-oid="item.id" :data-payment="item.payment_id" class="dis-inline-block va-m margin-right-lg" @tap="selected_event">
+                                <iconfont :name="'icon-zhifu-'+((order_select_ids.indexOf(item.id) != -1) ? 'yixuan' : 'weixuan')" size="40rpx" :color="(order_select_ids.indexOf(item.id) != -1) ? theme_color : '#999'" propClass="fl margin-top-xs"></iconfont>
+                            </view>
+                            <!-- 基础信息 -->
+                            <view class="dis-inline-block va-m cp" @tap="url_event" :data-value="item.warehouse_url || ''">
+                                <image v-if="(item.warehouse_icon || null) != null" class="warehouse-group-icon va-m margin-right-sm" :src="item.warehouse_icon" mode="aspectFit"></image>
+                                <text class="cr-base va-m">{{ item.warehouse_name }}</text>
+                            </view>
+                            <text class="fr cr-red">{{ item.status_name }}<text v-if="(item.is_under_line_text || null) != null">（{{ item.is_under_line_text }}）</text></text>
+                        </view>
+                        <view v-for="(detail, di) in item.items" :key="di" class="br-b-dashed oh padding-vertical-main">
+                            <view :data-value="'/pages/user-order-detail/user-order-detail?id=' + item.id" @tap="url_event">
+                                <image class="goods-image fl radius" :src="detail.images" mode="aspectFill"></image>
+                                <view class="goods-base pr">
+                                    <view class="multi-text">{{ detail.title }}</view>
+                                    <view v-if="detail.spec != null" class="margin-top-sm">
+                                        <block v-for="(sv, si) in detail.spec" :key="si">
+                                            <text v-if="si > 0" class="cr-grey padding-left-xs padding-right-xs">;</text>
+                                            <text class="cr-grey">{{ sv.value }}</text>
+                                        </block>
+                                    </view>
+                                    <view class="margin-top-sm">
+                                        <text class="fw-b">{{ item.currency_data.currency_symbol }}{{ detail.price }}</text>
+                                        <text class="margin-left-sm">x{{ detail.buy_number }}</text>
+                                    </view>
+                                    <view v-if="item.is_can_launch_aftersale == 1 && (detail.orderaftersale_btn_text || null) != null" class="orderaftersale-btn-text cr-blue pa bg-white" @tap.stop="orderaftersale_event" :data-oid="item.id" :data-did="detail.id">{{
+                                        detail.orderaftersale_btn_text
+                                    }}</view>
+                                </view>
+                            </view>
+                        </view>
+                        <view class="padding-vertical-main tr cr-base text-size-sm">
+                            <text>{{$t('user-order-detail.user-order-detail.423rmr')}}<text class="fw-b">{{ item.buy_number_count }}</text>{{$t('user-order-detail.user-order-detail.41ty94')}}<text class="sales-price margin-right-xs">{{ item.currency_data.currency_symbol }}{{ item.total_price }}</text></text>
+                        </view>
+                        <view
+                            v-if="
+                                (
+                                    item.operate_data.is_cancel +
+                                    item.operate_data.is_pay +
+                                    item.operate_data.is_collect +
+                                    item.operate_data.is_comments +
+                                    item.operate_data.is_delete +
+                                    (item.plugins_is_order_allot_button || 0) +
+                                    (item.plugins_is_order_batch_button || 0) +
+                                    (item.plugins_is_order_frequencycard_button || 0) +
+                                    (item.plugins_delivery_data || 0) +
+                                    (item.plugins_ordergoodsform_data || 0) +
+                                    (item.plugins_orderresources_data || 0)
+                                 > 0 ) ||
+                                (item.status == 2 && item.order_model != 2) ||
+                                ((item.plugins_express_data || 0) == 1 && (item.express_data || null) != null) ||
+                                ((item.plugins_intellectstools_data || null) != null && (item.plugins_intellectstools_data.continue_buy_data || null) != null && item.plugins_intellectstools_data.continue_buy_data.length > 0)
+                            "
+                            class="item-operation tr br-t padding-top-main">
+                            <button v-if="item.operate_data.is_cancel == 1" class="round bg-white cr-yellow br-yellow margin-bottom-main" type="default" size="mini" @tap="cancel_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('common.cancel')}}</button>
+                            <button v-if="item.operate_data.is_pay == 1" class="round bg-white cr-green br-green margin-bottom-main" type="default" size="mini" @tap="pay_event" :data-value="item.id" :data-index="index" :data-price="item.total_price" :data-payment="item.payment_id" :data-currency-symbol="item.currency_data.currency_symbol" hover-class="none">{{$t('order.order.1i873j')}}</button>
+                            <button v-if="item.operate_data.is_collect == 1" class="round bg-white cr-green br-green margin-bottom-main" type="default" size="mini" @tap="collect_event" :data-transactionid="item.weixin_collect_data || ''" :data-value="item.id" :data-index="index" hover-class="none">{{$t('orderallot-list.orderallot-list.w2w2w4')}}</button>
+                            <button v-if="(item.plugins_express_data || 0) == 1 && (item.express_data || null) != null" class="round bg-white cr-main br-main margin-bottom-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/express/detail/detail?oid=' + item.id" hover-class="none">{{$t('orderallot-list.orderallot-list.w2t242')}}</button>
+                            <button v-if="(item.plugins_delivery_data || 0) > 0" class="round bg-white cr-main br-main margin-bottom-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/delivery/logistics/logistics?id=' + item.plugins_delivery_data" hover-class="none">{{$t('orderallot-list.orderallot-list.w2t242')}}</button>
+                            <button v-if="item.operate_data.is_comments == 1" class="round bg-white cr-green br-green margin-bottom-main" type="default" size="mini" @tap="comments_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('user-order.user-order.twc3r7')}}</button>
+                            <button v-if="item.status == 2 && item.order_model != 2" class="round cr-base br margin-bottom-main" type="default" size="mini" @tap="rush_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('user-order.user-order.lp1v28')}}</button>
+                            <button v-if="item.operate_data.is_delete == 1" class="round bg-white cr-red br-red margin-bottom-main" type="default" size="mini" @tap="delete_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('common.del')}}</button>
+                            <button v-if="(item.plugins_is_order_allot_button || 0) == 1" class="round bg-white cr-main br-main margin-bottom-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/realstore/orderallot-list/orderallot-list?oid=' + item.id" hover-class="none">{{$t('user-order.user-order.ht65c9')}}</button>
+                            <button v-if="(item.plugins_is_order_batch_button || 0) == 1" class="round bg-white cr-blue br-blue margin-bottom-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/realstore/batchorder-list/batchorder-list?oid=' + item.id" hover-class="none">{{$t('orderallot-list.orderallot-list.6m73j2')}}</button>
+                            <button v-if="(item.plugins_is_order_frequencycard_button || 0) == 1" class="round bg-white cr-green br-green margin-bottom-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/realstore/frequencycard-list/frequencycard-list?oid=' + item.id" hover-class="none">{{$t('orderallot-list.orderallot-list.b13k5r')}}</button>
+                            <button v-if="(item.plugins_ordergoodsform_data || 0) == 1" class="round bg-white cr-blue br-blue margin-bottom-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/ordergoodsform/order/order?id=' + item.id" hover-class="none">{{$t('user-order.user-order.9l47b6')}}</button>
+                            <button v-if="(item.plugins_orderresources_data || 0) == 1" class="round bg-white cr-blue br-blue margin-bottom-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/orderresources/orderannex/orderannex?oid=' + item.id" hover-class="none">{{$t('user-order.user-order.fyuikn')}}</button>
+                            <button v-if="(item.plugins_intellectstools_data || null) != null && (item.plugins_intellectstools_data.continue_buy_data || null) != null && item.plugins_intellectstools_data.continue_buy_data.length > 0" class="round bg-white cr-green br-green margin-bottom-main" type="default" size="mini" :data-index="index" @tap="continue_buy_event" hover-class="none">{{$t('user-order.user-order.3l2jr5')}}</button>
+                        </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"></component-no-data>
+                </view>
+            </view>
+        </scroll-view>
+
+        <!-- 合并支付 -->
+        <view v-if="nav_status_index == 1 && order_select_ids.length > 0 && home_is_enable_order_bulk_pay == 1" class="bottom-fixed" :style="bottom_fixed_style">
+            <view class="bottom-line-exclude">
+                <button class="item bg-main cr-white round text-size wh-auto" hover-class="none" @tap="pay_merge_event">{{$t('user-order.user-order.7571p2')}}</button>
+            </view>
+        </view>
+
+        <!-- 支付组件 -->
+        <component-payment
+            ref="payment"
+            :propCurrencySymbol="payment_currency_symbol"
+            :propPayUrl="pay_url"
+            :propQrcodeUrl="qrcode_url"
+            :propPaymentList="payment_list"
+            propPayDataKey="ids"
+            :propTempPayValue="temp_pay_value"
+            :propTempPayIndex="temp_pay_index"
+            :propPaymentId="payment_id"
+            :propDefaultPaymentId="default_payment_id"
+            :propPayPrice="pay_price"
+            :propIsShowPayment="is_show_payment_popup"
+            @close-payment-popup="payment_popup_event_close"
+            @pay-success="order_item_pay_success_handle"
+        ></component-payment>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import base64 from '@/common/js/lib/base64.js';
+    import componentCommon from '@/components/common/common';
+    import componentPopup from '@/components/popup/popup';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    import componentPayment from '@/components/payment/payment';
+
+    var common_static_url = app.globalData.get_static_url('common');
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: app.globalData.get_theme_color(),
+                common_static_url: common_static_url,
+                bottom_fixed_style: '',
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                input_keyword_value: '',
+                nav_status_list: [
+                    { name: this.$t('common.all'), value: '-1' },
+                    { name: this.$t('user.user.9u8e61'), value: '1' },
+                    { name: this.$t('user.user.66714e'), value: '2' },
+                    { name: this.$t('order.order.q820hx'), value: '3' },
+                    { name: this.$t('order.order.15lr5l'), value: '4' },
+                    { name: this.$t('detail.detail.32171c'), value: '5,6' },
+                ],
+                mult_payment_id_list: [],
+                order_select_ids: [],
+                mult_pay_price: [],
+                nav_status_index: 0,
+                // 基础配置
+                home_is_enable_order_bulk_pay: 0,
+                // 页面从其他页面跳转过来携带的参数
+                params: {},
+                // 前往页面携带的参数
+                payment_currency_symbol: app.globalData.currency_symbol(),
+                pay_price: 0,
+                pay_url: '',
+                qrcode_url: '',
+                payment_list: [],
+                temp_pay_value: '',
+                temp_pay_index: 0,
+                payment_id: 0,
+                default_payment_id: 0,
+                is_show_payment_popup: false,
+                // 智能工具箱（限定仅可选择下单支付方式）
+                is_order_pay_only_can_buy_payment: 0,
+                original_payment_list: [],
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentPopup,
+            componentNoData,
+            componentBottomLine,
+            componentPayment,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 是否指定状态
+            var nav_status_index = 0;
+            if ((params.status || null) != null) {
+                for (var i in this.nav_status_list) {
+                    if (this.nav_status_list[i]['value'] == params.status) {
+                        nav_status_index = i;
+                        break;
+                    }
+                }
+            }
+            this.setData({
+                nav_status_index: nav_status_index,
+                params: params || {},
+            });
+
+            // 初始化配置
+            this.init_config();
+
+            // 数据加载
+            this.init();
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    this.setData({
+                        home_is_enable_order_bulk_pay: app.globalData.get_config('config.home_is_enable_order_bulk_pay'),
+                        is_order_pay_only_can_buy_payment: parseInt(app.globalData.get_config('plugins_base.intellectstools.data.is_order_pay_only_can_buy_payment', 0)),
+                    });
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 获取数据
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    this.setData({
+                        pay_url: app.globalData.get_request_url('pay', 'order'),
+                        qrcode_url: app.globalData.get_request_url('paycheck', 'order'),
+                    });
+
+                    // 获取数据
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 输入框事件
+            input_event(e) {
+                this.setData({
+                    input_keyword_value: e.detail.value,
+                });
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 参数
+                var order_status = (this.nav_status_list[this.nav_status_index] || null) == null ? -1 : this.nav_status_list[this.nav_status_index]['value'];
+
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'order'),
+                    method: 'POST',
+                    data: {
+                        page: this.data_page,
+                        keywords: this.input_keyword_value || '',
+                        status: order_status,
+                        is_more: 1,
+                    },
+                    dataType: 'json',
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    original_payment_list: res.data.data.payment_list || [],
+                                    payment_list: res.data.data.payment_list || [],
+                                    default_payment_id: res.data.data.default_payment_id || 0,
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+
+                                // 下订单支付处理
+                                var key = app.globalData.data.cache_page_pay_key;
+                                var pay_data = uni.getStorageSync(key) || null;
+                                if (pay_data != null && (pay_data.order_ids || null) != null && (pay_data.payment_id || null) != null) {
+                                    uni.removeStorageSync(key);
+                                    if ((this.$refs.payment || null) != null) {
+                                        this.$refs.payment.pay_handle(pay_data.order_ids, pay_data.payment_id, this.original_payment_list);
+                                    }
+                                }
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_bottom_line_status: false,
+                                    data_list: [],
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_is_loading: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 支付
+            pay_event(e) {
+                // 参数
+                var index = e.currentTarget.dataset.index || 0;
+                var payment_id = e.currentTarget.dataset.payment || 0;
+
+                // 智能工具箱（限定仅可选择下单支付方式）
+                if(this.is_order_pay_only_can_buy_payment == 1) {
+                    var payment_list = [];
+                    this.original_payment_list.forEach(function(v, k) {
+                        if(v.id == payment_id) {
+                            payment_list.push(v);
+                        }
+                    });
+                } else {
+                    var payment_list = this.original_payment_list;
+                }
+
+                // 设置支付参数
+                this.setData({
+                    is_show_payment_popup: true,
+                    payment_list: payment_list,
+                    payment_currency_symbol: e.currentTarget.dataset.currencySymbol,
+                    temp_pay_value: e.currentTarget.dataset.value,
+                    temp_pay_index: index,
+                    payment_id: payment_id,
+                    pay_price: e.currentTarget.dataset.price,
+                    order_select_ids: [],
+                });
+            },
+
+            // 支付弹窗关闭
+            payment_popup_event_close(e) {
+                this.setData({
+                    is_show_payment_popup: false,
+                });
+            },
+
+            // 支付成功数据设置
+            // 订单完成回调
+            order_item_pay_success_handle(data) {
+                var order_ids_arr = data.order_id.toString().split(',');
+                var temp_data_list = this.data_list;
+                for (var i in temp_data_list) {
+                    if (order_ids_arr.indexOf(temp_data_list[i]['id'].toString()) != -1) {
+                        temp_data_list[i]['operate_data']['is_pay'] = 0;
+                        temp_data_list[i]['operate_data']['is_cancel'] = 0;
+                        switch (parseInt(temp_data_list[i]['order_model'])) {
+                            // 销售,同城模式
+                            case 0:
+                            case 1:
+                                temp_data_list[i]['status'] = 2;
+                                temp_data_list[i]['status_name'] = this.$t('user.user.66714e');
+                                break;
+                            // 自提模式
+                            case 2:
+                                temp_data_list[i]['status'] = 2;
+                                temp_data_list[i]['status_name'] = this.$t('user-order.user-order.hp123x');
+                                break;
+                            // 虚拟模式
+                            case 3:
+                                temp_data_list[i]['status'] = 3;
+                                temp_data_list[i]['status_name'] = this.$t('order.order.q820hx');
+                                break;
+                        }
+                    }
+                }
+                this.setData({
+                    data_list: temp_data_list,
+                });
+            },
+
+            // 取消
+            cancel_event(e) {
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('order.order.pn78ns'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('recommend-list.recommend-list.w9460o'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            // 参数
+                            var id = e.currentTarget.dataset.value;
+                            var index = e.currentTarget.dataset.index;
+
+                            // 加载loding
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text'),
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url('cancel', 'order'),
+                                method: 'POST',
+                                data: {
+                                    id: id,
+                                },
+                                dataType: 'json',
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        var temp_data_list = this.data_list;
+                                        temp_data_list[index]['status'] = 5;
+                                        temp_data_list[index]['status_name'] = this.$t('order.order.1k98tk');
+                                        temp_data_list[index]['operate_data']['is_cancel'] = 0;
+                                        temp_data_list[index]['operate_data']['is_pay'] = 0;
+                                        temp_data_list[index]['operate_data']['is_delete'] = 1;
+                                        temp_data_list[index]['is_can_launch_aftersale'] = 0;
+                                        this.setData({
+                                            data_list: temp_data_list,
+                                        });
+                                        app.globalData.showToast(res.data.msg, 'success');
+                                    } else {
+                                        app.globalData.showToast(res.data.msg);
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 收货
+            collect_event(e) {
+                var transactionid = e.currentTarget.dataset.transactionid || null;
+                if(transactionid == null || !uni.openBusinessView) {
+                    this.collect_hand_handle(e);
+                } else {
+                    // 存在微信单号收货数据，则拉起微信确认收货组件、失败则调用手动收货模式
+                    var self = this;
+                    uni.openBusinessView({
+                        businessType: 'weappOrderConfirm',
+                        extraData: {
+                            transaction_id: transactionid
+                        },
+                        success() {
+                            self.collect_handle(e);
+                        },
+                        fail() {
+                            self.collect_hand_handle(e);
+                        }
+                    });
+                }
+            },
+
+            // 手动收货
+            collect_hand_handle(e) {
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('orderallot-list.orderallot-list.o3ouqv'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('recommend-list.recommend-list.w9460o'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            this.collect_handle(e);
+                        }
+                    },
+                });
+            },
+
+            // 收货处理
+            collect_handle(e) {
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('orderallot-list.orderallot-list.o3ouqv'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('recommend-list.recommend-list.w9460o'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            // 参数
+                            var id = e.currentTarget.dataset.value;
+                            var index = e.currentTarget.dataset.index;
+            
+                            // 加载loding
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text'),
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url('collect', 'order'),
+                                method: 'POST',
+                                data: {
+                                    id: id,
+                                },
+                                dataType: 'json',
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        var temp_data_list = this.data_list;
+                                        temp_data_list[index]['status'] = 4;
+                                        temp_data_list[index]['status_name'] = this.$t('order.order.15lr5l');
+                                        temp_data_list[index]['operate_data']['is_collect'] = 0;
+                                        temp_data_list[index]['operate_data']['is_comments'] = 1;
+                                        temp_data_list[index]['operate_data']['is_delete'] = 1;
+                                        this.setData({
+                                            data_list: temp_data_list,
+                                        });
+                                        app.globalData.showToast(res.data.msg, 'success');
+                                    } else {
+                                        app.globalData.showToast(res.data.msg);
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 删除
+            delete_event(e) {
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('recommend-list.recommend-list.54d418'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('recommend-list.recommend-list.w9460o'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            // 参数
+                            var id = e.currentTarget.dataset.value;
+                            var index = e.currentTarget.dataset.index;
+
+                            // 加载loding
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text'),
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url('delete', 'order'),
+                                method: 'POST',
+                                data: {
+                                    id: id,
+                                },
+                                dataType: 'json',
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        var temp_data_list = this.data_list;
+                                        temp_data_list.splice(index, 1);
+                                        var len = temp_data_list.length;
+                                        this.setData({
+                                            data_list: temp_data_list,
+                                            data_list_loding_status: len == 0 ? 0 : 3,
+                                            data_bottom_line_status: len == 0 ? false : this.data_bottom_line_status,
+                                        });
+                                        app.globalData.showToast(res.data.msg, 'success');
+                                    } else {
+                                        app.globalData.showToast(res.data.msg);
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 催催
+            rush_event(e) {
+                app.globalData.showToast(this.$t('user-order.user-order.f5qqhu'), 'success');
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    order_select_ids: [],
+                    nav_status_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+
+                // 重新拉取数据
+                this.get_data_list(1);
+            },
+
+            // 售后订单事件
+            orderaftersale_event(e) {
+                var oid = e.currentTarget.dataset.oid || 0;
+                var did = e.currentTarget.dataset.did || 0;
+                if (oid == 0 || did == 0) {
+                    app.globalData.showToast(this.$t('user-order-detail.user-order-detail.5k6k56'));
+                    return false;
+                }
+
+                // 进入售后页面
+                app.globalData.url_open('/pages/user-orderaftersale-detail/user-orderaftersale-detail?oid=' + oid + '&did=' + did);
+            },
+
+            // 订单评论
+            comments_event(e) {
+                app.globalData.url_open('/pages/user-order-comments/user-order-comments?id=' + e.currentTarget.dataset.value);
+            },
+
+            // 选中处理
+            selected_event(e) {
+                var oid = e.currentTarget.dataset.oid || 0;
+                var price = e.currentTarget.dataset.price || 0;
+                var payment_id = e.currentTarget.dataset.payment || '';
+                var temp_select_ids = this.order_select_ids;
+                var temp_mult_pay_price = this.mult_pay_price;
+                var temp_payment_id = this.mult_payment_id_list;
+                if (temp_select_ids.indexOf(oid) == -1) {
+                    temp_select_ids.push(oid);
+                    temp_mult_pay_price.push(price);
+                    temp_payment_id.push(payment_id);
+                } else {
+                    for (var i in temp_select_ids) {
+                        if (temp_select_ids[i] == oid) {
+                            temp_select_ids.splice(i, 1);
+                            temp_mult_pay_price.splice(i, 1);
+                            temp_payment_id.splice(i, 1);
+                        }
+                    }
+                }
+                this.setData({
+                    order_select_ids: temp_select_ids,
+                    mult_pay_price: temp_mult_pay_price,
+                    mult_payment_id_list: temp_payment_id,
+                });
+            },
+
+            // 合并支付
+            pay_merge_event(e) {
+                var num = 0;
+                if (this.mult_pay_price.length > 0) {
+                    num = this.mult_pay_price.reduce((old, now) => {
+                        return Number(old) + Number(now);
+                    }, 0);
+                }
+                this.setData({
+                    is_show_payment_popup: true,
+                    temp_pay_value: this.order_select_ids.join(','),
+                    pay_price: Math.round(parseFloat(num) * 100) / 100,
+                    payment_id: this.order_select_ids.length > 1 ? this.default_payment_id : this.mult_payment_id_list[0],
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 回购事件
+            continue_buy_event(e) {
+                var item = this.data_list[e.currentTarget.dataset.index];
+                if ((item.plugins_intellectstools_data || null) != null) {
+                    var plugins_intellectstools_data = item.plugins_intellectstools_data;
+                    var continue_buy_data = plugins_intellectstools_data.continue_buy_data || null;
+                    // 是否存在订单可以购买的商品数据
+                    if(continue_buy_data != null && continue_buy_data.length > 0) {
+                        // 是否直接购买
+                        var is_buy_again_buy = parseInt(plugins_intellectstools_data.is_buy_again_buy || 0);
+                        // 是否加入购物车
+                        var is_buy_again_cart = parseInt(plugins_intellectstools_data.is_buy_again_cart || 0);
+                        // 如果同时都支持则让用户选择
+                        if(is_buy_again_buy == 1 && is_buy_again_cart == 1) {
+                            var self = this;
+                            uni.showActionSheet({
+                                itemList: [this.$t('user-order.user-order.a3c81d'), this.$t('user-order.user-order.5o756f')],
+                                success: function (res) {
+                                    if(res.tapIndex == 0) {
+                                        // 加入购物车
+                                        self.continue_order_goods_cart_handle(continue_buy_data, self);
+                                    } else {
+                                        // 直接购买
+                                        self.continue_order_goods_buy_handle(continue_buy_data);
+                                    }
+                                }
+                            });
+                        } else if(is_buy_again_cart == 1) {
+                            // 加入购物车
+                            this.continue_order_goods_cart_handle(continue_buy_data, this);
+                        } else if(is_buy_again_buy == 1) {
+                            // 直接购买
+                            this.continue_order_goods_buy_handle(continue_buy_data);
+                        }
+                    }
+                }
+            },
+
+            // 订单商品直接购买处理
+            continue_order_goods_buy_handle(goods_data) {
+                // 进入订单确认页面
+                var data = {
+                    buy_type: 'goods',
+                    goods_data: encodeURIComponent(base64.encode(JSON.stringify(goods_data))),
+                };
+                app.globalData.url_open('/pages/buy/buy?data=' + encodeURIComponent(base64.encode(JSON.stringify(data))));
+            },
+
+            // 订单商品加入购物车处理
+            continue_order_goods_cart_handle(goods_data, self) {
+                uni.showLoading({
+                    title: this.$t('common.processing_in_text'),
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("save", "cart"),
+                    method: "POST",
+                    data: { goods_data: goods_data },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            app.globalData.showToast(res.data.msg, "success");
+                            setTimeout(function() {
+                                app.globalData.url_open('/pages/cart-page/cart-page');
+                            }, 1000);
+                        } else {
+                            if (app.globalData.is_login_check(res.data, self, "continue_order_goods_cart_handle", goods_data)) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+        },
+    };
+</script>
+<style scoped>
+    @import './user-order.css';
+</style>
diff --git a/pages/user-orderaftersale-detail/user-orderaftersale-detail.css b/pages/user-orderaftersale-detail/user-orderaftersale-detail.css
new file mode 100644
index 0000000..7327131
--- /dev/null
+++ b/pages/user-orderaftersale-detail/user-orderaftersale-detail.css
@@ -0,0 +1,63 @@
+/**
+* 商品
+*/
+.goods-base {
+    min-height: 160rpx;
+    margin-left: 180rpx;
+}
+.goods-image {
+    width: 160rpx;
+    height: 160rpx;
+}
+.buy-number {
+    right: 0;
+    bottom: 0;
+}
+
+/**
+* 类型选择
+*/
+.choose-type .choose-item {
+    width: calc(50% - 60rpx);
+    -webkit-transition: border-color .2s ease-in;
+    -moz-transition: border-color .2s ease-in;
+    -ms-transition: border-color .2s ease-in;
+    -o-transition: border-color .2s ease-in;
+    transition: border-color .2s ease-in;
+}
+
+/*
+* 售后信息
+*/
+.msg-tips {
+    background: #caecff;
+    color: #0090dc;
+}
+.msg-tips-warning {
+    background-color: #ffe1ca;
+    color: #f37b1d;
+}
+.msg-tips-success {
+    background-color: #c0efbf;
+    color: #1AAD19;
+}
+.msg-tips-danger {
+    background-color: #ffe0de;
+    color: #dd514c;
+}
+.msg-tips .msg-a {
+    color: #d2354c;
+}
+.msg-tips-danger .msg-a {
+    color: #136ed9;
+}
+
+/*
+* 退货地址
+*/
+.msg-tips button {
+    height: 60rpx;
+    line-height: 60rpx;
+    padding: 0 20rpx;
+    font-size: 24rpx;
+}
\ No newline at end of file
diff --git a/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue b/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue
new file mode 100644
index 0000000..51bc20b
--- /dev/null
+++ b/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue
@@ -0,0 +1,830 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="order_data != null" class="padding-horizontal-main padding-top">
+            <!-- 商品 -->
+            <view class="goods padding-main border-radius-main bg-white spacing-mb">
+                <view class="goods-item oh">
+                    <view :data-value="order_data.items.goods_url" @tap="url_event" class="cp">
+                        <image class="goods-image fl radius" :src="order_data.items.images" mode="aspectFill"></image>
+                        <view class="goods-base">
+                            <view class="multi-text">{{ order_data.items.title }}</view>
+                            <view v-if="order_data.items.spec != null" class="margin-top-sm">
+                                <block v-for="(sv, si) in order_data.items.spec" :key="si">
+                                    <text v-if="si > 0" class="cr-grey padding-left-xs padding-right-xs">;</text>
+                                    <text class="cr-grey">{{ sv.value }}</text>
+                                </block>
+                            </view>
+                            <view class="margin-top-sm">
+                                <text class="fw-b">{{ order_data.currency_data.currency_symbol }}{{ order_data.items.price }}</text>
+                                <text class="margin-left-sm">x{{ order_data.items.buy_number }}</text>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 客服信息 -->
+            <view v-if="(plugins_intellectstools_data || null) != null" class="bg-white padding-main border-radius-main spacing-mb">
+                <view v-if="(plugins_intellectstools_data.service_msg || null) != null" class="cr-red margin-bottom">{{ plugins_intellectstools_data.service_msg }}</view>
+                <button type="default" size="mini" class="bg-main br-main cr-white text-size-sm padding-left-xxxl padding-right-xxxl round" @tap="plugins_intellectstools_service_open_event">
+                    <view class="dis-inline-block va-m margin-right-sm lh-0">
+                        <uni-icons type="chatbubble" size="34rpx" color="#fff"></uni-icons>
+                    </view>
+                    <text>{{$t('user.user.ki1nor')}}</text>
+                </button>
+            </view>
+
+            <!-- 基础信息 -->
+            <view v-if="new_aftersale_data != null">
+                <!-- 提示/退货 -->
+                <view v-if="new_aftersale_data.status <= 2" class="msg-tips padding-main border-radius-main spacing-mb">
+                    <text class="msg-text">{{ new_aftersale_data.tips_msg.title }}</text>
+                    <text class="msg-a margin-left-sm" @tap="show_aftersale_event"> {{$t('common.view_text')}} >></text>
+                    <view v-if="new_aftersale_data.status == 1 && new_aftersale_data.type == 1 && return_goods_address != null" class="margin-top-sm oh">
+                        <button class="bg-green cr-white round dis-block fl" type="default" size="mini" @tap="delivery_submit_event">{{$t('user-orderaftersale-detail.user-orderaftersale-detail.uuhf62')}}</button>
+                    </view>
+                </view>
+
+                <!-- 退货地址 -->
+                <view v-if="new_aftersale_data.status == 1 && new_aftersale_data.type == 1 && return_goods_address != null" class="return-address msg-tips msg-tips-warning padding-main border-radius-main spacing-mb">
+                    <text class="cr-base fw-b">{{$t('user-orderaftersale-detail.user-orderaftersale-detail.00je4f')}}</text>
+                    <view class="cr-blue" @tap="text_event" data-event="copy" :data-value="return_goods_address.name + ' ' + return_goods_address.tel + ' ' + return_goods_address.address">
+                        <view>
+                            <text class="margin-right-xxxl">{{ return_goods_address.name }}</text>
+                            <text>{{ return_goods_address.tel }}</text>
+                        </view>
+                        <view>{{ return_goods_address.address }}</view>
+                    </view>
+                </view>
+
+                <!-- 提示 -->
+                <view v-if="new_aftersale_data.status >= 3" :class="'msg-tips padding-main border-radius-main spacing-mb ' + (new_aftersale_data.status == 3 ? 'msg-tips-success' : new_aftersale_data.status == 4 ? 'msg-tips-danger' : 'msg-tips-warning')">
+                    <text class="msg-text">{{ new_aftersale_data.tips_msg.title }}</text>
+                    <text class="msg-a margin-left-sm" @tap="show_aftersale_event"> {{$t('common.view_text')}} >></text>
+                </view>
+
+                <!-- 详情 -->
+                <view v-if="new_aftersale_data.status != 5">
+                    <!-- 申请信息 -->
+                    <view class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                        <view class="br-b padding-bottom-main fw-b text-size">{{$t('invoice-detail.invoice-detail.s70kj4')}}</view>
+                        <view class="panel-content oh">
+                            <view v-for="(item, index) in panel_base_data_list" :key="index" class="item br-b oh padding-vertical-main">
+                                <view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
+                                <view v-if="(item.is_copy || 0) == 1" class="content fl br-l padding-left-main" :data-value="new_aftersale_data[item.field] || ''" data-event="copy" @tap="text_event">
+                                    <text>{{ new_aftersale_data[item.field] || '' }}</text>
+                                    <text class="bg-white br-green cr-green round padding-horizontal-sm text-size-xs margin-left-sm">{{$t('common.copy')}}</text>
+                                </view>
+                                <view v-else class="content fl br-l padding-left-main">{{ new_aftersale_data[item.field] || '' }}</view>
+                            </view>
+                        </view>
+                    </view>
+
+                    <!-- 快递信息 -->
+                    <view v-if="new_aftersale_data.status > 1 && new_aftersale_data.type == 1" class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                        <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.0876xf')}}</view>
+                        <view class="panel-content oh">
+                            <view v-for="(item, index) in panel_express_data_list" :key="index" class="item br-b oh padding-vertical-main">
+                                <view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
+                                <view class="content fl br-l padding-left-main">{{ new_aftersale_data[item.field] || "" }}</view>
+                            </view>
+                        </view>
+                    </view>
+
+                    <!-- 凭证 -->
+                    <view v-if="(new_aftersale_data.images || null) != null && new_aftersale_data.images.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                        <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-orderaftersale-detail.user-orderaftersale-detail.4y2c1l')}}</view>
+                        <view class="panel-content-images oh">
+                            <view v-for="(item, index) in new_aftersale_data.images" :key="index" class="fl item padding-sm">
+                                <image :src="item" mode="aspectFill" @tap="images_view_event" :data-index="index" class="dis-block radius"></image>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 没有售后数据/售后数据为已取消则可以重新申请售后 -->
+            <view v-if="new_aftersale_data == null || new_aftersale_data.status == 5">
+                <!-- 类型选择 -->
+                <view v-if="aftersale_type_list.length > 0" class="choose-type padding-main border-radius-main bg-white oh spacing-mb">
+                    <block v-for="(item, index) in aftersale_type_list" :key="index">
+                        <view :class="'choose-item radius padding-main br ' + (index == 0 ? 'fl' : 'fr') + ' ' + (form_type == item.value ? 'br-main' : '')" :data-value="item.value" @tap="form_type_event">
+                            <view class="fw-b margin-bottom-xs">{{ item.name }}</view>
+                            <view class="cr-grey">{{ item.desc }}</view>
+                        </view>
+                    </block>
+                </view>
+
+                <!-- 表单 -->
+                <view v-if="form_type != null" class="form-container oh spacing-mb">
+                    <view class="form-gorup">
+                        <view class="form-gorup-title">{{$t('user-orderaftersale-detail.user-orderaftersale-detail.bprwq9')}}<text class="form-group-tips-must">*</text></view>
+                        <picker @change="form_reason_event" :value="form_reason_index" :range="reason_data_list">
+                            <view :class="'picker ' + (form_reason_index == null ? 'cr-grey' : 'cr-base') + ' arrow-right'">
+                                {{ form_reason_index == null ? $t("user-orderaftersale-detail.user-orderaftersale-detail.21icul") : reason_data_list[form_reason_index] }}
+                            </view>
+                        </picker>
+                    </view>
+
+                    <view v-if="form_type == 1" class="form-gorup">
+                        <view class="form-gorup-title"
+                            >{{$t('user-orderaftersale-detail.user-orderaftersale-detail.85pnkf')}}<text class="form-group-tips">{{$t('user-orderaftersale-detail.user-orderaftersale-detail.84upo4')}}{{ returned_data.returned_quantity }}</text></view
+                        >
+                        <slider @change="form_number_event" min="0" :max="returned_data.returned_quantity" step="1" :value="returned_data.returned_quantity" show-value></slider>
+                    </view>
+
+                    <view class="form-gorup">
+                        <view class="form-gorup-title"
+                            >{{$t('order-detail.order-detail.v52n5r')}}<text class="form-group-tips">{{$t('user-orderaftersale-detail.user-orderaftersale-detail.1252if')}}{{ returned_data.refund_price }}</text></view
+                        >
+                        <input type="digit" @input="form_price_event" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('user-orderaftersale-detail.user-orderaftersale-detail.9kvu52')" :value="form_price" />
+                    </view>
+
+                    <view class="form-gorup">
+                        <view class="form-gorup-title">{{$t('user-orderaftersale-detail.user-orderaftersale-detail.9p6b1y')}}</view>
+                        <textarea @input="form_msg_event" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('user-orderaftersale-detail.user-orderaftersale-detail.4f8u0c')" maxlength="200" :auto-height="true" :value="form_msg"></textarea>
+                    </view>
+
+                    <view class="form-gorup form-container-upload oh">
+                        <view class="form-gorup-title">{{$t('user-orderaftersale-detail.user-orderaftersale-detail.4y9355')}}<text class="form-group-tips">{{$t('user-orderaftersale-detail.user-orderaftersale-detail.1l42ms')}}</text></view>
+                        <view class="form-upload-data oh">
+                            <block v-if="form_images_list.length > 0">
+                                <view v-for="(item, index) in form_images_list" :key="index" class="item fl">
+                                    <text class="delete-icon" @tap="upload_delete_event" :data-index="index">x</text>
+                                    <image :src="item" @tap="upload_show_event" :data-index="index" mode="aspectFill"></image>
+                                </view>
+                            </block>
+                            <image v-if="(form_images_list || null) == null || form_images_list.length < 3" class="item fl upload-icon" :src="common_static_url + 'upload-icon.png'" mode="aspectFill" @tap="file_upload_event"></image>
+                        </view>
+                    </view>
+                    <view class="form-gorup form-gorup-submit">
+                        <button class="bg-main br-main cr-white round text-size" type="default" @tap="form_submit_event" hover-class="none" :disabled="form_button_disabled">{{$t('form.form.4yd066')}}</button>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </view>
+
+        <block v-if="new_aftersale_data != null && new_aftersale_data.status != 5">
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </block>
+
+        <!-- 退货弹层 -->
+        <component-popup :propShow="popup_delivery_status" propPosition="bottom" @onclose="popup_delivery_close_event">
+            <view class="delivery-popup bg-base padding-horizontal-main padding-top-main">
+                <view class="fr oh">
+                    <view class="fr" @tap.stop="popup_delivery_close_event">
+                        <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                    </view>
+                </view>
+                <view class="margin-top-xxxl padding-top-xxl">
+                    <view class="form-container">
+                        <view class="form-gorup">
+                            <view class="form-gorup-title">{{$t('invoice-detail.invoice-detail.2000a0')}}<text class="form-group-tips-must">*</text></view>
+                            <input type="text" @input="form_express_name_event" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('user-orderaftersale-detail.user-orderaftersale-detail.6d14hq')" :value="form_express_name" />
+                        </view>
+                        <view class="form-gorup">
+                            <view class="form-gorup-title">{{$t('user-order-detail.user-order-detail.2byl8l')}}<text class="form-group-tips-must">*</text></view>
+                            <input type="text" @input="form_express_number_event" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('user-orderaftersale-detail.user-orderaftersale-detail.8tt862')" :value="form_express_number" />
+                        </view>
+                        <view class="form-gorup form-gorup-submit">
+                            <button class="bg-main br-main cr-white round text-size" type="default" @tap="form_delivery_submit_event" hover-class="none" :disabled="form_button_disabled">{{$t('form.form.4yd066')}}</button>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </component-popup>
+
+        <!-- 客服弹窗 -->
+        <component-popup :propShow="plugins_intellectstools_service_status" propPosition="bottom" @onclose="plugins_intellectstools_service_close_event">
+            <view class="padding-top-main bg-white">
+                <view class="padding-horizontal-main">
+                    <view class="close oh">
+                        <view class="fr" @tap.stop="plugins_intellectstools_service_close_event">
+                            <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                        </view>
+                    </view>
+                </view>
+                <view class="popup-service-container">
+                    <view v-if="(plugins_intellectstools_data || null) != null" class="header-service">
+                        <view v-if="(plugins_intellectstools_data.chat || null) != null" class="item padding-main br-t-f9 single-text">
+                            <text class="va-m">{{$t('detail.detail.r4124d')}}</text>
+                            <view class="dis-inline-block chat-info cp" @tap="chat_event">
+                                <image class="dis-inline-block va-m" :src="plugins_intellectstools_data.chat.icon" mode="scaleToFill"></image>
+                                <text class="margin-left-sm va-m cr-blue" :data-value="plugins_intellectstools_data.chat.chat_url">{{ plugins_intellectstools_data.chat.name }}</text>
+                            </view>
+                        </view>
+                        <view v-if="(plugins_intellectstools_data.service_qq || null) != null" class="item padding-main br-t-f9 single-text">
+                            <text>Q Q：</text>
+                            <text class="cp" @tap="text_event" data-event="copy" :data-value="plugins_intellectstools_data.service_qq">{{ plugins_intellectstools_data.service_qq }}</text>
+                        </view>
+                        <view v-if="(plugins_intellectstools_data.service_tel || null) != null" class="item padding-main br-t-f9 single-text">
+                            <text>{{$t('order.order.7dxbm5')}}</text>
+                            <text class="cp" @tap="text_event" data-event="tel" :data-value="plugins_intellectstools_data.service_tel">{{ plugins_intellectstools_data.service_tel }}</text>
+                        </view>
+                        <view v-if="(plugins_intellectstools_data.service_weixin || null) != null || (plugins_intellectstools_data.service_line || null) != null" class="oh qrcode tc br-t-f9 padding-top-main">
+                            <view v-if="(plugins_intellectstools_data.service_weixin || null) != null" class="item padding-bottom-lg dis-inline-block">
+                                <image class="radius cp" :src="plugins_intellectstools_data.service_weixin" mode="scaleToFill" @tap="image_show_event" :data-value="plugins_intellectstools_data.service_weixin"></image>
+                                <view>{{$t('detail.detail.54k10s')}}</view>
+                            </view>
+                            <view v-if="(plugins_intellectstools_data.service_line || null) != null" class="item padding-bottom-lg dis-inline-block">
+                                <image class="radius cp" :src="plugins_intellectstools_data.service_line" mode="scaleToFill" @tap="image_show_event" :data-value="plugins_intellectstools_data.service_line"></image>
+                                <view>{{$t('detail.detail.vj4nom')}}</view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </component-popup>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentPopup from "@/components/popup/popup";
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+
+    var common_static_url = app.globalData.get_static_url("common");
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                data_bottom_line_status: false,
+                popup_delivery_status: false,
+                // 接口数据
+                editor_path_type: "",
+                order_data: null,
+                new_aftersale_data: null,
+                step_data: null,
+                returned_data: null,
+                return_only_money_reason: [],
+                return_money_goods_reason: [],
+                aftersale_type_list: [],
+                reason_data_list: [],
+                return_goods_address: null,
+                // 售后基础信息
+                panel_base_data_list: [
+                    {
+                        name: this.$t('user-orderaftersale-detail.user-orderaftersale-detail.50cm8m'),
+                        field: "type_text",
+                    },
+                    {
+                        name: this.$t('user-order-detail.user-order-detail.n18sd2'),
+                        field: "order_no",
+                        is_copy: 1
+                    },
+                    {
+                        name: this.$t('user-orderaftersale-detail.user-orderaftersale-detail.17j4cy'),
+                        field: "status_text",
+                    },
+                    {
+                        name: this.$t('user-orderaftersale-detail.user-orderaftersale-detail.r2oy43'),
+                        field: "reason",
+                    },
+                    {
+                        name: this.$t('user-orderaftersale-detail.user-orderaftersale-detail.c53k23'),
+                        field: "number",
+                    },
+                    {
+                        name: this.$t('order-detail.order-detail.v52n5r'),
+                        field: "price",
+                    },
+                    {
+                        name: this.$t('user-orderaftersale-detail.user-orderaftersale-detail.9p6b1y'),
+                        field: "msg",
+                    },
+                    {
+                        name: this.$t('user-orderaftersale-detail.user-orderaftersale-detail.5t586p'),
+                        field: "refundment_text",
+                    },
+                    {
+                        name: this.$t('invoice-detail.invoice-detail.rpdwd3'),
+                        field: "refuse_reason",
+                    },
+                    {
+                        name: this.$t('common.apply_time'),
+                        field: "apply_time",
+                    },
+                    {
+                        name: this.$t('user-order-detail.user-order-detail.9vivhl'),
+                        field: "confirm_time",
+                    },
+                    {
+                        name: this.$t('user-orderaftersale-detail.user-orderaftersale-detail.bifwmx'),
+                        field: "delivery_time",
+                    },
+                    {
+                        name: this.$t('user-orderaftersale-detail.user-orderaftersale-detail.8n414b'),
+                        field: "audit_time",
+                    },
+                    {
+                        name: this.$t('user-order-detail.user-order-detail.1jpv4n'),
+                        field: "cancel_time",
+                    },
+                    {
+                        name: this.$t('common.add_time'),
+                        field: "add_time",
+                    },
+                    {
+                        name: this.$t('common.upd_time'),
+                        field: "upd_time",
+                    },
+                ],
+                // 快递信息
+                panel_express_data_list: [
+                    {
+                        name: this.$t('invoice-detail.invoice-detail.2000a0'),
+                        field: "express_name",
+                    },
+                    {
+                        name: this.$t('user-order-detail.user-order-detail.2byl8l'),
+                        field: "express_number",
+                    },
+                    {
+                        name: this.$t('user-orderaftersale-detail.user-orderaftersale-detail.bifwmx'),
+                        field: "delivery_time",
+                    },
+                ],
+                // 表单数据
+                form_button_disabled: false,
+                form_type: null,
+                form_reason_index: null,
+                form_price: "",
+                form_msg: "",
+                form_number: 0,
+                form_images_list: [],
+                form_express_name: "",
+                form_express_number: "",
+                // 智能工具插件、客服信息展示
+                plugins_intellectstools_data: null,
+                plugins_intellectstools_service_status: false,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentPopup,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: params,
+                popup_delivery_status: (params.is_delivery_popup || 0) == 1,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            // 获取数据
+            init() {
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("aftersale", "orderaftersale"),
+                    method: "POST",
+                    data: {
+                        oid: this.params.oid,
+                        did: this.params.did,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_list_loding_status: 3,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: "",
+                                editor_path_type: data.editor_path_type || "",
+                                order_data: data.order_data || null,
+                                new_aftersale_data: (data.new_aftersale_data || null) == null || data.new_aftersale_data.length <= 0 ? null : data.new_aftersale_data,
+                                step_data: data.step_data || null,
+                                returned_data: data.returned_data || null,
+                                return_only_money_reason: data.return_only_money_reason || [],
+                                return_money_goods_reason: data.return_money_goods_reason || [],
+                                aftersale_type_list: data.aftersale_type_list || [],
+                                return_goods_address: data.return_goods_address || null,
+                                form_price: data.returned_data || null != null ? data.returned_data.refund_price : '',
+                                plugins_intellectstools_data: data.plugins_intellectstools_data || null,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, "init")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 类型选择
+            form_type_event(e) {
+                var value = e.currentTarget.dataset.value;
+                this.setData({
+                    form_type: value,
+                    form_reason_index: this.form_type == value ? this.form_reason_index : null,
+                    reason_data_list: value == 0 ? this.return_only_money_reason : this.return_money_goods_reason,
+                    form_number: value == 0 ? 0 : this.returned_data.returned_quantity,
+                });
+            },
+
+            // 原因选择
+            form_reason_event(e) {
+                this.setData({
+                    form_reason_index: e.detail.value,
+                });
+            },
+
+            // 商品件数
+            form_number_event(e) {
+                this.setData({
+                    form_number: e.detail.value,
+                });
+            },
+
+            // 退款金额
+            form_price_event(e) {
+                this.setData({
+                    form_price: e.detail.value,
+                });
+            },
+
+            // 退款说明
+            form_msg_event(e) {
+                this.setData({
+                    form_msg: e.detail.value,
+                });
+            },
+
+            // 快递名称
+            form_express_name_event(e) {
+                this.setData({
+                    form_express_name: e.detail.value,
+                });
+            },
+
+            // 快递单号
+            form_express_number_event(e) {
+                this.setData({
+                    form_express_number: e.detail.value,
+                });
+            },
+
+            // 上传图片预览
+            upload_show_event(e) {
+                uni.previewImage({
+                    current: this.form_images_list[e.currentTarget.dataset.index],
+                    urls: this.form_images_list,
+                });
+            },
+
+            // 图片删除
+            upload_delete_event(e) {
+                var self = this;
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('order.order.psi67g'),
+                    success(res) {
+                        if (res.confirm) {
+                            var list = self.form_images_list;
+                            list.splice(e.currentTarget.dataset.index, 1);
+                            self.setData({
+                                form_images_list: list,
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 文件上传
+            file_upload_event(e) {
+                var self = this;
+                uni.chooseImage({
+                    count: 3,
+                    success(res) {
+                        var success = 0;
+                        var fail = 0;
+                        var length = res.tempFilePaths.length;
+                        var count = 0;
+                        self.upload_one_by_one(res.tempFilePaths, success, fail, count, length);
+                    },
+                });
+            },
+
+            // 采用递归的方式上传多张
+            upload_one_by_one(img_paths, success, fail, count, length) {
+                var self = this;
+                if (self.form_images_list.length < 3) {
+                    uni.uploadFile({
+                        url: app.globalData.get_request_url("index", "ueditor"),
+                        filePath: img_paths[count],
+                        name: "upfile",
+                        formData: {
+                            action: "uploadimage",
+                            path_type: self.editor_path_type,
+                        },
+                        success: function (res) {
+                            success++;
+                            if (res.statusCode == 200) {
+                                var data = typeof res.data == "object" ? res.data : JSON.parse(res.data);
+                                if (data.code == 0 && (data.data.url || null) != null) {
+                                    var list = self.form_images_list;
+                                    list.push(data.data.url);
+                                    self.setData({
+                                        form_images_list: list,
+                                    });
+                                } else {
+                                    app.globalData.showToast(data.msg);
+                                }
+                            }
+                        },
+                        fail: function (e) {
+                            fail++;
+                        },
+                        complete: function (e) {
+                            count++;
+
+                            // 下一张
+                            if (count >= length) {
+                                // 上传完毕，作一下提示
+                                //app.showToast('上传成功' + success +'张', 'success');
+                            } else {
+                                // 递归调用，上传下一张
+                                self.upload_one_by_one(img_paths, success, fail, count, length);
+                            }
+                        },
+                    });
+                }
+            },
+
+            // 售后表单提交
+            form_submit_event(e) {
+                // 表单数据
+                var form_data = {
+                    order_id: this.params.oid,
+                    order_detail_id: this.params.did,
+                    type: this.form_type,
+                    reason: this.reason_data_list[this.form_reason_index],
+                    number: this.form_type == 0 ? 0 : this.form_number,
+                    price: this.form_price,
+                    msg: this.form_msg,
+                    images: this.form_images_list.length > 0 ? JSON.stringify(this.form_images_list) : "",
+                };
+
+                // 防止金额大于计算的金额
+                var refund_price = parseFloat(this.returned_data["refund_price"]);
+                if (form_data["price"] > refund_price) {
+                    form_data["price"] =refund_price;
+                }
+
+                // 防止数量大于计算的数量
+                var returned_quantity = parseInt(this.returned_data["returned_quantity"]);
+                if (form_data["number"] > returned_quantity) {
+                    form_data["number"] = returned_quantity;
+                }
+
+                // 数据校验
+                var validation = [
+                    {
+                        fields: "type",
+                        msg: this.$t('user-orderaftersale-detail.user-orderaftersale-detail.23v6rp'),
+                        is_can_zero: 1,
+                    },
+                    {
+                        fields: "reason",
+                        msg: this.$t('user-orderaftersale-detail.user-orderaftersale-detail.21icul'),
+                    },
+                ];
+                if (form_data["type"] == 1) {
+                    validation.push({
+                        fields: "number",
+                        msg: this.$t('user-orderaftersale-detail.user-orderaftersale-detail.dn3423'),
+                    });
+                }
+
+                // 校验参数并提交
+                if (app.globalData.fields_check(form_data, validation)) {
+                    var self = this;
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    self.setData({
+                        form_button_disabled: true,
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url("create", "orderaftersale"),
+                        method: "POST",
+                        data: form_data,
+                        dataType: "json",
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, "success");
+                                setTimeout(function () {
+                                    self.setData({
+                                        form_button_disabled: false,
+                                    });
+                                    self.init();
+                                }, 1000);
+                            } else {
+                                self.setData({
+                                    form_button_disabled: false,
+                                });
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            self.setData({
+                                form_button_disabled: false,
+                            });
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 退货开启弹层
+            delivery_submit_event(e) {
+                this.setData({
+                    popup_delivery_status: true,
+                });
+            },
+
+            // 退货弹层关闭
+            popup_delivery_close_event(e) {
+                this.setData({
+                    popup_delivery_status: false,
+                });
+            },
+
+            // 退货表单
+            form_delivery_submit_event(e) {
+                // 表单数据
+                var form_data = {
+                    id: this.new_aftersale_data.id,
+                    express_name: this.form_express_name,
+                    express_number: this.form_express_number,
+                };
+
+                // 数据校验
+                var validation = [
+                    {
+                        fields: "express_name",
+                        msg: this.$t('user-orderaftersale-detail.user-orderaftersale-detail.c9e2ms'),
+                    },
+                    {
+                        fields: "express_number",
+                        msg: this.$t('user-orderaftersale-detail.user-orderaftersale-detail.ld10pm'),
+                    },
+                ];
+
+                // 校验参数并提交
+                if (app.globalData.fields_check(form_data, validation)) {
+                    var self = this;
+                    uni.showLoading({
+                        title: this.$t('common.processing_in_text'),
+                    });
+                    self.setData({
+                        form_button_disabled: true,
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url("delivery", "orderaftersale"),
+                        method: "POST",
+                        data: form_data,
+                        dataType: "json",
+                        success: (res) => {
+                            uni.hideLoading();
+                            self.setData({
+                                popup_delivery_status: false,
+                            });
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, "success");
+                                setTimeout(function () {
+                                    self.setData({
+                                        form_button_disabled: false,
+                                    });
+                                    self.init();
+                                }, 1000);
+                            } else {
+                                self.setData({
+                                    form_button_disabled: false,
+                                });
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            self.setData({
+                                form_button_disabled: false,
+                            });
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
+            },
+
+            // 凭证图片预览
+            images_view_event(e) {
+                uni.previewImage({
+                    current: this.new_aftersale_data.images[e.currentTarget.dataset.index],
+                    urls: this.new_aftersale_data.images,
+                });
+            },
+
+            // 查看售后数据
+            show_aftersale_event(e) {
+                app.globalData.url_open('/pages/user-orderaftersale/user-orderaftersale?keywords=' + this.new_aftersale_data.order_no);
+            },
+
+            // 开启客服弹层
+            plugins_intellectstools_service_open_event(e) {
+                this.setData({
+                    plugins_intellectstools_service_status: true,
+                });
+            },
+            
+            // 关闭客服弹层
+            plugins_intellectstools_service_close_event(e) {
+                this.setData({
+                    plugins_intellectstools_service_status: false,
+                });
+            },
+
+            // 图片预览
+            image_show_event(e) {
+                app.globalData.image_show_event(e);
+            },
+
+            // 进入客服系统
+            chat_event() {
+                app.globalData.chat_entry_handle(this.plugins_intellectstools_data.chat.chat_url);
+            },
+
+            // 文本事件
+            text_event(e) {
+                app.globalData.text_event_handle(e);
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import "./user-orderaftersale-detail.css";
+</style>
diff --git a/pages/user-orderaftersale/user-orderaftersale.css b/pages/user-orderaftersale/user-orderaftersale.css
new file mode 100644
index 0000000..d6ded5c
--- /dev/null
+++ b/pages/user-orderaftersale/user-orderaftersale.css
@@ -0,0 +1,27 @@
+/*
+* 导航
+*/
+.nav-base .item {
+    width: 14.28%;
+}
+
+/*
+* 列表
+*/
+.goods-base {
+    min-height: 160rpx;
+    margin-left: 180rpx;
+}
+.goods-title {
+    line-height: 36rpx;
+}
+.list-item .goods-item:not(:last-child) {
+    border-bottom: 1px dashed #efefef;
+}
+.goods-item {
+    padding: 20rpx 10rpx;
+}
+.goods-image {
+    width: 160rpx;
+    height: 160rpx;
+}
\ No newline at end of file
diff --git a/pages/user-orderaftersale/user-orderaftersale.vue b/pages/user-orderaftersale/user-orderaftersale.vue
new file mode 100644
index 0000000..327b421
--- /dev/null
+++ b/pages/user-orderaftersale/user-orderaftersale.vue
@@ -0,0 +1,368 @@
+<template>
+    <view :class="theme_view">
+        <!-- 导航 -->
+        <view class="nav-base bg-white">
+            <block v-for="(item, index) in nav_status_list" :key="index">
+                <view v-if="nav_status_index == index" class="item fl tc cr-main nav-active-line" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+                <view v-else class="item fl tc" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+            </block>
+        </view>
+
+        <!-- 订单列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="60">
+            <view v-if="data_list.length > 0" class="padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="list-item padding-horizontal-main padding-top-main border-radius-main bg-white oh spacing-mb">
+                    <view class="item-base oh br-b padding-bottom-main">
+                        <text class="cr-base">{{ item.add_time }}</text>
+                        <text class="fr cr-red">{{ item.status_text }}</text>
+                    </view>
+                    <view :data-value="'/pages/user-orderaftersale-detail/user-orderaftersale-detail?oid=' + item.order_id + '&did=' + item.order_detail_id" @tap="url_event" class="goods-item oh cp">
+                        <image class="goods-image fl radius" :src="item.order_data.items.images" mode="aspectFill"></image>
+                        <view class="goods-base pr">
+                            <view class="multi-text">{{ item.order_data.items.title }}</view>
+                            <view v-if="item.order_data.items.spec != null" class="margin-top-sm">
+                                <block v-for="(sv, si) in item.order_data.items.spec" :key="si">
+                                    <text v-if="si > 0" class="cr-grey padding-left-xs padding-right-xs">;</text>
+                                    <text class="cr-grey">{{ sv.value }}</text>
+                                </block>
+                            </view>
+                            <view class="margin-top-sm">
+                                <text class="fw-b">{{ item.order_data.currency_data.currency_symbol }}{{ item.order_data.items.price }}</text>
+                                <text class="margin-left-sm">x{{ item.order_data.items.buy_number }}</text>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="item-describe padding-vertical-main">
+                        <text class="cr-base">{{ item.type_text }}</text>
+                        <text class="cr-grey margin-left-sm margin-right-sm">/</text>
+                        <text class="cr-base">{{ item.reason }}</text>
+                        <block v-if="item.price > 0">
+                            <text class="cr-grey margin-left-sm margin-right-sm">/</text>
+                            <text class="sales-price text-size-sm">{{ item.order_data.currency_data.currency_symbol }}{{ item.price }}</text>
+                        </block>
+                        <block v-if="item.number > 0">
+                            <text class="cr-grey margin-left-sm margin-right-sm">/</text>
+                            <text class="cr-main fw-b">{{ item.number }}</text>
+                        </block>
+                    </view>
+                    <view v-if="item.status <= 2 || item.status == 4" class="item-operation tr br-t padding-vertical-main">
+                        <button v-if="item.status != 3 && item.status != 5" class="br-yellow cr-yellow bg-white round" type="default" size="mini" @tap="cancel_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('common.cancel')}}</button>
+                        <button v-if="item.status == 1 && item.type == 1" class="br-green cr-green bg-white round" type="default" size="mini" @tap="delivery_event" :data-oid="item.order_id" :data-did="item.order_detail_id" :data-index="index" hover-class="none">{{$t('user-orderaftersale.user-orderaftersale.10c251')}}</button>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentNoData from "@/components/no-data/no-data";
+    import componentBottomLine from "@/components/bottom-line/bottom-line";
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: "",
+                data_bottom_line_status: false,
+                data_is_loading: 0,
+                // 接口数据
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                form_keyword_value: "",
+                // 导航
+                // 状态（0待确认, 1待退货, 2待审核, 3已完成, 4已拒绝, 5已取消）
+                nav_status_list: [
+                    { name: this.$t('common.all'), value: "-1" },
+                    { name: this.$t('user-orderaftersale.user-orderaftersale.3wggcu'), value: "0" },
+                    { name: this.$t('user-orderaftersale.user-orderaftersale.1kcn16'), value: "1" },
+                    { name: this.$t('user-orderaftersale.user-orderaftersale.2kzi0t'), value: "2" },
+                    { name: this.$t('order.order.15lr5l'), value: "3" },
+                    { name: this.$t('user-orderaftersale.user-orderaftersale.1p5456'), value: "4" },
+                    { name: this.$t('order.order.1k98tk'), value: "5" },
+                ],
+                nav_status_index: 0,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentNoData,
+            componentBottomLine,
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 是否指定状态
+            var nav_status_index = 0;
+            if ((params.status || null) != null) {
+                for (var i in this.nav_status_list) {
+                    if (this.nav_status_list[i]["value"] == params.status) {
+                        nav_status_index = i;
+                        break;
+                    }
+                }
+            }
+            this.setData({
+                params: params,
+                form_keyword_value: params.keywords || "",
+                nav_status_index: nav_status_index,
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
+        methods: {
+            // 获取数据
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    this.get_data_list();
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false,
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        uni.stopPullDownRefresh();
+                        return false;
+                    }
+                }
+
+                // 是否加载中
+                if (this.data_is_loading == 1) {
+                    return false;
+                }
+                this.setData({
+                    data_is_loading: 1,
+                    data_list_loding_status: 1,
+                });
+
+                // 加载loding
+                if(this.data_page > 1) {
+                    uni.showLoading({
+                        title: this.$t('common.loading_in_text'),
+                    });
+                }
+
+                // 参数
+                var status = (this.nav_status_list[this.nav_status_index] || null) == null ? -1 : this.nav_status_list[this.nav_status_index]["value"];
+                uni.request({
+                    url: app.globalData.get_request_url("index", "orderaftersale"),
+                    method: "POST",
+                    data: {
+                        page: this.data_page,
+                        keywords: this.form_keyword_value || "",
+                        status: status,
+                        is_more: 1,
+                    },
+                    dataType: "json",
+                    success: (res) => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = res.data.data.data;
+                                } else {
+                                    var temp_data_list = this.data_list || [];
+                                    var temp_data = res.data.data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: res.data.data.total,
+                                    data_page_total: res.data.data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1,
+                                    data_is_loading: 0,
+                                });
+
+                                // 是否还有数据
+                                this.setData({
+                                    data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_list_loding_msg: this.$t('common.no_relevant_data_tips'),
+                                    data_list: [],
+                                    data_bottom_line_status: false,
+                                    data_is_loading: 0,
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
+                                data_is_loading: 0,
+                            });
+
+                            if (app.globalData.is_login_check(res.data, this, "get_data_list")) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        if(this.data_page > 1) {
+                            uni.hideLoading();
+                        }
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                            data_is_loading: 0,
+                        });
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 导航事件
+            nav_event(e) {
+                this.setData({
+                    nav_status_index: e.currentTarget.dataset.index || 0,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
+
+            // 输入框事件
+            input_event(e) {
+                this.setData({
+                    form_keyword_value: e.detail.value,
+                });
+            },
+
+            // 取消
+            cancel_event(e) {
+                uni.showModal({
+                    title: this.$t('common.warm_tips'),
+                    content: this.$t('order.order.pn78ns'),
+                    confirmText: this.$t('common.confirm'),
+                    cancelText: this.$t('recommend-list.recommend-list.w9460o'),
+                    success: (result) => {
+                        if (result.confirm) {
+                            // 参数
+                            var id = e.currentTarget.dataset.value;
+                            var index = e.currentTarget.dataset.index;
+
+                            // 加载loding
+                            uni.showLoading({
+                                title: this.$t('common.processing_in_text'),
+                            });
+                            uni.request({
+                                url: app.globalData.get_request_url("cancel", "orderaftersale"),
+                                method: "POST",
+                                data: {
+                                    id: id,
+                                },
+                                dataType: "json",
+                                success: (res) => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        var temp_data_list = this.data_list;
+                                        temp_data_list[index]["status"] = 5;
+                                        temp_data_list[index]["status_text"] = this.$t('order.order.1k98tk');
+                                        this.setData({
+                                            data_list: temp_data_list,
+                                        });
+                                        app.globalData.showToast(res.data.msg, "success");
+                                    } else {
+                                        if (app.globalData.is_login_check(res.data)) {
+                                            app.globalData.showToast(res.data.msg);
+                                        } else {
+                                            app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+                                        }
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast(this.$t('common.internet_error_tips'));
+                                },
+                            });
+                        }
+                    },
+                });
+            },
+
+            // 退货
+            delivery_event(e) {
+                var oid = e.currentTarget.dataset.oid || 0;
+                var did = e.currentTarget.dataset.did || 0;
+                if (oid == 0 || did == 0) {
+                    app.globalData.showToast(this.$t('user-order-detail.user-order-detail.5k6k56'));
+                    return false;
+                }
+
+                // 进入售后页面
+                app.globalData.url_open('/pages/user-orderaftersale-detail/user-orderaftersale-detail?oid=' + oid + '&did=' + did + '&is_delivery_popup=1');
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            }
+        },
+    };
+</script>
+<style>
+    @import "./user-orderaftersale.css";
+</style>
diff --git a/pages/user/user.css b/pages/user/user.css
new file mode 100644
index 0000000..7ea4f71
--- /dev/null
+++ b/pages/user/user.css
@@ -0,0 +1,156 @@
+/**
+ * 顶部内容
+ */
+.top-content {
+    background-repeat: no-repeat;
+    background-size: 100% auto;
+    width: 100%;
+    min-height: 300rpx;
+}
+.top-content .content .user-top {
+    /* #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || MP-ALIPAY || H5 || APP */
+    padding-top: var(--status-bar-height);
+    /* #endif */
+}
+
+/**
+ * 头部
+ */
+.head-base {
+    padding: 40rpx 40rpx 22rpx 40rpx;
+    /* #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || MP-ALIPAY || H5 || APP */
+    padding-top: 120rpx;
+    /* #endif */
+}
+.head-base .head-id {
+    height: 36rpx;
+    line-height: 36rpx;
+    background: linear-gradient(90deg, #FFE3DC 0%, #FF9F67 100%);
+}
+.head-avatar {
+    width: 116rpx;
+    height: 116rpx !important;
+}
+.head-base .base-info {
+    max-width: 340rpx;
+}
+
+/**
+ * 头部右上角
+ */
+.head-right {
+    z-index: 10;
+}
+.head-right .item .badge-icon {
+    top: -10px;
+    right: -2px;
+}
+
+/**
+ * 会员码
+ */
+.qrcode-content {
+    height: 108rpx;
+    line-height: 108rpx;
+    background-size: 100% 100%;
+    color: #FEF6CF;
+}
+.qrcode-content.divider-r::after {
+    right: 50%;
+    height: 30%;
+    background: #FEF6CF;
+}
+.qrcode .icon {
+    width: 48rpx;
+    margin-right: 18rpx;
+    position: relative;
+    top: 6rpx;
+}
+.qrcode .iconfont {
+    top: calc(50% - 10rpx);
+    right: 48rpx;
+}
+
+/**
+ * 底部内容
+ */
+.user-bottom {
+    padding: 20rpx 24rpx;
+    border-radius: 8px 8px 0px 0px;
+}
+
+.user-bottom.box-shadow {
+    box-shadow: 0px -8px 8px 2px rgba(0, 0, 0, 0.2);
+}
+
+/**
+ * 行内导航列表
+ */
+.nav-content .nav-all-order-goods {
+    width: 138rpx;
+    padding: 16rpx 16rpx 16rpx 12rpx;
+}
+.nav-content .nav-all-order-goods::before {
+    content: '';
+    width: 26rpx;
+    height: 130rpx;
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAACCCAYAAABcigjdAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAGKADAAQAAAABAAAAggAAAAB5g0ocAAAGbklEQVRoBdVaPW8sNRTNzm4SAkV6BFJESUWPhEB6Ej+DAiHxC/gN/AMoKCio6KBISxc+lCYpyEORXkSaSGTzXh55CfnYmeWcuz6OxzueZGc9SFi6scf2nON77rVnd7KDlVkZuDqsmvrCcbWnakS19Y+iTl2G4GFb46oJwvEUiQ1ycgiidlxzXlgEGteaY/0pDzTpIRLNIxjnikz9KykCTg7B1daNJRoVTIDhfM2xOkWgSeGNnuT8/PzD9fX1tzCpKoqiPDk5+Wlra+sE136OAGKCuQluYq1/NBq9DXsXYyUIJhsbG78KMK6LuKPlmiQiokSTqqomrGGSCs16iT2oj94Dxv0FwIdY/RR1AbnicX+9iAf+JjToCe8FR1Hc3NzIs3COtTsTDAYDIyBJdg9CcBLc3t7+zzzgqiMvTO+mP11jYFlEImdJiR5K03hRyvcBksdnUlsMFiUwwuFwSPAhjIRV9iwCqF/9dDod9rEPpL3VvXoAb1r3QacY8PwhMFKVUg3W1tZQNRdOXLiEGYSbe/OAWWRPtewxkAfIIJOqbR90kiiIgRFkj4HbaAbOGMAY7MbS2QPIFB54jeDs7ESA+/xOJsbd3V1eDxRkgvPYXl1dRbO5dPJAQQakEbR50GknBx4MkarT7FnElcMLbjSeFnZcNAuEiamBtn5KxII59KAVo3UwRRJIZCSYlzeLHCDBZam1dJMoABZBvx60pSlX0KVwxVp90ZamnfaBA9fzgM+EZMniAdDzxoDnD0BDy++BSFyd3YNakLNnEY8HGINsMmU/rqOjIikPA9Mpi8LnATDsVCVYU+m8DxRkgBaTySTpRScPAFoLcvYYcNWhZc+i3j2IsojeNMXA+rLEAAQqMZGdKRpsqvWlLx6rxaDvLBri1U68AH/dVSLexw1mx8XV1VX4TKjJtCwBwTY2Nzff90ueNTxJTJDSXPfzxjtoPkbNL2Z2PyT6Al9CPsd16Aku7wtvlMl9CstPtQTiGyfaa7DR0dHReziPfseJeg77C3bGGsSfYZyFGDTvicBZa5D6xiQkoA1OT08/Augh7CVsDHvBGiSfYpxFOHbxWAJ5QZKV8Xj8BKDPYBew57CX8OwMJJ8Y6oxkjkBeNHkQEhjJ2dnZxwA+hl3CKNkr2Pj6+vqJI2klaCKRTKpXHMmfjuRv1Hwj+T2RqdOyZXB8fPwHQF8AiDFTcDdD4DAGKYmUTVo562J/f/8drPZnEFSwf2DXsKlLW8/xGIIwVQ384OBgCwElOAuBb9lA39fb29ucT1wrIYHSq01/WzmAfiMgyh1swkZZll8dHh4SnMWHICZoAlcGrT59+vRNgP9CQBRKQyP4Nzs7OxszbB8Lu1yEYAUp+CUBwwLwb3d3d18PwBXsRxNQd3qxhmfwjw6cslTw5ru9vb03HDi9F/hcDB7SnwTrAPwhILi6uLj4IAH+4BPN3TdX6dRkTdNK505jH+U5iPYOAtGMAMd1CBy279MogaeVxcNaOesSksXj/rqrByKwfxZFHnhwNNq/pYczo7aXB/0kkyyqOd3ay3jA1evfXQRsLF0J5IHV2BeN4OxchsB70BKDzgTSXcEOta95s6wHRtBXmkqisg+JFGRJVJMlvOgqkYB7lciT/BcS9ZJF3oPsGw0fUwjuswhfY/N7oOcxiEiWLDmyyLhSDF0Jwn1AqbJLZDHA+wqC55cIwBXB+ZGFBNmziJKwOGmq7FlEcCePJMoeA3KYPL3EIAInUX4P3MrtkzXaydJ1H4Ty8NtMdgJKIpIyexY5cB12/cYAZCRKlk4xwGkdSsR23izCOzvpz7ofD4KHTi8xsJ9eURoefNnTNJDITtTsacogO4ns2M5+XNMDeUGy7B7gS7d5EBx6efeBy3sddPmzSPIwg0CWP4sICtNZVOI/gXl3MgPrSMwD/PwHl82l01kEqBpBdg9AYBLxwcx29p1MD1yAGYcquwfMomAPVH3EwILrpOKPyPJmkTt7PImLBfjmy6JZZK93KBGLk6nMLhGxtZux5vwSuSBrJ1OqZFlUIgFJf56qDEHeIBvi7MMvf1Sc/6EPNxRg82SZIKdcZ5DDGKTmJX85Lq3D2oPgR2SM3QgkGk+9nZwjIEjT5Fo/3l0/w+7lGV2CrLq8vHwlprgWmGqOsy0Lr9lWsUMOF/JK83XNedbmi2yWmGDWW+9Xn+bzHmoU3hvOsfa/SSd6djJis1kAAAAASUVORK5CYII=);
+    background-size: 100% auto;
+    background-repeat: no-repeat;
+    background-position: center left;
+    position: absolute;
+    left: -10rpx;
+    top: 50%;
+    transform: translateY(-50%);
+}
+.nav-list .nav-item {
+    box-sizing: border-box;
+}
+.nav-list .nav-item .item-icon {
+    width: 40rpx;
+    height: 40rpx;
+}
+.nav-list .nav-item .item-desc {
+    margin-right: 50rpx;
+    margin-top: 2rpx;
+    width: calc(100% - 300rpx);
+}
+.nav-list .nav-item .item-arrow {
+    width: 25rpx;
+}
+.nav-list-sub {
+    padding: 16rpx 16rpx 16rpx 0;
+}
+.nav-content .nav-all-order-goods .item .item-icon,
+.nav-list-sub .item .item-icon {
+    width: 56rpx;
+    height: 56rpx;
+}
+.nav-list-sub .item .badge-icon {
+    top: -2px;
+    left: calc(50% + 35rpx);
+    z-index: 1;
+}
+
+/**
+ * 聚合导航
+ */
+.nav-box .nav-item {
+    box-sizing: border-box;
+    width: 25%;
+}
+.nav-box .nav-item .item-icon {
+    width: 52rpx;
+    height: 52rpx !important;
+}
+.nav-box .nav-item .item-desc {
+    margin-right: 50rpx;
+    margin-top: 2rpx;
+    width: calc(100% - 300rpx);
+}
+.service-nav .show-type-submit {
+    width: 50rpx;
+    height: 50rpx !important;
+    top: 18rpx;
+    right: 20rpx;
+}
\ No newline at end of file
diff --git a/pages/user/user.vue b/pages/user/user.vue
new file mode 100644
index 0000000..b39fcb0
--- /dev/null
+++ b/pages/user/user.vue
@@ -0,0 +1,546 @@
+<template>
+    <view :class="theme_view">
+        <!-- 顶部内容 -->
+        <view class="top-content">
+            <!-- 内容 -->
+            <view class="content">
+                <view class="user-top bg-white">
+                    <view class="head-base pr flex-row jc-sb align-c">
+                        <!-- 左侧头像 -->
+                        <view class="head-left">
+                            <image data-value="/pages/personal/personal" @tap="url_event" @error="user_avatar_error" class="head-avatar circle bg-white va-m" :src="avatar" mode="widthFix"></image>
+                            <view class="va-m dis-inline-block margin-left-lg base-info">
+                                <view class="flex-col align-b" data-value="/pages/personal/personal" @tap="url_event">
+                                    <view class="va-m fw-b text-size single-text">{{ nickname }}</view>
+                                    <view v-if="(user || null) != null && (user.number_code || null) != null" class="head-id border-radius-sm padding-horizontal-sm margin-top-sm dis-inline-block fw-b">
+                                        <text class="text-size-xs">ID </text>
+                                        <text class="text-size-xss padding-left-xs pr bottom-xs">{{ user.number_code }}</text>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                        <!-- 右上角 -->
+                        <view class="head-right cr-black">
+                            <view class="item pr dis-inline-block margin-left-xxl" data-value="/pages/setup/setup" data-login="0" @tap="url_event">
+                                <iconfont name="icon-setup" size="46rpx"></iconfont>
+                            </view>
+                            <view class="item pr dis-inline-block margin-left-xxl" data-value="/pages/message/message" @tap="url_event">
+                                <iconfont name="icon-bell" size="46rpx"></iconfont>
+                                <view class="badge-icon pa">
+                                    <component-badge :propNumber="message_total"></component-badge>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                    <!-- 副导航 -->
+                    <view v-if="common_app_is_head_vice_nav == 1 && head_nav_list.length > 0" class="head-nav oh padding-main flex-row align-c jc-sa tc">
+                        <block v-for="(item, index) in head_nav_list" :key="index">
+                            <view class="flex-1 flex-width cp" :data-value="'/pages/' + item.url + '/' + item.url" @tap="url_event">
+                                <view class="head-nav-item">
+                                    <view class="nav-value fw-b text-size margin-bottom-sm">{{ item.count }}</view>
+                                    <view class="nav-name text-size-sm">{{ item.name }}</view>
+                                </view>
+                            </view>
+                        </block>
+                    </view>
+                    <!-- 会员码 付款码 -->
+                    <view v-if="(payment_page_url || null) !== null || (membership_page_url || null) !== null" class="qrcode padding-horizontal-main pr oh">
+                        <view class="qrcode-content flex-row align-c text-size-md" :style="'background-image: url(' + static_url + 'qrcode-bg.png)'" :class="(payment_page_url || null) == null || (membership_page_url || null) == null ? 'jc-sb' : 'jc-sa divider-r'">
+                            <view v-if="(membership_page_url || null) != null" class="padding-horizontal-lg pr z-i ht-auto" :class="(payment_page_url || null) == null || (membership_page_url || null) == null ? 'wh-auto' : 'tc flex-width-half'" :data-value="membership_page_url" @tap="url_event">
+                                <view class="item pr top-lg dis-inline-block"> <image class="icon" :src="static_url + 'membership-code.png'" mode="widthFix"></image> </view>{{ $t('member-code.member-code.26bu38') }}</view
+                            >
+                            <view v-if="(payment_page_url || null) != null" class="padding-horizontal-lg pr z-i ht-auto" :class="(payment_page_url || null) == null || (membership_page_url || null) == null ? 'wh-auto' : 'tc flex-width-half'" :data-value="payment_page_url" @tap="url_event">
+                                <view class="item pr top-lg dis-inline-block">
+                                    <image class="icon" :src="static_url + 'payment-code.png'" mode="widthFix"></image>
+                                </view>
+                                <text>{{ $t('user.user.91h03v') }}</text>
+                            </view>
+                        </view>
+                        <iconfont v-if="(payment_page_url || null) == null || (membership_page_url || null) == null" name="icon-arrow-right" propClass="iconfont pa" color="#FEF6CF"></iconfont>
+                    </view>
+                </view>
+
+                <!-- 中间导航 -->
+                <view :class="'user-bottom padding-horizontal-main ' + ((payment_page_url || null) !== null || (membership_page_url || null) !== null ? 'box-shadow' : '')">
+                    <!-- 主要的订单+副导航 -->
+                    <block v-if="(main_navigation_data || null) != null && main_navigation_data.length > 0">
+                        <block v-for="(item, index) in main_navigation_data" :key="index">
+                            <block v-if="(item.extension_data || null) != null && item.extension_data.length > 0">
+                                <view class="nav-list bg-white bg-white padding-vertical-main border-radius-main spacing-mb">
+                                    <view class="nav-content flex-row jc-sb align-c">
+                                        <!-- 副导航 -->
+                                        <view class="nav-list-sub oh flex-row jc-sa align-c flex-1">
+                                            <block v-for="(items, index2) in item.extension_data" :key="index2">
+                                                <view class="flex-1 cp" :data-value="items.url" @tap="url_event">
+                                                    <view class="item pr tc">
+                                                        <view class="badge-icon pa">
+                                                            <component-badge :propNumber="items.count"></component-badge>
+                                                        </view>
+                                                        <image class="item-icon margin-bottom-xs" :src="items.icon" mode="aspectFill"></image>
+                                                        <view class="item-name cr-base text-size-sm">{{ items.name }}</view>
+                                                    </view>
+                                                </view>
+                                            </block>
+                                        </view>
+                                        <!-- 主导航 -->
+                                        <view class="nav-all-order-goods pr" :data-value="item.url || item.event_value" @tap="url_event">
+                                            <view class="item pr tc">
+                                                <image class="item-icon margin-bottom-xs" :src="item.icon || item.images_url" mode="aspectFill"></image>
+                                                <view class="item-name cr-base text-size-sm">{{ item.name }}</view>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </block>
+                        </block>
+                    </block>
+
+                    <!-- 聚合导航 -->
+                    <view class="service-nav padding-main border-radius-main bg-white spacing-mb">
+                        <!-- 列表模式 -->
+                        <view v-if="nav_show_model_type == 1" class="nav-list">
+                            <block v-for="(item, index) in navigation" :key="index">
+                                <view :data-value="item.event_value" :data-type="item.event_type" @tap="navigation_event" :class="'nav-item cp padding-main ' + (index > 0 ? 'br-t-e' : '')">
+                                    <view class="arrow-right">
+                                        <image :src="item.images_url" class="item-icon va-m" mode="widthFix"></image>
+                                        <text class="item-name va-m cr-base margin-left-sm text-size-sm">{{ item.name }}</text>
+                                        <text v-if="(item.desc || null) != null" class="item-desc fr tr single-text cr-grey-9 text-size-sm">{{ item.desc }}</text>
+                                    </view>
+                                </view>
+                            </block>
+                            <!-- 清除缓存 -->
+                            <view v-if="(nav_logout_data || null) != null" class="nav-item br-t cp padding-main" @tap="remove_user_cache_event">
+                                <view class="arrow-right">
+                                    <image :src="common_static_url + nav_logout_data.icon + '-icon.png'" class="item-icon va-m" mode="widthFix"></image>
+                                    <text class="item-name va-m cr-base margin-left-sm text-size-sm">{{ nav_logout_data.name }}</text>
+                                </view>
+                            </view>
+                            <!-- 联系客服 -->
+                            <view v-if="(common_app_customer_service_tel || null) != null" class="nav-item br-t cp padding-main" @tap="call_event">
+                                <view class="arrow-right">
+                                    <image :src="common_static_url + 'customer-service-icon.png'" class="item-icon va-m" mode="widthFix"></image>
+                                    <text class="item-name va-m cr-base margin-left-sm text-size-sm">{{ $t('user.user.ki1nor') }}</text>
+                                </view>
+                            </view>
+                        </view>
+                        <!-- 默认九方格模式 -->
+                        <view v-else class="nav-box oh margin-top-sm">
+                            <block v-for="(item, index) in navigation" :key="index">
+                                <view :data-value="item.event_value" :data-type="item.event_type" @tap="navigation_event" class="nav-item padding-vertical-main padding-horizontal-xs fl tc cp">
+                                    <image :src="item.images_url" class="item-icon" mode="widthFix"></image>
+                                    <view class="item-name single-text cr-base text-size-sm">{{ item.name }}</view>
+                                </view>
+                            </block>
+                            <!-- 清除缓存 -->
+                            <view v-if="(nav_logout_data || null) != null" class="nav-item padding-vertical-main padding-horizontal-xs fl tc cp" @tap="remove_user_cache_event">
+                                <image :src="common_static_url + nav_logout_data.icon + '-icon.png'" class="item-icon" mode="widthFix"></image>
+                                <view class="item-name single-text cr-base text-size-sm">{{ nav_logout_data.name }}</view>
+                            </view>
+                            <!-- 联系客服 -->
+                            <view v-if="(common_app_customer_service_tel || null) != null" class="nav-item padding-vertical-main padding-horizontal-xs fl tc cp" @tap="call_event">
+                                <image :src="common_static_url + 'customer-service-icon.png'" class="item-icon" mode="widthFix"></image>
+                                <view class="item-name single-text cr-base text-size-sm">{{ $t('user.user.ki1nor') }}</view>
+                            </view>
+                        </view>
+                    </view>
+
+                    <!-- 用户中心公告 -->
+                    <view v-if="(common_user_center_notice || null) != null" class="padding-horizontal-main">
+                        <uni-notice-bar class="padding-0 margin-0" show-icon scrollable :text="common_user_center_notice" background-color="transparent" color="#666" />
+                    </view>
+
+                    <!-- 版权信息 -->
+                    <component-copyright></component-copyright>
+                </view>
+            </view>
+        </view>
+
+        <!-- 在线客服 -->
+        <component-online-service :propIsNav="true" :propIsBar="true"></component-online-service>
+
+        <!-- 快捷导航 -->
+        <component-quick-nav :propIsNav="true" :propIsBar="true"></component-quick-nav>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentQuickNav from '@/components/quick-nav/quick-nav';
+    import componentBadge from '@/components/badge/badge';
+    import componentCopyright from '@/components/copyright/copyright';
+    import componentOnlineService from '@/components/online-service/online-service';
+
+    var common_static_url = app.globalData.get_static_url('common');
+    var static_url = app.globalData.get_static_url('user');
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                common_static_url: common_static_url,
+                static_url: static_url,
+                avatar: app.globalData.data.default_user_head_src,
+                user: null,
+                nickname: '',
+                message_total: 0,
+                nav_logout_data: null,
+                // 头部小导航
+                head_nav_list: [],
+                // 主要的订单+副导航
+                main_navigation_data: [],
+                // 远程自定义导航
+                navigation: [],
+                // 基础配置
+                common_app_customer_service_tel: null,
+                common_user_center_notice: null,
+                common_app_is_online_service: 0,
+                common_app_is_head_vice_nav: 0,
+                // 会员码地址
+                membership_page_url: null,
+                // 付款码地址
+                payment_page_url: null,
+                // 用户中心菜单展示模式
+                nav_show_model_type: app.globalData.data.user_center_nav_show_model_type,
+            };
+        },
+
+        components: {
+            componentCommon,
+            componentQuickNav,
+            componentBadge,
+            componentCopyright,
+            componentOnlineService
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 资源设置
+            this.set_resources_data();
+
+            // 初始化配置
+            this.init_config();
+
+            // 数据加载
+            this.init();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show({object: this, method: 'init'});
+            }
+        },
+
+        // 下拉刷新
+        onPullDownRefresh(e) {
+            this.init();
+        },
+
+        methods: {
+            // 资源设置
+            set_resources_data() {
+                // 当前用户信息
+                var user = app.globalData.get_user_cache_info() || null;
+                // 导航名称处理
+                var old_nav = this.head_nav_list;
+                var head_nav_list = [
+                    {
+                        name: this.$t('promotion-order.promotion-order.iwa646'),
+                        url: 'user-order',
+                        count: old_nav.length > 0 ? old_nav[0].count : 0,
+                    },
+                    {
+                        name: this.$t('user.user.3q4p8k'),
+                        url: 'user-favor',
+                        count: old_nav.length > 0 ? old_nav[1].count : 0,
+                    },
+                    {
+                        name: this.$t('user.user.57xw84'),
+                        url: 'user-goods-browse',
+                        count: old_nav.length > 0 ? old_nav[2].count : 0,
+                    },
+                    {
+                        name: this.$t('user.user.k78280'),
+                        url: 'user-integral',
+                        count: old_nav.length > 0 ? old_nav[3].count : 0,
+                    },
+                ];
+                var nav_logout_data = (user == null) ? null : {
+                    name: this.$t('user.user.2k0227'),
+                    icon: 'logout',
+                };
+
+                this.setData({
+                    user: user,
+                    head_nav_list: head_nav_list,
+                    nav_logout_data: nav_logout_data,
+                    nickname: this.nickname || this.$t('login.login.6yfr9g'),
+                });
+            },
+
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    // 会员码及付款码入口
+                    var membership_page_url = null;
+                    var payment_page_url = null;
+                    if (app.globalData.get_config('plugins_base.wallet', null) != null) {
+                        payment_page_url = '/pages/plugins/wallet/payment-code/payment-code';
+                    }
+                    if (app.globalData.get_config('plugins_base.membershiplevelvip', null) != null) {
+                        membership_page_url = '/pages/plugins/membershiplevelvip/member-code/member-code';
+                    }
+                    this.setData({
+                        common_app_customer_service_tel: app.globalData.get_config('config.common_app_customer_service_tel'),
+                        common_user_center_notice: app.globalData.get_config('config.common_user_center_notice'),
+                        common_app_is_online_service: app.globalData.get_config('config.common_app_is_online_service'),
+                        common_app_is_head_vice_nav: app.globalData.get_config('config.common_app_is_head_vice_nav'),
+                        membership_page_url: membership_page_url,
+                        payment_page_url: payment_page_url,
+                    });
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 获取数据
+            init(status = 0) {
+                // 没有用户信息则调用用户登录
+                if(this.user == null) {
+                    app.globalData.get_user_info(this, 'init', 1);
+                }
+                if(status == 1) {
+                    // 资源设置
+                    this.set_resources_data();
+                }
+
+                // 获取数据
+                this.get_data();
+
+                // 设置用户基础数据
+                this.set_user_base();
+
+                // 分享菜单处理
+                app.globalData.page_share_handle();
+            },
+
+            // 设置用户基础信息
+            set_user_base() {
+                if(this.user != null) {
+                    if ((this.user.avatar || null) != null) {
+                        this.setData({
+                            avatar: this.user.avatar,
+                        });
+                    }
+                    if ((this.user.user_name_view || null) != null) {
+                        this.setData({
+                            nickname: this.user.user_name_view,
+                        });
+                    }
+                } else {
+                    // 有用户信息，是否需要绑定手机
+                    if(app.globalData.user_is_bind_mobile(this.user)) {
+                        this.setData({
+                            nickname: this.$t('login.login.np9177')
+                        });
+                    }
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url('center', 'user'),
+                    method: 'POST',
+                    data: {},
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var navigation = data.navigation || [];
+
+                            // 头部小导航总数
+                            var temp_head_nav_list = this.head_nav_list;
+                            temp_head_nav_list[0]['count'] = (data.user_order_count || 0) == 0 ? 0 : data.user_order_count;
+                            temp_head_nav_list[1]['count'] = (data.user_goods_favor_count || 0) == 0 ? 0 : data.user_goods_favor_count;
+                            temp_head_nav_list[2]['count'] = (data.user_goods_browse_count || 0) == 0 ? 0 : data.user_goods_browse_count;
+                            temp_head_nav_list[3]['count'] = (data.integral || 0) == 0 ? 0 : data.integral;
+
+                            // 订单状态总数
+                            var user_order_status_list = [
+                                {
+                                    name: this.$t('user.user.9u8e61'),
+                                    status: 1,
+                                    count: 0,
+                                    url: '/pages/user-order/user-order?status=1',
+                                },
+                                {
+                                    name: this.$t('user.user.66714e'),
+                                    status: 2,
+                                    count: 0,
+                                    url: '/pages/user-order/user-order?status=2',
+                                },
+                                {
+                                    name: this.$t('order.order.q820hx'),
+                                    status: 3,
+                                    count: 0,
+                                    url: '/pages/user-order/user-order?status=3',
+                                },
+                                {
+                                    name: this.$t('user.user.aa1ri3'),
+                                    status: 101,
+                                    count: 0,
+                                    url: '/pages/user-orderaftersale/user-orderaftersale',
+                                },
+                            ];
+                            if ((data.user_order_status || null) != null && data.user_order_status.length > 0) {
+                                for (var i in user_order_status_list) {
+                                    for (var t in data.user_order_status) {
+                                        if (user_order_status_list[i]['status'] == data.user_order_status[t]['status']) {
+                                            user_order_status_list[i]['count'] = data.user_order_status[t]['count'];
+                                            user_order_status_list[i]['icon'] = this.static_url + 'order-icon-' + user_order_status_list[i]['status'] + '.png';
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+
+                            // 导航处理，是否存在主要的订单+副导航
+                            var main_navigation_data = [];
+                            var temp_navigation = [];
+                            if (navigation.length > 0) {
+                                for (var i in navigation) {
+                                    // 去除参数
+                                    var url = app.globalData.get_url_main_part(navigation[i]['event_value']);
+                                    // 系统订单
+                                    var status = true;
+                                    if (url == '/pages/user-order/user-order') {
+                                        var temp = navigation[i];
+                                        temp['extension_data'] = user_order_status_list;
+                                        main_navigation_data.push(temp);
+                                        status = false;
+                                    // 是否存在扩展副导航数据
+                                    } else if((navigation[i]['extension_data'] || null) != null && navigation[i]['extension_data'].length > 0) {
+                                        main_navigation_data.push(navigation[i]);
+                                        status = false;
+                                    }
+                                    if(status) {
+                                        temp_navigation.push(navigation[i]);
+                                    }
+                                }
+                            }
+
+                            // 数据设置
+                            var upd_data = {
+                                message_total: parseInt(data.message_total || 0),
+                                head_nav_list: temp_head_nav_list,
+                                navigation: temp_navigation,
+                                main_navigation_data: main_navigation_data,
+                            };
+
+                            // 用户基础信息处理
+                            if ((data.avatar || null) != null) {
+                                upd_data['avatar'] = data.avatar;
+                            }
+                            if ((data.user_name_view || null) != null) {
+                                upd_data['nickname'] = data.user_name_view;
+                            }
+                            this.setData(upd_data);
+
+                            // 购物车导航角标
+                            app.globalData.set_tab_bar_badge('cart', data.cart_total.buy_number);
+                        } else {
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+
+                        // 分享菜单处理、延时执行，确保基础数据已加载完成
+                        setTimeout(function () {
+                            app.globalData.page_share_handle();
+                        }, 3000);
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        app.globalData.showToast(this.$t('common.internet_error_tips'));
+                    },
+                });
+            },
+
+            // 清除缓存
+            remove_user_cache_event(e) {
+                // 当前页面处理
+                this.setData({
+                    user: null,
+                    nickname: '',
+                    avatar: app.globalData.data.default_user_head_src,
+                    nav_logout_data: null,
+                });
+
+                // 调用公共方法处理
+                app.globalData.remove_user_cache_event();
+                
+                // 资源设置
+                this.set_resources_data();
+
+                // 初始数据
+                this.get_data();
+            },
+
+            // 客服电话
+            call_event() {
+                if (this.common_app_customer_service_tel == null) {
+                    app.globalData.showToast(this.$t('setup.setup.utnr7g'));
+                } else {
+                    app.globalData.call_tel(this.common_app_customer_service_tel);
+                }
+            },
+
+            // 头像加载错误
+            user_avatar_error(e) {
+                this.setData({
+                    avatar: app.globalData.data.default_user_head_src,
+                });
+            },
+
+            // 远程自定义导航事件
+            navigation_event(e) {
+                if(this.is_login()) {
+                    app.globalData.operation_event(e);
+                }
+            },
+
+            // url事件
+            url_event(e) {
+                var login = e.currentTarget.dataset.login;
+                if(login === undefined || login == 1) {
+                    if(this.is_login()) {
+                        app.globalData.url_event(e);
+                    }
+                } else {
+                    app.globalData.url_event(e);
+                }
+            },
+
+            // 是否登录
+            is_login() {
+                if((this.user || null) == null) {
+                    app.globalData.url_open('/pages/login/login?event_callback=init');
+                    return false;
+                }
+                return true;
+            }
+        },
+    };
+</script>
+<style>
+    @import './user.css';
+</style>
diff --git a/pages/web-view/web-view.vue b/pages/web-view/web-view.vue
new file mode 100644
index 0000000..418475f
--- /dev/null
+++ b/pages/web-view/web-view.vue
@@ -0,0 +1,58 @@
+<template>
+    <view :class="theme_view">
+        <web-view :src="web_url"></web-view>
+
+        <!-- 公共 -->
+        <component-common ref="common"></component-common>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                web_url: null
+            };
+        },
+
+        components: {
+            componentCommon
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // url处理
+            var url = decodeURIComponent(params.url) || null;
+            if (url != null) {
+                // token处理
+                if (url.indexOf('{token}') >= 0) {
+                    var user = app.globalData.get_user_cache_info();
+                    var token = user == null ? null : (user.token || null);
+                    if (token != null) {
+                        url = url.replace(/{token}/ig, token);
+                    }
+                }
+            }
+
+            this.setData({
+                web_url: url
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 公共onshow事件
+            if ((this.$refs.common || null) != null) {
+                this.$refs.common.on_show();
+            }
+        },
+
+        methods: {}
+    };
+</script>
\ No newline at end of file
diff --git a/static/icon/iconfont.css b/static/icon/iconfont.css
new file mode 100644
index 0000000..49e03bb
--- /dev/null
+++ b/static/icon/iconfont.css
@@ -0,0 +1,834 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 4227145 */
+  src: 
+       url('data:font/ttf;charset=utf-8;base64,AAEAAAALAIAAAwAwR1NVQiCLJXoAAAE4AAAAVE9TLzI8F2LSAAABjAAAAGBjbWFwPfxsiwAABSQAAA12Z2x5Zs+dNOMAABQ8AACinGhlYWQr/2IYAAAA4AAAADZoaGVhCToFqgAAALwAAAAkaG10eDq///4AAAHsAAADOGxvY2HFjJ0oAAASnAAAAZ5tYXhwAf8BsgAAARgAAAAgbmFtZRCjPLAAALbYAAACZ3Bvc3SeqqYcAAC5QAAACYMAAQAAA4D/gABcBVz//v//BV0AAQAAAAAAAAAAAAAAAAAAAM4AAQAAAAEAALwjzCFfDzz1AAsEAAAAAADjwo8NAAAAAOPCjw3//v+ABV0DgQAAAAgAAgAAAAAAAAABAAAAzgGmACcAAAAAAAIAAAAKAAoAAAD/AAAAAAAAAAEAAAAKADAAPgACREZMVAAObGF0bgAaAAQAAAAAAAAAAQAAAAQAAAAAAAAAAQAAAAFsaWdhAAgAAAABAAAAAQAEAAQAAAABAAgAAQAGAAAAAQAAAAQEAwGQAAUAAAKJAswAAACPAokCzAAAAesAMgEIAAACAAUDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFBmRWQAwOYC//8DgP+AAAAD3ACAAAAAAQAAAAAAAAAAAAAAAAACBAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAD//gQAAAAEAAAABAAAAAQAAAAEAAAABCoAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABDMAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQiAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAFXAAABAAAAAQAAAAEAAAABAAAAAQzAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEVQAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABC4AAAQAAAAEAAAABAAAAAQuAAAAAAAFAAAAAwAAACwAAAAEAAADygABAAAAAALEAAMAAQAAACwAAwAKAAADygAEApgAAAA8ACAABAAc5gLmDeY15k3mpOap5q/mt+a75sHmy+bQ5vPnB+cg5ynnK+ct5zjnP+dB50XnSudd52/nu+fP59borf//AADmAuYN5jXmTeai5qbmrOax5rnmvebD5s3m0ucH5xfnKecr5y3nN+c/50HnRedK51LnX+dx58/n1uit//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAPAA8ADwAPAA8AEAARgBMAFgAXABkAHQAegC8ALwAzgDOAM4AzgDQANAA0ADQANAA5gEGAZoBmgGaAAAAeQB4AG4AdADLAM0AzADJAMoAxwDIAMMAxADFAMYAwQDCAL0AvgC/AMAAvAC7ALoAuQC0ALUAtgC3ALgAswCxALIAowCwAK8ArgCsAK0AqwCdAKkAqgCmAKcAqACkAKUAogChAKAAngCfAJwAmwCZAJoAlwCYAJYAlQCUAJMAkgCOAI8AkACRAI0AjACKAIsAhwCIAIkAegCGACAAggCDAIQAhQB/AIAAgQB+AH0ASQB8AFwAIQBIAEYARwBbAHAAbAAuAC8AKAAlACYAJwApACoAKwAsAC0AMAAxADIAMwA0ADUANgA3ADgAOQA6ADsAPAA9AD4APwBAAEEAdwBCAEMARABFAEoASwB2ACMATABNAE4ATwBQAFEAUgBTAFQAVQBWAFcAXQBYAFkAXgBfAGAAYQBiAGMAZABlAFoAZgBnAGgAaQBqAG0AdQBvAHEAJAByAHMAIgAbAB4AHQAcABkAGgAYABcAFQAWABMAEgARABAABwAIAAkACgALAAwADQACAA4AawAPAAYAAwAEAAEAHwAFABQAAAEGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAACawAAAAAAAAAzQAA5gIAAOYCAAAAeQAA5g0AAOYNAAAAeAAA5jUAAOY1AAAAbgAA5k0AAOZNAAAAdAAA5qIAAOaiAAAAywAA5qMAAOajAAAAzQAA5qQAAOakAAAAzAAA5qYAAOamAAAAyQAA5qcAAOanAAAAygAA5qgAAOaoAAAAxwAA5qkAAOapAAAAyAAA5qwAAOasAAAAwwAA5q0AAOatAAAAxAAA5q4AAOauAAAAxQAA5q8AAOavAAAAxgAA5rEAAOaxAAAAwQAA5rIAAOayAAAAwgAA5rMAAOazAAAAvQAA5rQAAOa0AAAAvgAA5rUAAOa1AAAAvwAA5rYAAOa2AAAAwAAA5rcAAOa3AAAAvAAA5rkAAOa5AAAAuwAA5roAAOa6AAAAugAA5rsAAOa7AAAAuQAA5r0AAOa9AAAAtAAA5r4AAOa+AAAAtQAA5r8AAOa/AAAAtgAA5sAAAObAAAAAtwAA5sEAAObBAAAAuAAA5sMAAObDAAAAswAA5sQAAObEAAAAsQAA5sUAAObFAAAAsgAA5sYAAObGAAAAowAA5scAAObHAAAAsAAA5sgAAObIAAAArwAA5skAAObJAAAArgAA5soAAObKAAAArAAA5ssAAObLAAAArQAA5s0AAObNAAAAqwAA5s4AAObOAAAAnQAA5s8AAObPAAAAqQAA5tAAAObQAAAAqgAA5tIAAObSAAAApgAA5tMAAObTAAAApwAA5tQAAObUAAAAqAAA5tUAAObVAAAApAAA5tYAAObWAAAApQAA5tcAAObXAAAAogAA5tgAAObYAAAAoQAA5tkAAObZAAAAoAAA5toAAObaAAAAngAA5tsAAObbAAAAnwAA5twAAObcAAAAnAAA5t0AAObdAAAAmwAA5t4AAObeAAAAmQAA5t8AAObfAAAAmgAA5uAAAObgAAAAlwAA5uEAAObhAAAAmAAA5uIAAObiAAAAlgAA5uMAAObjAAAAlQAA5uQAAObkAAAAlAAA5uUAAOblAAAAkwAA5uYAAObmAAAAkgAA5ucAAObnAAAAjgAA5ugAAOboAAAAjwAA5ukAAObpAAAAkAAA5uoAAObqAAAAkQAA5usAAObrAAAAjQAA5uwAAObsAAAAjAAA5u0AAObtAAAAigAA5u4AAObuAAAAiwAA5u8AAObvAAAAhwAA5vAAAObwAAAAiAAA5vEAAObxAAAAiQAA5vIAAObyAAAAegAA5vMAAObzAAAAhgAA5wcAAOcHAAAAIAAA5xcAAOcXAAAAggAA5xgAAOcYAAAAgwAA5xkAAOcZAAAAhAAA5xoAAOcaAAAAhQAA5xsAAOcbAAAAfwAA5xwAAOccAAAAgAAA5x0AAOcdAAAAgQAA5x4AAOceAAAAfgAA5x8AAOcfAAAAfQAA5yAAAOcgAAAASQAA5ykAAOcpAAAAfAAA5ysAAOcrAAAAXAAA5y0AAOctAAAAIQAA5zcAAOc3AAAASAAA5zgAAOc4AAAARgAA5z8AAOc/AAAARwAA50EAAOdBAAAAWwAA50UAAOdFAAAAcAAA50oAAOdKAAAAbAAA51IAAOdSAAAALgAA51MAAOdTAAAALwAA51QAAOdUAAAAKAAA51UAAOdVAAAAJQAA51YAAOdWAAAAJgAA51cAAOdXAAAAJwAA51gAAOdYAAAAKQAA51kAAOdZAAAAKgAA51oAAOdaAAAAKwAA51sAAOdbAAAALAAA51wAAOdcAAAALQAA510AAOddAAAAMAAA518AAOdfAAAAMQAA52AAAOdgAAAAMgAA52EAAOdhAAAAMwAA52IAAOdiAAAANAAA52MAAOdjAAAANQAA52QAAOdkAAAANgAA52UAAOdlAAAANwAA52YAAOdmAAAAOAAA52cAAOdnAAAAOQAA52gAAOdoAAAAOgAA52kAAOdpAAAAOwAA52oAAOdqAAAAPAAA52sAAOdrAAAAPQAA52wAAOdsAAAAPgAA520AAOdtAAAAPwAA524AAOduAAAAQAAA528AAOdvAAAAQQAA53EAAOdxAAAAdwAA53IAAOdyAAAAQgAA53MAAOdzAAAAQwAA53QAAOd0AAAARAAA53UAAOd1AAAARQAA53YAAOd2AAAASgAA53cAAOd3AAAASwAA53gAAOd4AAAAdgAA53kAAOd5AAAAIwAA53oAAOd6AAAATAAA53sAAOd7AAAATQAA53wAAOd8AAAATgAA530AAOd9AAAATwAA534AAOd+AAAAUAAA538AAOd/AAAAUQAA54AAAOeAAAAAUgAA54EAAOeBAAAAUwAA54IAAOeCAAAAVAAA54MAAOeDAAAAVQAA54QAAOeEAAAAVgAA54UAAOeFAAAAVwAA54YAAOeGAAAAXQAA54cAAOeHAAAAWAAA54gAAOeIAAAAWQAA54kAAOeJAAAAXgAA54oAAOeKAAAAXwAA54sAAOeLAAAAYAAA54wAAOeMAAAAYQAA540AAOeNAAAAYgAA544AAOeOAAAAYwAA548AAOePAAAAZAAA55AAAOeQAAAAZQAA55EAAOeRAAAAWgAA55IAAOeSAAAAZgAA55MAAOeTAAAAZwAA55QAAOeUAAAAaAAA55UAAOeVAAAAaQAA55YAAOeWAAAAagAA55cAAOeXAAAAbQAA55gAAOeYAAAAdQAA55kAAOeZAAAAbwAA55oAAOeaAAAAcQAA55sAAOebAAAAJAAA55wAAOecAAAAcgAA550AAOedAAAAcwAA554AAOeeAAAAIgAA558AAOefAAAAGwAA56AAAOegAAAAHgAA56EAAOehAAAAHQAA56IAAOeiAAAAHAAA56MAAOejAAAAGQAA56QAAOekAAAAGgAA56UAAOelAAAAGAAA56YAAOemAAAAFwAA56cAAOenAAAAFQAA56gAAOeoAAAAFgAA56kAAOepAAAAEwAA56oAAOeqAAAAEgAA56sAAOerAAAAEQAA56wAAOesAAAAEAAA560AAOetAAAABwAA564AAOeuAAAACAAA568AAOevAAAACQAA57AAAOewAAAACgAA57EAAOexAAAACwAA57IAAOeyAAAADAAA57MAAOezAAAADQAA57QAAOe0AAAAAgAA57UAAOe1AAAADgAA57YAAOe2AAAAawAA57cAAOe3AAAADwAA57gAAOe4AAAABgAA57kAAOe5AAAAAwAA57oAAOe6AAAABAAA57sAAOe7AAAAAQAA588AAOfPAAAAHwAA59YAAOfWAAAABQAA6K0AAOitAAAAFAABAYMAAQGDAAAAewAAAAAAAAB+AMIBAAFGAYoCNgK8A1oEAgXYBlQGxgioCR4KxgsCC1oLigxKDMgNFg1UDdQOHA6+DyAPQg++D/YQLhEUETwSIBJYEoQSsBLqEzwTXhOYE7gT2hQQFEYUihSuFRYVWhWeFfAWIhZcFp4W2BcwF4IX7Bh2GKwY4hleGbIZ6Bq0GxIbLBuAG6IbxBvqHBAcNhxmHQwdeh3cHiAeZh7AHxwfYB+sICQgkCDsIXAh9CJ4It4lOiVgJdIl/CYmJpQm0CcIJ0QnkifOKBwoeCi2KM4pSim8KfwqZirsKxgrXCvIK9osOCzmLaot6C4OLtwvMC++MDwweDCeMQIxZjG0Mi4yfDMwM9Q0XjS4NTg1vDY8Nqw3tDfUOE44djkEOTg5qDnmOpw7Ajt+O9A8NDyiPRI9Pj1qPbI+ID6SPwI/cEASQHRBREG4QgJCHEKEQtxDMkOYQ+REPESARMRFBkVkRehGKkZoRtRHNkfESEBIgkiySPZJQkl2SaxKDkquSwBLWkvGS/BMWkyQTOhNYk4ETlRPTk+yUBZQkFFOAAAABQAA/7oD0ANQAAwAGQAiAD4AVAAAASIOARQeATI+ATQuAQMiLgE0PgEyHgEUDgETFBYyNjQmIgY3IycuASMhIgYPASMiDgEVERQWMyEyNjURNC4BExQGIyEiJjUTNDY7AT8BIR8BMzIWFQIAQGo+PmqAaj4+akAxVDExVGJUMTFU2B8sHx8sH2NjFwUaDf50DxcGF2McLRo6KQLYKzgaLRQbE/0kFB0BHhSIChcBhhcKiBQeAkQ/bYJtQEBtgm0//lgzVmRVMzNVZFYzAYEXICAtICCjVQ8VFBBVHzgh/cwyPTwzAjQhOB/9VBkkJBkCPxglKFBQKCUYAAAAAwAA//0DugMDAAwAGAAoAAATJjQ3ATYyFhQHAQYiCQEmNDYyFwEWFAYiASImPQE0NjMhMhYdARQGI1IMDAFXDCEYDP6pDCEBS/6pDBghDAFXDBgh/sIMEBAMAycMEBAMAWMMIgwBWgwYIgz+pgz+sgFaDCIYDP6mDCIYAVsQDBkLERAMGQwQAAYAAP+qA3cDVgADAAcACwAPABMAIAAANyERIQERIREXIxUzExEhERcjFTMFNycDNxYGBzY3Njc2qwEA/wABAP8A1aurK/8A1aurAZhe8FthKAIqOiYsDQ+r/wACVf8AAQArqgIq/wABACqrnBvU/s0ci9hXJzpEWmUAAAADAAD//QO6AwMADAAYACgAAAE2NCcBJiIGFBcBFjIJATY0JiIHAQYUFjIBMjY9ATQmIyEiBh0BFBYzA64MDP6pDCEYDAFXDCH+tQFXDBghDP6pDBghAT4MEBAM/NkMEBAMAWMMIgwBWgwYIgz+pgz+sgFaDCIYDP6mDCIYAVsQDBkLERELGQwQAAAAAAIAAP/EA94DPAAZAC0AABciLgI1ETQ+AjMhMh8BITIWFREUBw4BIwEiBhURFBYzITI2NRE0JiMhIi8BhhQkHQ8PHSQUASERCnsBPSk7Hg4kFP0MDRQTDgL0DRQTDv6yEAp8PA8cIxQCtBMlGw8NoDkp/fkpHA4PAzcTDv1MDhMTDgIHDhMNoAAIAAD/2gOrAysAEAAgADEAQQBRAGEAbgB7AAABIy4BPQE+ATsBMhYdARQGJwMiBh0BFBY7ATI2PQE0JiMBIy4BPQE0NjsBMhYdARQGJwMiBh0BFBY7ATI2PQE0JiMBIy4BPQE0NjsBMhYdARQGAyIGHQEUFjsBMjY9ATQmIwEuAz4BMh4BFA4BAyIOARQeATI+ATQuAQF6xic4ATcnxic4OCfGExoaE8YTGxsTAdLGJzg4J8YnODgnxhMbGxPGExoaE/4uxic4OCfGJzg47RMaGhPGExsbEwFvNFk0ATVZaVg1NVg1J0InJ0JOQicnQgGnATcnxic4OCfGJzgBAVEaE8YTGxsTxhMa/q4BNyfGJzg4J8YnOAEBURoTxhMbGxPGExr84QE3J8YnODgnxic4AVIaE8YTGxsTxhMa/q4BNFlpWTQ0WWlZNQFSJ0JOQicnQk5CJwAAAAUAAP/UA2cDQgAvADsARwBTAF8AAAEyHgEGKwEiBhURFBYzITI2NRE0JisBIiY0NjsBMh4BFREUDgEjISIuATURND4BMwEyFhQGIyEiJjQ2MyUyFhQGIyEuATQ2MyUyFhQGIyEiJjQ2MzcyFhQGKwEiJjQ2MwEeDxUBFg84CQwMCQIiCQwMCTgPFhYPOBorGRkrGv3eGisaGisaAaoPFRUP/sAPFRUPAUAPFRUP/sAPFRUPAUAPFRUP/sAPFRUP6g8VFQ+GDxYWDwNBFR8WDQn9VAkNDQkCrAkNFh8WGywa/VQaLRoaLRoCrBosGv3aFh8WFh8WlhYfFgEVHxaXFh8WFh8W+hYfFhYfFgAHAAD/yAO4AzgAEAAlADEAPQBMAFoAaAAABSIuAjQ+AjIeAhQOAgMiBwYHBhQXFhcWMjc2NzY0JyYnJhMhIiY0NjMhMhYUBgchIiY0NjMhMhYUBgciJj0BND4BMh4BHQEUBgMiLwEmPgEWHwEeAQ4BJyIuATY/AT4BHgEPAQYCAFeie0NDe6KuontDQ3uiV2VWVDEzMzFUVspWVDEzMzFUVij+6Q4UFA4BFw4UFA/+6A4TEw4BGA4UFJoOFAkQEhAJFA0OCo0KARQcCo0HAwgQDAsQCAMHjQobFAEJjQo3Q3uirqJ7Q0N7oq6ie0MDKjMxVFbKVlQxMzMxVFbKVlQxM/50FBwTExwUcxQcExMcFIkUDvwJDwkJDwn8DhQBFwqUChwUAQqUBxQTCwELExQHlAkBExwKlAoAAAAAA//+/8gDtQM3ADAAYQB0AAABMh4BFRQGDwEXHgIXFRQOASY1NCcmJyYiBwYHBhUUBiImNSY3PgE/AS4BJzU0PgEHMh4BBiMiDgEVFB4BFzcVFx4BHwEUBg8BFSMiDgEVFA4BJjUmPgE/AScuASc1ND4BBSIOARUUHgEXMzYXPgI1NC4BAi5EdEM0LwsER24/AhQcFCwrSkuwTEkrLBUfFQIfH3NLBC85A0N0uA8XBhMQKUYpJD8mGgIJDAEBCQgFDkdvPhUdFQErUzcDAiYtBDlhATUxUjArSi0BDw8uTi4yVQM3RXVGPGskCAEebI1MEQ0SARAOWk1LKy4uK0tNWg4WFRFQTElyHgIiZToQRnVFOxEcFihFKCZAKAMBAwEDDwoGChEGAgNFeU0OEgESEEJ6YBsBAh1TLg47YzoPMVQyL1AzBAEBBDNRLjFUMgAABgAA/8IDwAM+AFEAmgDlAPIA/AE1AAABHgIXFj8BNhYXHgEHBgcOARYfAR4BBw4BBwYvASYHDgEHIwYHDgEnLgEvAS4BDwEGJicuATc+AyYnJicuATc2NzYXMxY3PgE/AT4BNzYWEx8BFg4BBwYmLwEHDgEvAS4BLwEHDgEPAQYmLwEHBg8BBgcjEQYWNyEyFhcWBgcGByUGJicmNREnLgEvASY3Nj8BPgE3MyE2FgMPAQYPAQ4BBw4BJyIGDwEGFh8BFhQPAQ4BHwEWFzc2HgMXFj8BMjY/AT4BHwEWNz4BLwEuATUmNj8BNiYnLgEjBwYmJy4BJyYfARYOAi4BPgE3NhYHDgEeAT4BNC4BEyEHBh4BFxY2NzY3MTY3PgEXHgEfAR4CNj8BPgE3NhYXHgEXHgI2Nz4BNz4BFx4BHwEeAT4BJwMSBggKBAcSDxMjChAKBQMNCgQECAYLBQcMGRELFAMTCAUIBQEICA8sHw0TCwgEDQsQEiEKDgsDAQcSBgUIBAQLAgoVHgoTAhIJBQcEBAYaEBkslQEhBBkzICNHGAICFToeCBgsEQMDESoWCR48FgIEFBEHEyQFAQ4KARcKEQQHCw4GCv7sGCkJCQUWHgcCBAEBAx4BDwsDAvMMFMcGAgkHAwUIBgsgGggNBgUDBAgHDAwHCAQCBQkNFw8TEQsPBAgREAYIBQUHJRQPEAcLBwUICggBCQwEBwYMBAoKDxAfCgUKBQo/AwsKJjsyGgYeGB5ATg4MCBgdExAajP08HQQQIBMZLQgCAgICBhkKBwcCAQQoNC0DAgEFBgoeBQIDAgcnLSgHAwMCBRwLBgYBAgUzOSQFAYAFDx0HCAECAg8QFyMRCxINDg0KCQ4lDxobBQQDAQMCBAoMEgcNBgYDERQPBgMBAgIPDhUhEAgPGA4NCwUGDykRLAcDAgIDAgkKCxEaBQYKAZMD4CA+LAYIGB0CAxgZAgEDGBMDAxMXAwEDGRgDBBUJAwoD/pIKEQEICAwcBAEBAQEbFhEeAXcDDigXBxERDBXIChACAQ7+LQEBBREHDQ0EDAYECgwKBw0LCRAqEAoJDAYJFgICAQMJDRwFBgEBCAoJExQEAgIIDxQIDA8RCgwXEAYJFREFAgICDg0HIAYMjwYZNygKGjI0KAkNGSMFHB4QBhYbFQkCL8MSJRkCBB0YBg4MBwsIBgQMDAwZJAIlGwsKCwQKCQ0GGQYVHQEcFgYaBwwICAQMDA0cJAozHAAAAAQAAP/UA/ADTAAWACwAQwBHAAAlFgYHBTMyDwEGLwElLgE+ARcFMyU2FjcWBgcFNxYPAQYvASUuAT4BFwUlNhYBBR4BFAYHBTMyDwEGLwElLgE+ATclNhUNASUD1gcND/5qAwEDBRITC/5xDwwMHxABigMBjQ8fBgcND/5qAwEDBRITC/5xDwwMHxABjQGNDx/+YwGOFRkZFf5qAwEDBRITC/5xFRkBGRQBkB3+fAGEAYPFEB8GswEBBgYEsQcfHw0HsLAHDqUPHwezAQEBAQYGBLEHHx8NB7CwBw0BtrIJJy4mCrIBAQYGBLAKJi4nCbMMWK6srAAABQAA/8wDtAM7AA8AGwAxAD0ASwAAATIWFREUBiMhIiY1ETQ2MwUhIhURFDMhMjURNAMWFA8BBiMnJi8BLgE+AhYfATc2MicyFhQGKwEiJjQ2MyU2HgEUDgEnISImNDYzA2YgLi0g/XUgLS0gAor9dgEBAooCYwsLoQsQBgwJVgcGBQ8UFAc4iQsgwRAWFhDgEBYWEAGRChMKChMK/m8QFhYQAzsuIP0tIC0tIALTIC5MAv0tAQEC0wL+eAsfC6ELAQIIVgcUFA8FBgg9iAxUFh8WFh8WugEKEhUSCgEWHxYAAAAABgAA/6sD2QNYAHcAzgEbATABQAFOAAABMhYXFhcWHQEzMh8BFh8BFhcWHwEWBgcGIyIvAS4BLwEmJyYvASYHIxUzFxUHIyc1NzM1IRUzFxUHIyc1NzM1IyIjBwYHDgIHBhUDFRYXHgEXFjMhMh4BFA4BIyUXIyYvASYnJic1Ez4CNzY3MzU0PwE2Nz4BATMWFx4DMzczHgEXHgEHBgcOARYfAR4BBw4BDwEjJyYjBw4BBxUGBwYHIyIuAS8BJiMHBiYnLgE3PgE3Njc2Ji8BLgE3Njc2HwEWMzE3Nj8BPgE3NhcjBw4BDwEOAQcGByMiJyYPAQYWHwEWFA8BDgEfARYXNzMWFx4CFxYzNzI2PwE+AR8BMzY3PgEvASY1JjY/ATYmJyYjBwYmJy4BJyYHMx4BFxYGBwYHIyInBi4BPgIXNhcjBgcOARYXFjsBPgE0JicBIgcGBwYdASE1NC8BJgHtRmMYEQUDNQ0KBx0ZCAwKGgYYAQcICQwGBgEIDAEWBAsFBwUVGTcGBQVRBQUG/tkGBQVQBQUGGgQEBBAPDBMKAgI1AQQDCwYODgG6CRAJCRAJ/kQCCxAQCicSCwE1AxgoGB8iGwEBBQ8aYgF3BxwQBQcJBwwYBg0XBg4IBAILCQMDBwUKBAcKFQ8JBw0ICAYFBgUHBxAaBw4aEAoHBAoWDx0JDAkCAQcHBgQCBAYHCgEIEhoICwgLBAcIBgMFFg4LDAQIBgcEAQQHBQ0XBgkJDAkEAwQGBgoKBgYEAgQICR8HCgkHCgwDBwsQBQcDBAccEBkDBQMKBQQKDAEICgQFBQoECxAOGwkECQQGDgcTIAkMBxITHgcREBkyHgMjMxgNDQQEAwwKBwoHCAQMEhEM/sliIAsDAgEnDAUiA1g4MiAiDxUnAQEGDwUICxohpwoQBgcCAQMOCacPCgYEAw0BLgRNBQVOBC4uBU0FBU4ELgECBQMPFgwFBv5FBgkKBgoCBggQEg8JAgECBAQQJRkbBAG9HTMgCAoCJw0MCyIeMzb95QESBQwZCwIBDQsTHg4KDwsLCggHDR8OFRcEAgIBAQIJCQEPBg0BBRAQDQYCAg0MEhwNCAwLBwgFCwkIDSMPJQYDAQEBAQMPCQ8WAwMzAQMJDAELCwMNAQEBEggFCwkHDiQNCQcJBQgRAgIBBQQLFwQEAQYICA8QAQIBAwwQBw8RDgoTDgUHEQ4FAgIMDAYaBQhMAhURFTMRFQIICQ8rNScKDAYtAQIEFhgGBQISFxMCAoJEFhgMDScmIR0KRAAAAAYAAP/JA5QDNwAUACgAKwA3AEMATwAAATIeARURFA8BBiMhIi4BNRE0PgEzBSEiBhURFBYzITU0Nj8BMxE0JicTIxUnMhYUBgcjLgE0NjMlMhYUBiMhIiY0NjMlMhYUBiMhIiY0NjMDGSE5IQrnCg7+giE5ISE5IQIM/fQaJCQaAVwPDAfMHxcRjJYNERENwwwSEgwBgA0SEg3+gAwSEgwBgA0SEg3+gAwSEgwDNyE5If4bDQrtCiE5IQJ4ITkhPSQa/YgaJNEMEwIBAcMXJAP9wo/uEhkRAQERGRKtEhkRERkSnRIYEhIYEgAACQAA/9gDxQM0AD4AjADUAOMA7QD6AQYBFAElAAABMhYXFTMyHwEeARURFAYiJjURNCYrAQcOASMhIiYvASMiBgcRFBYzITIWFAYjISInLgE1ETQ+ATsBNT4BNyETFhcWFxY/ATYWFx4BBwYHDgEWHwEeAQcOAQcGJyMmDgEHFQYHDgEnLgEvAS4BDwEGJicuATc+AyYvAS4BNzY3NhczFjY/AT4BNzYWDwEGDwEGBw4BJyYPAQYWHwEWFA8BDgEfARYXMj8BNh4DFxY3MzI2PwE+AR8BFjc+AS8BLgI2PwE2JicmDwEGJicuAScmFxYOAicGLgE+Ahc2FgcOAR4BPgEnNiYlMhYUBisBIiY0NjsBNzIWFAYrASImNDYzJTIXFhQHBiMhIiY0NjMlISIGHQEUFjMhMjY9ATQmIwKPJDcFSSQbBg4PERkRFxBKAQc1Iv7fIzUHAUoPFgIXEAFSDBISDP6uKB0ODxotG0kFMiMBJ7sIBwQDBg4NDhsICwgEAgoIAwMGBggDBQkTDQkPAg8LBgUGBgwhGAsOCAcDCgkNDRkICwkDAQUOBAMHBggCCBAXCA4HCg4FBAQUDBMiLQIHBgIGCAkYFQwJBAMEBgUJCQUGAwEEBwsECgMMDw0IDAMHDQ0FBwMEBhwPDA0FCgUFBggFAQcJAwYFCgUODAwXCAQIBAkxCgYfLBQWLBsDHi4VFzE8CwoGFBcQAQEd/pANERENsQwSEgyyOwwREQzuDBERDAH6EQgEBAkQ/gYMEREMAY/+4BAXFxABIQ8XFw8DMy0iBRUFDSIT/vEMEBAMAQ8PFQUfKCgfBRIN/a0PFRAYEBsMIhMCThkrGAUgLQL9+wcTDAQIAQICDAwRGwwJDQsLCQgHCxsMFBQEAwMCBAgJAQ0FCgQEAg0PDAQDAQECCwsQGQwGCxMKCwkICx8NIQUDAgEEDgkNEwQEBycBBAwGEgUJBAIBEgcGCgkHDB8MCAcJBQgQAwEBAQIHChUEBQEHCAcODwMBAgYMEAYJCw4QEQ0EBxENBwIBAQoKBhcFDHETLR8ICwkOJy4kCAoJExkEFhgMBBILEBQYEBgQEBgQoBEXEREYEJ8NBxAGDhAYEPgVDyAOFRUOIA8VAAACAAD/tAPKA0UADQAgAAATND4BFhcBFhQGIicBJgERNDYyFhURATYyFhQHAQ4BLgE7CQ8QBgELCA8XB/70CAGtDxYQAX8IFhAI/lMFEA8JAX0IDgYDBv70BxcPCAELCP5fA1kLDw8L/OgBfggQFgj+VAYDBg4AAAACAAD/vQPDA0MAGwA2AAABFhceARcWFwYHDgEHBgcmJy4BJyYnNjc+ATc2FwYUHwEhIgYWMyEHBh4CPwM2LwMmIgIAeFFdahoWAgIWGmpdUXh4UV1qGhYCAhYaal1RZQgIlf68Dw8PDwFElQcBDxUIwgMEAQECBcIIFgNCAhYaal1ReHhRXWoaFgICFhpqXVF4eFFdahoW7AcWCJUaG5QIFQ8BB8IECgUFBQnBCAAAAAQAAP+6A8YDTQAHAA8AFwAfAAAlFTMVITUzNQERIzUjNTM1IRUzFSMVIxEBFSMVIzUjNQIEjP60lAHtK5qa/MWhoSwCXYwslHyWKyuWAbr+t4wskZEsjAFJARcspaUsAAgAAP/dA6MDIwATACMAOABIAF0AbQCCAJIAAAEyHgEdARQOASsBIi4BPQE0PgEzFyMiBh0BFBY7ATI2PQE0JiUyHgIdARQOASsBIi4BPQE0PgEzFyMiBh0BFBY7ATI2PQE0JgEyHgEdARQOAisBIi4BPQE0PgEzFyMiBh0BFBY7ATI2PQE0JiUyHgIdARQOASsBIi4BPQE0PgEzFyMiBh0BFBY7ATI2PQE0JgFCKUYpKUYpTSlGKSlGKU1NJTY2JU0lNjYBpB44KxcpRilNKUYpKUYpTU0mNTYlTSU2Nv4SKUYpFys4Hk0pRikpRilNTSU2NiVNJTY2AaQeOCsXKUYpTSlGKSlGKU1NJTY2JU0lNjYDIylGKU0pRikpRilNKUYpPTYlTSU2NiVNJTY9Fys4Hk0pRikpRilNKUYpPTYlTSU2NiVNJTb+dClGKU0eOCsXKUYpTSlGKT01Jk0lNjYlTSU2PRcrOB5NKUYpKUYpTSlGKT01Jk0lNjYlTSU2AAQAAP/DA8gDPAArADoARgBSAAATNDYyFhURFBYyPwE2FhcFFj8BNjURNDYyFhURFAYPAQYmJyUmDwEGIyImNQEUBgcGIicuATQ+ATIeAQUUFhc+ATQuASIOARciLgE0PgEzMhYUBjkUHBQHBwOlEioSAQ0FBuQGFBwUGBTkEigR/vIFBqURFCEvAs10dA0iDXR0R3iOeEf+OWFgYGE0WGpYNMESIBISIBIcKCgBrQ4VFQ7+rwUHAVoKAQqfAwNyAwcBJg4VFQ7+2hcnCnIJAQqfAwNZCi8iAd5FqmYMDGaqi3ZGRnZGMoxXV4xmVjMzVnwSICQgEig4KAAAAAQAAP+6A8YDTQANABsAKQA3AAA3FRQeATsBFSMiLgE9ASEVFA4BKwE1MzI+AT0BARUjIg4BHQEjNTQ+ATMhMh4BHQEjNTQuASsBNV8hOSFtbS1NLQOSLE0tbW0hOSH9rW0hOSEsLU0tAkUtTSwrITkhbc5tITkhKyxNLW1tLU0sKyE5IW0CfywhOSFtbS1NLS1NLW1tITkhLAAAAAIAAP+6A8YDTQATACcAAAEyHgEVERQOASMhIi4BNRE0PgEzBSEiDgEVERQeATMhMj4BNRE0LgEDHy1NLCxNLf27LU0tLU0tAkX9uyE5ISE5IQJFITkhITkDTS1NLf27LU0sLE0tAkUtTS0sITkh/bshOSEhOSECRSE5IQAEAAD/rgPSA1IAHwA7AEgAVQAAATIXFhcWFRQGDwEVFh8BHgEHDgEnISInJicmNDc2NzYXIgcGBwYUFxYXFjMhJyYvATQ3PgE1NicmJyYnEzIWHQEOASImPQE0NiMyFh0BFAYiJj0BNDYCAH9saT4/TUYDECQGCQcDAhMM/p9/bGk+Pz8+aWx/bF1aNDc3NFpdbAEJAhAEARFBSAE0MlhZaoAOFQIUGxUV8Q8UFB4UFANRPz5qbX9hs0ICARUdBQcUCQwQAT89aWz9bWo+P0Q2NVpd11xZNTYEFRUHGg45nlZqXFk2NwP+3xUOkg4TFA+QDhUUD5APFBQPkA4VAAAAAgAA/74DwwNDABQALAAAATIXFhcWFAcGBwYiJyYnJjQ3Njc2EyYiBhQfASEiBhQWMyEHBhYzMj8BNjQnAgB6aWY8PT08Zmn0aWY8PT08Zmn3BQ4KBWj+YQYJCQYBnmgICAwHBYMICANCPTxmafRpZjw9PTxmafRpZjw9/s8FCg4FaQoOCmcIFQWBBhMFAAAABwAA/74DwgNCABQAJQBCAE8AXABoAHQAAAEyFxYXFhQHBgcGIicmJyY0NzY3NhciDgIUHgIyPgI0LgITMhYVERQGKwEiJjURNDYyFhURFBY7ATI2NRE0NgcyFh0BFAYiJj0BNDYzMhYdARQGIiY9ATQ2NzIWFAYjISImNDYzJTIWFAYrASImNDYzAgB6aWY8PT08Zmn0aWY8PT08Zml6UJRxPj5xlKCUcT4+cZRHCAsjGd0YIwsQCxQPwg4VC8YICwsQCwt1CAsLEAsLpwkMDAn+VgkMDAkBKggNDQiqCA0NCANCPTxmafRpZjw9PTxmafRpZjw9Lz5xlKCUcT4+cZSglHE+/uYMB/7rGSIiGQEVBwwMB/75DhUVDgEHBwwPDAjgCAsLCOAIDAwI4AgLCwjgCAxLCxALCxALNQsQCwsQCwAABQAA/74DwgNCABQAJQAuADcAQAAABSInJicmNDc2NzYyFxYXFhQHBgcGAyIOAhQeAjI+AjQuAgMUBiImNDYyFhcUBiImNDYyFhcUBiImNDYyFgIAemlmPD09PGZp9GlmPD09PGZpelCUcT4+cZSglHE+PnGU1xomGhomGrQaJhoaJhq0GiYaGiYaQj08Zmn0aWY8PT08Zmn0aWY8PQNVPnGUoJRxPj5xlKCUcT7+bRMaGiYaGhMTGhomGhoTExoaJhoaAAEAAP/AA8cDTQASAAAlPgE1ETQuASMhIg4BFQMUFhcFA5UXGh82IP23IDUfARsXAWiRDSkYAg4aLBoaLBr98hgpDdEAAQAA/7gDigNIAE0AAAUmJyY3Njc2NzY/ARcWFxYXFgc2NzY3NiceARcWBzY3Njc2NzYnJicmJyYnJiceAQcGByYnJicmJzEWBwYHJicmJwYHBgcGBwYHBhceAQFRHQMEEAwbFxAMCAUGBwYHAgMFIRMQBgQETl8DBC1YOTQbFwICEA0aFx0ZGhYODAcICRYgQi87HhQPOStWAwYIFQIRChoVCRAGEA8QZ0c8MyspICciJhwbFQkMDhUWGx0lNi0wKhs3uGRqVjI7Nz44PjY6MzMrKSIcFwoZPxwfEn1YPiUSBmB4W2syGiQoJywbNCoWJB5KOj1sAAACAAAAAAPIAtYACwAeAAABMjY0JiMhIgYUFjMTCQEeAT8BNjQnASYiBwEGFBY2A6QPFBQP/LgPFBQPGAGUAYQJGQoECwn+YgodCv5TCRUcAo8VHRQUHRX93wGv/mEJAgcDCh0KAbkLC/43Ch0UAQAAAgAAAAADyALWAAsAHgAAJTIWFAYjISImNDYzEwkBPgEfARYUBwEGIicBJjQ2FgOkDxQUD/y4DxQUDxgBlAGECRkKBAsJ/mIKHQr+UwkVHKoVHRQUHRUCIf5RAZ4KAgcDCh0L/kgLCwHJCh0UAQAAAAYAAP/EA8kDMAAbADcAUwBlAH4AmwAAAQcjJyY1IwYPASMnMxcWFzM2PwEzFxYXMzY/ASEHIycmJyMGDwEjJzMXFhczNj8BMxcWFzM2PwEhByMnJicjBg8BIyczFxYXMzY/ATMXFhczNj8BJSImNz4CMzIWFAYjIg4BBwYBIi4BJyY+ARYXHgIyPgE3PgEeAQcOAgEiJy4BNz4DMh4CFxYOASYnLgIiDgEHDgEBYDc/HAMCAQIfPjY8GwIBAQECIjgeAQIBAQIZAWs3PxwDAQEBAh8+NjwbAgEBAQIiOB4BAgEBAhkBazc/HAMBAQECHz42PBsCAQEBAiE5HgECAQECGf1UAwQBEkhiNgMDAwMzXkUQAgERVp57IgQHExMEHm2NmYxtHwQTEgcEInud/iMEBAkJAxdQb4KLgW9QFwMIExMDG2+To5RvGwINAcnBcQsODwlywX4JDA0JfX4FEQsLfsFxCw4PCXLBfgkMDQl9fgURCwt+wXELDg8JcsF+CQwNCX1+BRELC35PBQMzTiwEBQMqSjEE/axBeE8JEwgICUZqOjlqRgkICRIJT3dBAiYCAxIJQGtQKilQakAJEgcJCU11QUF2TgcJAAACAAD/rgPBA4AACwAUAAApASIGFBYzITI2NCYDJwERIxEBBwEDl/zSERgYEQMuERgYLzv+01H+yjkBlBgiFxciGAI2Ov7TAj39ugE2Ov5tAAgAAAAAA60C8gAhAEMAVwBrAIAAjQCbAKgAACUhIiY1ETQ2MyEyFhUUBiImNTQmIyEiBhURFBYzITIWFAYjIiY0NjMyNjURNCYjISIGFREUBiImNRE0NjMhMhYVERQGAyMiJj0BNDYyFh0BFBY7ATIWFAYBIyImNDY7ATI2PQE0NjIWHQEOAQEiJj0BNCYrASImNDY7ATIWFxUUBgMiJj0BNDYyFh0BFAY3Ii8BJjQ2Mh8BHgEOASMiJjQ/ATYyFhQPAQYDaf0oHCcnHAE8HCcLEAsRDP7EDBERDALYCAsLCAgLCwgMEREM/ccMEQsQCyccAjkcJyesrBwnCxALEQysBwwM/fAPCAsLCA8MEQsQDAEnAj0ICxEMVwgLCwhXHCcBDNsICwsQCwtKBwZTBQsQBVMEAgQKqggMBlIGEAsGUgUJJxwCYhwoKBwICwsIDBERDP2eDBELEAsLEAsRDAGLDBERDP7+CAsLCAECHCgoHP51HCcCTyccCggLCwgKDBELEAv9sQsQCxEMoggLCwiiHCcB6wsIMwwRDA8MKBwzCAv+oAsIzAgMDAjMCAt6BVMFEAsFUgULCwYLEAZSBgwQBVMFAAAAAAIAAP/EA7wDPAATACMAAAEhIg4BFREUHgEzITI+ATURNC4BExQGIyEiJjURNDYzITIWFQM8/YgiOyMjOyICeCI7IyM7FCQa/ZgaJCQaAmgaJAM8J0Mo/awoQycnQygCVChDJ/0aHioqHgJUHioqHgADAAAAAAPNAxoADwATABcAAAEyFhURFAYjISImNRE0NjMFIREhBSEVIQOaFR4eFfzMFR4eFQM0/MwDNPyZA5r8ZgMaHhb+ABUeHhUCABYeNP4AmTMAAAAAAwAAAAADzQMaAA8AEwAXAAABMhYVERQGIyEiJjURNDYzBSERIQEhFSEDmhUeHhX8zBUeHhUDNPzMAzT8mQOa/GYCgB4V/gAVHh4VAgAVHjP+AALNNAAAAAMAAAAAA9IC9QALABcAIwAAEyEyFhQGIyEiJjQ2EyEyFhQGIyEiJjQ2EyEyFhQGIyEiJjQ2TwNiDRMTDfyeDRMTDQGQDhMTDv5wDRMTDQGQDhMTDv5wDRMTAvQTGxMTGxP+uxQbExMbFP66ExsTExsTAAAAAQAA//ADqgMSADMAABM3Nh4BDwEGIi8BLgE2Mh8BNjc2NzYWFxYXFhcUDgMmJyY+ARceAT4DLgIOAge6LQkZBglTBhIGVQYBDRIGMQo7Olpd0VhWMjMBPGyRnJE5CgYYCTuZn4hSDzhzmKKGVgkBpywJBhkJUQcHUwcRDQYwaFZTLS8KNzZYWmlPkG8/Azg2CBkHCTcwFVqKoJhwMxNXiFEAAAABAAD//QOBAy0AEgAAARUhIgcGBwYVESMRNDc+ATc2MwOB/v9/bWo9QFosKppkaHEDLVpAPWptf/7+AQJxaGSaKiwAAAMAAAAAA9IC9QALABcAIwAAEyEyFhQGIyEiJjQ2ASEyFhQGIyEiJjQ2EyEyFhQGIyEiJjQ2TwNiDRMTDfyeDRMTAd8BkA0TEw3+cA4TEw4BkA0TEw3+cA4TEwL0ExsTExsT/rsUGxMTGxT+uhMbExMbEwAAAQAA/9EDrgMAABEAABc1ITI+AjURMxEUBw4BBwYjgAEBXayDR1osKppkaHEvWkeDrF0BAv7+cmdkmiosAAAAAAEAAAAAA8ECQQAQAAAlASYiBhQXARYyNwE2NCYiBwIA/oYMIhgMAZcMIgwBlwwYIgynAY0MGSMN/lYNDQGqDSMZDAAAAwAAAAADyAG5AAsAFwAjAAATMzIWFAYrASImNDYhMzIWFAYrASImNDYhMzIWFAYrASImNDZHqxEZGRGrEhkZAWerEhkZEqsRGRkBZ6oSGRkSqhIZGQG5GSMZGSMZGSMZGSMZGSMZGSMZAAAAAwAA/78DwQNBAAwAHAAgAAABNCYjISIGFBYzITI2AzI2NRE0JiMhIgYVERQWMyUhESEDwBkU/NoUGRkUAyYUGbMUGRkU/eYUGRkUAe3+QAHAAxMUGRkoGRn8wRkUAhkVGBgV/ecUGVoBwAAAAwAA/88DsQMxAA8AHwAsAAABMhYVERQGIyEiJjURNDYzBSEiBhURFBYzITI2NRE0JgcyFhURFAYiJjURNDYDVSY1NSb9ViY1NSYCqv1WCg0NCgKqCg0NxRAXFyEXFwMwNSb9ViY1NSYCqiY1RA0K/VYKDQ0KAqoKDcEYEP76EBgYEAEGEBgAAAIAAAAAA80DGgAPABMAAAEyFhURFAYjISImNRE0NjMFIREhA5oVHh4V/MwVHh4VAzT8zAM0AxoeFv1nFR4eFQKZFh40/WcAAAQAAAAAA80DGgAPABMAKgBBAAABMhYVERQGIyEiJjURNDYzBSERIQEXJz4BMhYVFxYGJyMiJjQ2MzcnJj4BJTMyHgEGIwcXFg4BLwEXDgEiJjUnJjYDmhUeHhX8zBUeHhUDNPzMAzT+35YCAw0QDAICEQuUCQwMCGaWCgYZ/oGUCAwBDAlmlgoFGQiWAQINEQwBAhADGh4W/WcVHh4VApkWHjT9ZwE9lmgICQwIkQsRAgwRDAGWCBkF5AwRDAGWCBkGCpdoCAkMCJELEQAAAAADAAD/zwOxAzEADwAfACwAAAEyFhURFAYjISImNRE0NjMFISIGFREUFjMhMjY1ETQmBTIWFREUBiImNRE0NgNVJjU1Jv1WJjU1JgKq/VYKDQ0KAqoKDQ395REXFyEYGAMwNSb9ViY1NSYCqiY1RA0K/VYKDQ0KAqoKDcEYEP76EBgYEAEGEBgAAwAA/88DsQMxAA8AHwArAAABMhYVERQGIyEiJjURNDYzBSEiBhURFBYzITI2NRE0JgMyFhQGIyEiJjQ2MwNVJjU1Jv1WJjU1JgKq/VYKDQ0KAqoKDQ3cEBgYEP76EBgYEAMwNSb9ViY1NSYCqiY1RA0K/VYKDQ0KAqoKDf4iFyEXFyEXAAAAAAIAAP/AA80DQQAeADMAAAUGIi8BDgEjIicmJyY0NzY3NjIXFhcWFRQGBxcWFAcBIgcGBwYUFxYXFjI3Njc2NCcmJyYDwQsgC7U3h0hsXlo1Nzc1Wl7ZXVs1NywqtwsL/g5XTEkqLS0qSUyvS0krLCwrSUs1Cwu2MDI3NVtd2V5aNTc3NVpebER/NLcLIAwDKC0qSUyvS0krLCwrSUuvTEkqLQAABAAAAAADzQMaAA8AEwAXABsAAAEyFhURFAYjISImNRE0NjMFIREhASEVIREhFSEDmhUeHhX8zBUeHhUDNPzMAzT8mQOa/GYDmvxmAoAeFf6ZFR4eFQFnFR4z/pkCNDT9ZzMAAAMAAAAAA9IC9QALABcAIwAAEyEyFhQGIyEiJjQ2EyEyFhQGIyEiJjQ2EyEyFhQGIyEiJjQ2TwNiDRMTDfyeDRMT9gGQDhMTDv5wDhMTDgGQDhMTDv5wDhMTAvQTGxMTGxP+uxQbExMbFP66ExsTExsTAAAAAwAA/88DsQMxAA8AHwArAAABMhYVERQGIyEiJjURNDYzBSEiBhURFBYzITI2NRE0JgcyFhQGIyEiJjQ2MwNVJjU1Jv1WJjU1JgKq/VYKDQ0KAqoKDQ3cEBgYEP76EBgYEAMwNSb9ViY1NSYCqiY1RA0K/VYKDQ0KAqoKDYgYIRcXIRgAAQAA/74DwANAAB0AAAkBNjIWFAcJARYUBiInCQEOAS4CNjcJASY0NjIXAgABaw8pHQ/+lQFrDx0pD/6V/pUKGRoTBwcKAWv+lQ8dKQ8BxgFrDx0pD/6V/pUPKR0PAWv+lQoHBxMaGQoBawFrDykdDwAAAAAEAAD/vwOiA0EAEgAgACUAMQAAATYyHwEWBgcBBi8BIiY9ATQ3ARMFMh4BDgInJS4BPgEDARUXARMeARQGIwUiJjQ2MwIqDB8LzwwBDP4LCw+6DxYMAd4zAR4KEgsBCxIL/uIPFQEWCv5IhgHLnA8WFRD9FBAXFhADNgoL0gwhCv5JCgEEFhC8EQsBx/2bBQoTFBIKAQUBFx4WAhT+XocDAZL9yAEWHhcGFiAWAAAAAAMAAP/EA7wDPAATACMANwAAATIeARURFA4BIyEiLgE1ETQ+ATMFISIGFREUFjMhMjY1ETQmBzIWFAYrAREUBiImNREjIiY0NjMDPCI7IyM7Iv2IIjsjIzsiAnD9mBokJBoCaBokJJYOFBQOmBQcFJgOFBQOAzwnQyj9rChDJydDKAJUKEMnSioe/aweKioeAlQeKpQWHRb+rw4TEw4BURYdFgAACwAA/8QDvAM8ABMAIwAnACsALwAzADcAOwA/AEMARwAAATIeARURFA4BIyEiLgE1ETQ+ATMFISIGFREUFjMhMjY1ETQmARUjNTcVIzUnFSM1MxUjNSEVIzUzFSM1IxUjNTcVIzU3FSM1AzwiOyMjOyL9iCI7IyM7IgJw/ZgaJCQaAmgaJCT+1ERERM1EzUUBVkXNRM1ERERERAM8J0Mo/awoQycnQygCVChDJ0oqHv2sHioqHgJUHir9n0REiUVFiERERERERERERESJRUWIREQAAAAFAAD/xAP8AzwAFAAqAEcAVABdAAABFRQOASMhIi4BNRE0PgEzITIeARUDETQmIyEiBhURNjMyFhc+AjMyFxYXLgEnJiMiDgEPAQ4BJyYnLgEjIgcVFBYzITI2NQEiLgE0PgEeAhQOAScyNjQmIgYUFgP7JUAm/SAmQCUlQCYC4CZAJUwlGv0gGiUZGjtxLh52nFY5NjQoBRwTQVZHgWEYEQcnDxUWI1YtGhklGgLgGiX9bR82Hx82PjQfHzQfEBYWIBYWAU7+JkAmJkAmAmAmQCYmQCb+9wEJGyUlG/5nBCkmUHpDDg15CBYJITllQy0TCg0TEhwfBXobJSUbAVYeNT41HwEeNT40H0wWIBYWIBYAAAADAAD/wAPBA0AADAAcACAAABMiBhURFBYyNjURNCYFNCYjISIGFREUFjMhMjY1AxEhEW0UGRkoGRkDPxkU/ecVGBgVAhkUGVr+QANAGRT82hQZGRQDJhQZsxQZGRT95hQZGRQB7f5AAcAAAAADAAD/vwPBA0EADwATACAAADchMjY1ETQmIyEiBhURFBYTIREhARQGIyEiJjQ2MyEyFvMCGhQZGRT95hQZGUEBwP5AAqAZFPzaFBkZFAMmFBnNGBUCGRQZGRT95xUYAhn+QP7HFBkZKBkZAAAFAAD/gAObA04AHQAqADcAQwBPAAABNhYXERYGByEuATcRND4BFhURFBYzITI2NREmNjMHHgEXERQGIiY1ET4BIzIWFxEUBiImNRE+ASUeAQ4BIyEGLgE2MyUyHgEGKwEuAT4BMwMyDxUBAzMn/gMnMwMTHBYMBgH8BwwBFA7gDRMBFRwVARWcDRMBFB0UARUB3w4TARMN/RIPFQETDgHyDhUBEw7yDhMBEw0CLgETDf3TJToDAzolAioOFAETDf3TDRMSDgIqDhQjARIN/nkNFBQNAYcOEhMN/nkOExQNAYcOErIBFBsSARMbFZASHBQBFBoTAAAAAAYAAP/VAwEDVgAIABEAGgAjACwANQAAATI2NCYiBhQWITI2NCYiBhQWATI2NCYiBhQWITI2NCYiBhQWATI2NCYiBhQWITI2NCYiBhQWAUAbJSU2JSUBmxslJTYlJf6bGyUlNiUlAZsbJSU2JSX+mxslJTYlJQGbGyUlNiUlAtUmNSUlNSYmNSUlNSb+gCY1JSU1JiY1JSU1Jv6AJjUlJTUmJjUlJTUmAAMAAP/AA8EDQQAMABwAIAAAATIWFREUBiImNRE0NgU0NjMhMhYVERQGIyEiJjUTESERA5MUGRkoGRn8wRkUAhkVGBgV/ecUGVoBwANAGRT82hQZGRQDJhQZsxQZGRT95hQZGRQB7f5AAcAAACcAAAAAA+ACdgADAAcACwAPABMAFwAbAB8AIwAnACsALwAzADcAOwA/AEMARwBLAE8AUwBXAFsAXwBjAGcAawBvAHMAdwB7AH8AgwCHAIsAjwCTAJcAmwAAExUjNTMVIzUzFSM1MxUjNTMVIzUzFSM1MxUjNTMVIzUzFSM1MxUjNTMVIzUzFSM1MxUjNTMVIzUzFSM1BRUjNTMVIzUzFSM1MxUjNTMVIzUzFSM1MxUjNTMVIzUzFSM1MxUjNTMVIzUzFSM1MxUjNTMVIzUzFSM1BRUjNTMVIzUzFSM1MxUjNTMVIzUzFSM1MxUjNTMVIzUzFSM1YCBgIGAgYCBgIGAgYCBgIGAgYCBgIGAgYCBgIGAg/KAgYCBgIGAgYCBgIGAgYCBgIGAgYCBgIGAgYCBgIPygIGAgYCBgIGAgYCBgIGAgYCACdSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIOAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICDgICAgICAgICAgICAgICAgICAgAAMAAP+ABAADgQAYAC0AOgAABSInLgEnJjQ3PgE3NjIXHgEXFhQHDgEHBgMiBwYHBhQXFhcWMjc2NzY0JyYnJhMGIyEiJjYzITIeAQYCAGhfXI4nKCgnjlxf0F9cjicoKCeOXF9of21qPj8/Pmpt/m1qPj8/PmptawYJ/kwNDQ0NAbQGDAUDgCgnjlxf0F9cjicoKCeOXF/QX1yOJygD0z8+am3+bWo+Pz8+am3+bWo+P/4ZBhYWBw0NAAAAAwAAAAAD4AKAAAMABwALAAABFSE1BRUhNQUVITUD4PxAA8D8QAJA/cACgCAg4CAg4CAgAAIAAP++A8IDQwAUADQAAAEiBwYHBhQXFhcWMjc2NzY0JyYnJhMWFAYiLwEHDgEuAjY/AScuAT4CFh8BNzYyFhQPAQIAemlmPD09PGZp9GlmPD09PGZpRwsYIQyHhwcWFhAGBwiHhwgHBhAWFgeHhwwhGAuHA0I9PGZp9GlmPD09PGZp9GlmPD39twwhGAuHhwgHBhAWFgeHhwcWFhAGBwiHhwsYIQyHAAEAAP+9A64C7QASAAATFSEyFxYXFhURMxE0Jy4BJyYjgAEBf21qPUBaLCqaZGhxAu1aQD1qbX/+/gECcWhkmiosAAAAAQAA/9EDgQMAABIAAAU1ISInJicmNREjERQXHgEXFjMDgf7/f21qPUBaLCqaZGhxL1o/PmptfwEC/v5yZ2SaKiwAAAABAAAAAAO3AlwAEgAACQEOAS4CNjcBNjIXARYUBiInAgD+jQcVFQ8FBQgBjwsiCwGPDBghCwH7/o0HBgYPFRQIAY8LC/5xDCEXCwAAAQAA/7MC8gMjABIAAAkBHgEOAiYnASY0NwE2MhYUBwFxAXMIBgYPFRUI/nELCwGPDCEXCwFs/o0HFRUPBgYIAY8LIQwBjwwYIQsAAAEAAP+zAvADIwASAAAJAQ4BHgI2NwE2NCcBJiIGFBcCj/6NCAYGDxUVCAGPCwv+cQwhFwsBbP6NBxUVDwYGCAGPDCELAY8MFyEMAAABAAD/swPNA00AHQAABRQeATI+ATURITI2NCYjIRE0JiIGFREhIgYUFjMhAdoKEhQSCgGAEBcXEP6AFiAW/oAQFxcQAYAmCxIKChILAYAWIBYBgBAXFxD+gBYgFgAAAAABAAD/tAPTA38AbwAAARcHFhceARUUBgcGBwYjIic3Jic3LgE+AxcHFhcHFj4BJic3Jic3JiMiBw4CFRQeARcHFhcHJzcmJy4BNTQ2NzY3NjMyFwcWFwceAQ4DJzcmJzcmDgEWFwcWFwcWFzI3PgI1NC4BJzcmJwMHPGxJOzg/SUBCUllcTUojISBEHh4FKEJOJiMjGGEgOyEGFSMaIT04O0lKRnNCOGM+IyAhQzs9STo4P0lAQlJZXExLJCIgRB4eBShCTiYjJBdhIDshBhUjGiE+OTtJSkZzQjhkPSIfIQN/IroiNDJ0NTp8NDceIhc+CQ51G0lORisLDD0HHKcGGzlBGT0XC2oQGhlVZS8sXVEbPA4LcyJqIjQyczY5fTQ2HyEXPQkOdRtJT0UsCw09BxuoBRs4QRk9FwtqEAEbGFVlMCtdUhs8DgoAAAQAAAAAA9MC4QAYAC0AOgBHAAABMhcWFx4BFAYHBgcGIicmJy4BNDY3Njc2FyIHDgIUHgEXFjI3PgI0LgEnJgcyHgEUDgEiLgE0PgEXIg4BFB4BMj4BNC4BAgBcWVJCQElJQEJSWbhZUkJASUlAQlJZXElKRnNCQnNGSpJKRnNCQnNGSkkuTy4uT1xPLi5PLhwvGxsvOC8bGy8C4SIfNjR9cn00Nh8iIh82NH1yfTQ2HyJFGhhVZWBlVRgaGhhVZWBlVRgacS5PXE8uLk9cTy5FGy84LxsbLzgvGwADAAD/swPNA00AFAApADsAAAEyFxYXFhQHBgcGIicmJyY0NzY3NhciBwYHBhQXFhcWMjc2NzY0JyYnJhcyHgEGBwEGIi8BJj4BHwEBNgIAfWtpPT8/PWlr+mtpPT8/PWlrfW9fXDY4ODZcX95fXDY4ODZcX3EIDgYDBv7UBxYImQsIHgqHARkHA00/PWlr+mtpPT8/PWlr+mtpPT81ODZcX95fXDY4ODZcX95fXDY46wkPEAX+1AcHmQseBwqHARkIAAAAAwAA/7ID6AM3ABQAGwAoAAABMjsBMhYVERQGIyAhIiY1AhM0NjMTBg8BIQMHAzI2JzQuAg4BFQYWAgElSfhBQEBB/pr+mUM+AQE/QqkmSU4C9PO9wio5ARosNS4cATkDNz9A/XtBPz9CAUEBQUI//hwyYWgBSvIBQzgqGi0bARstGio4AAAAAAIAAP+1A+gDOQAQACwAAAE0JiMhIgYVERQWMyEyNjUmASEyNzY3NjU0JiMhIicmJyY1NCYjISYGBxUeAQPlDBD8cRENKi4DHC0rA/xPA30cCAsDASUq/n8bBwsCAiUn/tEpJAMBCgHxEAsNEf4jMCwrLqQBiwICCgccKiUCAgoHGycjAiIqlRIJAAAABQAA/7ADiQNQAAUAFwAiAC4AOgAAARQWOwEnBzUhIgYVERQWMyEyNjURIyImJTMyFgYrASImNDYBISImNDYzITIWFAY3FAYjIQYmNjMhMhYCtgYEvMYq/jsWHx8WAo0VH8gWHv7EqAwNDQyoCQwMAYT+hQkMDAkBewkMDAwMCf6FDQwMDQF7CQwChwQGxrzIHxX8yhUfHxUCbh4MFRUMEQ3+Bg0RDAwRDegJDAEWFQwAAAAAAwAA/7ADmQNQABEANgA8AAABFR4BOwERFAYjISImNRE0NjMBBwUOAR0BJyIOARYyNjc2NRE3FSMiDgEWMjY3NjQ9ATMRNCYHExcjIiY1Ap8BLyKnKh79ch4qKh4BzgL+7QgMBRsvCx43LgYB4gUbLwseNy8FAQERCzvPpxEXA0+qIi/9pR4qKh4DDh4q/soBLwEOCdkBLkIuLiEGDQEAJsAuQi4uIQMFBAcBGQsPAgE30hcRAAAAAAQAAP+wA5kDUAARABUAJAAqAAABFR4BOwERFAYjISImNRE0NjMBIREhEwcGHQEUHwExFjY1ETQmAxcjIiY1Ap8BLyKnKh79ch4qKh4Buf6zAUyWXwkJXwMEBUnPpxEXA0+qIi/9pR4qKh4DDh4q/n7+9QEKRAYKYQoGRAEDAwEBAgMBgdIXEQACAAD/sAPQA1AAAwA4AAABMxUjASYjIRUjFTMVIxUzFSMVMxEUBisBBiY9ATM1IzUzNSM1MzUjNTM1ISIGFREUFjMhMjY1ETQBu4WFAfsaJP7pY2NjY2NjFA2FDhJjY2NjY2Nj/ookMzMkAvAkMwEEQQJzGUJAQkBCQf7aDRMBFA3kQkBDQEJAQjMk/RAkMzMkAvAkAAAAAAcAAP+wA9ADUAAXADUAOQBBAEkATQBVAAABFxEUBiMhIiY9ASMiJjURNDY7ARE0NjMFISIGFREhMhYVERQGIyEVFBYzITI2NREnIyImPQEBIxUzNyMVMzUzMjQzIwczNzMXMycXIzcnMhYUBisBNQLR/i0g/XAgLU4QFhYQTi0gAcf+OQgLAkMQFhYQ/bwMCAKQCAsJciU0/jIoKJVlKD1ZlC1dKhdmFitzJk4m2RsYGRo6A0///a4gLS0gYBcQAUgQFwEOIC06Cwj+8hcQ/rgQF2AICwsIAjoJNCV0/orz8/NdlvM9PchrawkTKxRSAAgAAP+YA/oDaAAdACEAJQApAC0AMgA3AEkAAAEhFTMVIxUzFSMVMxUjFTMVIxUzFSMVIT4BNRE0JgMjNTM1IzUzNSM1MzUjNTM1IzUzFSURBREFASYvASYnIwcnNyc3FzM/AQcXA+f+s2NjY2NjY2NjY2MBTQgLDDKgoKCgoKCgoKCg/FwCSv22AVwCFAoNFAE+VGNbVTkBQFlqbQLwPWIfYSBcJV0lXUQDIAoCqwgD/WFdJV0lWyFhIGFir/z+ZgPQaf26BTEXIy2WBrq6BZKYBsrNAAAAAAgAAP+YA+IDaAADACEAJQAtADEANQA5AD4AAAERJREFMhYVERQGByE1MzUjNTM1IzUzNSM1MzUjNTM1IzUBIxUzASMTMxMjAyMlIxUzNSMVMzUjFTM1IxUzFQJK/bYDzwcLCgj+s2JiYmJiYmJiYmIBIqCg/RdEiEuJRGoBAoCgoKCgoKCgoANo/DBmAwEPAwj9VQogA0RdJV0lXCBhH2I9/b5dAev+gQF//sgsXd1b3WHiYQEAAAAHAAD/sAPQA1AAFwA1AD0ARQBRAFUAXQAAARcRFAYjISImPQEjIiY1ETQ2OwERNDYzBSEiBhURITIWFREUBiMhFRQWMyEyNjURJyMiJj0BASMHMzczFzM3IxUzNTMyNDMjFTM1NxczJzcjByUXIz8BMhYUBisBNQLR/i0g/XAgLU4QFhYQTi0gAcf+OQgLAkMQFhYQ/bwMCAKQCAsJciU0/i8tXSoWZhcqfWUoPVlKKCgdYTZ8bDNx/m0mTifuGxgZGjoDT//9riAtLSBgFxABSBAXAQ4gLToLCP7yFxD+uBAXYAgLCwgCOgk0JXT+ivM9PfPzXZbzVB1xi2hzSGtrCRMrFFIAAAAIAAD/mAPiA2gAAwAhACUAKQBMAFAAVABZAAABESURBTIWFREUBgchNTM1IzUzNSM1MzUjNTM1IzUzNSM1ASMVMzUjFTMBBg8BBgcmJw8BBgcmLwEHFhcWHwE3NjcWHwE2FjMyNzY3NgUjFTM1IxUzNSMVMxUCSv22A88HCwoI/rNiYmJiYmJiYmJiASKgoKCg/jEoGgsUCRgWPwIfDgcQDDkKFhEIQBAUCQkWDwggCAwIER4SAdigoKCgoKADaPwwZgMBDwMI/VUKIANEXSVdJVwgYR9iPf2+Xd9dAV0DAT11OnNzBAqNRzBgSAI5cVYrBEpgMTRnRwEEBEWLUldb3WHiYQEAAAAHAAD/sAPQA1AAHQA1AD0ARQBOAFYAYAAAEyEyFhURFAYjIRUUFjMhMjY1EScjIiY9ASchIgYVAyMiJjURNDY7ARE0NjMhFxEUBiMhIiY1AxUzNTMyNCMHMzIWFAYrATcVMzI2NCcmIwczMhYUBisBNxUzNTM1IzUzNd4CRBAWFhD9vAwIApAICwlyJTQI/jkIDDlOEBYWEE4tIAHf/i0g/XAgLSQoPltaPzwaGhoaPLtbPD0eHzwyKi8qKi8q0ih5eYEB9BcQ/rgQF2AICwsIAjoJNCV0BwsI/VwXEAFIEBcBDiAt//2uIC0tIAGm+F+ZIxMtE3b4QXYfIiMqXSzW+G0jRSMAAAAJAAD/mAP6A2gAAwAhACUALQAxADUAPQBBAEYAAAERJREFMhYVERQGByE1MzUjNTM1IzUzNSM1MzUjNTM1IzUBIxUzASMRMzUzMjQBIxUzNSMVMyUyFhQGKwE1JSMVMzUjFTMVAmL9tgPPBwwLCP60YmNjY2NjY2NjYwEioKD9rp8/X4wBx6CgoKD9qSonKClbArKfn5+fA2j8MGYDAQ8DCP1VCiADRF0lXSVcIGEfYj39vl0B6/6Bk+z+9F3dW7EeRB6ALGHiYQEAAAASAAD/0wOGAxMALABiAG8AeACFAI4AmwCoALUAwgDLANQA3QDmAQ4BNQFtAaUAABMWFxYXFhUUHwEWFzEWFxYzITIWFAYHISInJicmLwEmLwEmNTQnJi8BLgE+AQUWBwYHFQYHBgcGIyIHIzQjMSIuATY3MzY/ATYzMjc2PwI2NzYnJicmKwEhIiY0NjMhNhcWASIuATQ+ATIeARQOASciBhQWMjY0JgUiLgE0PgEyHgEUDgEnIgYUFjI2NCYlMh4BFA4BIi4BND4BITIeARQOASIuATQ+AQUiDgEUHgEyPgE0LgEhIg4BFB4BMj4BNC4BBTIWFAYiJjQ2ITIWFAYiJjQ2BSIGFBYyNjQmISIGFBYyNjQmAT4BFxYXFhUUHwEWHwEWFxYzITIWFAYjISInJi8CJjU0JyYvAS4BNyYOARYfARYXFhUUHwIWFxYXITI2NCYjISInJicmLwEmNTQnJicBMDc2PwE2Jy4BBwUuAjYzITYXFhcWBwYHBgcGBwYjIgcGDwEGMyM1IyYvASY2NyI/AjYzMj8BMDQVBwYHBiIPAiIGHgIXMzY/ATYzMjc2NzY3Njc2JyYnJgchIgYUFjMlNhYXFg8BBgcOATWKFhUaEBIMAwwKBw0YJgIABwsLB/4AIhsWEAwFAgwIAg0eEhcECAkEDALhHAcOEgMNERshLV7fCwEHCgIKBwtjShBTMDIcEQcBARENBRAJEQwODP58CAoLBwGCDxcj/jAcLxwcLzgvHBwvHBwoKDcoKAFLHDAbGzA4LxwcLxwcKCg3KCj+fx0yHR0yOzEeHjEBhB0yHR0yOzIdHTL+uBssGxssNS0aGi0BTBstGhotNS0aGi3+gB4rKzwrKwGEHisrPCsr/rgZJSUyJSUBTRokJDMlJf1wAhAKLR0hDAMGCAcHChclAgAJDg4J/gAuIh8LCg0NHBIVBAoMHAUIAwYHBBgTIA0KDQobHScCBgUHBwX+ACsbCgcMCgMMHhwpAqgGBwcLAw0IIBH+eQoNAQ4KAYERFyQVHggJDQUFBiUnPTBWMzMSTQMGAQ4DAQENCgEtUUtTME8RDAEJGRteU0p9BQcBBwcCAjM/SlcwOSQiBQYEDQkHGhIhFRD+fgUICAUBhxMkChIGAQUHBwoDCwUNEBYbISdqGmdFGRMjCw4KARQQHBYWEV1BEXMqIxgOBwECDBAIVh01W0cBGBYcERQQAgkPCwEHBAEEHhIZCQVKUiMQCgUDCg8KAwUG/Q0cLzgwGxswOC8cqyg3KCg3KKscLzgwGxswOC8cqyg3KCg3KCkdMjsyHR0yOzIdHTI7Mh0dMjsyHQsaLTUtGhotNS0aGi01LRoaLTUtGhkrOywsOysrOywsOysLJDMlJTMkJDMlJTMkAoAKCwMKICItJmobMz45FhAmDRMOIh8wU21zKiEWDgYBAhASAQYLCAEBCA8ZJipyW2QrHB8CBwoHKxIYVVYbaicpHx0K/sUeISREHA0JCQEBAQ0TDgIEBxYfOD08FRUxICIFAgQBBQMEDgMJDwEDBQQFRQIBAgQkExYEBQgICgYBAQMEBAUfHi0VFjs9MhsUBgQCBwoIAQEKCxImBiEoIjIDAAAAAAEAAAAAA80CtAARAAAlJicBJjQ2MhcJATYyFhQHAQYBpA8L/rQLFh4LATIB6gseFgv9/AtlAQoBTAseFgv+zgHqCxUfCv37CgAAAAACAAD/6gPCAxYAMwBOAAABLgEnJiIHDgEHDgIVFB4BOwE1IyIuATQ+ATM0PgEyHgEVMh4BFA4BKwEVMzI+ATU0LgEFJgciDwEGHgE2PwERFBYyNjURFx4BPgImJwMbDVE7PYo9O1ENMEwrPGc+ICAsSisrSiw8Z3xnPCxKKytKLCAgPmc8K0z+0hUSAwZhCgEUHAomFBoSJwYSEg0FBQcCIkVvHyAgH29FDURfNUFtP0QtTV1NLUFsQEBsQS1NXU0tRD9tQTVfRH0QCgZiChwUAQol/uEPExQOAR8lBwYFDRIRBwAEAAD/lAPsA2wAAAAMAA0AGQAAEzMhMhURFCMhIjURNCEzITIVERQjISI1ETQUKQFxKSn+jykCFSkBcSkp/o8pA2wp/HopKQOGKSn8eikpA4YpAAAEAAD/vQPsA0MAAAAMAA0AGQAAEzMhMhURFCMhIjURNBEzITIVERQjISI1ETQUKQOGKSn8eikpA4YpKfx6KQNDKf64KSkBSCn+FCn+uCkpAUgpAAAQAAD/lAPsA2wABgAKAA4AFQAZAB0AIQAlACkALQAxADUAPABAAEQASwAANzMVIyImNSUVIzUhFSM1IRUUBisBNTcjNTMhMxUjJRUjNSMVIzUlIzUzITMVIyUVIzUjFSM1JTIWHQEjNSMVIzUjFSM1ByM1NDY7ARTnvhEYAeLnAeLnAeIYEb7n5+f8KOfnAt3nFOcC3efn/Cjn5wLd5xTnArQRGOcU5xTnFOcYEb575xgRvufn5+e+ERjnFOfm5ubm5uYU5+fn5+fn5/sYEb7n5+fn5+e+ERgAAAAABgAA/5QD7ANsAAAADAANABkAGgAmAAATMyEyFREUIyEiNRE0ATMhMhURFCMhIjURNBEzITIVERQjISI1ETQUKQFxKSn+jykCFSkBcSkp/o8pKQFxKSn+jykDbCn8eikpA4Yp/esp/o8pKQFxKQIVKf6PKSkBcSkABgAA/7cDtgM2AAAADAANABkAGgAmAAATOwEyFREUKwEiNRE0ITsBMhURFCsBIjURNCE7ATIVERQrASI1ETRKJqcmJqcmAT0lqCUlqCUBPCanJianJgM2JvzNJSUDMyYm/M0lJQMzJib8zSUlAzMmAAYAAP+UA+wDbAAAAAwADQAZABoAJgAAEzMhMhURFCMhIjURNBEzITIVERQjISI1ETQhMyEyFREUIyEiNRE0FCkDhikp/HopKQFxKSn+jykCFSkBcSkp/o8pAVcp/o8pKQFxKQIVKf6PKSkBcSkp/o8pKQFxKQAAAAgAAP+UA+wDbAAAAAwADQAZABoAJgAnADMAABMzITIVERQjISI1ETQBOwEyFREUKwEiNRE0ITsBMhURFCsBIjURNAEzITIVERQjISI1ETQUKQFxKSn+jykCFRSQFBSQFAEKFY8VFY8V/vYpAXEpKf6PKQNsKfx6KSkDhin96xT+ZhUVAZoUFP5mFRUBmhQCFSn+jykpAXEpAAAAAAYAAP+UA+wDbAAAAAwADQAZABoAJgAAEzMhMhURFCMhIjURNBEzITIVERQjISI1ETQhMyEyFREUIyEiNRE0FCkDhikp/HopKQFxKSn+jykCFSkBcSkp/o8pA2wp/o8pKQFxKf3rKf6PKSkBcSkp/o8pKQFxKQAAAAgAAP+UA+wDbAAAAAwADQAZABoAJgAnADMAABMzITIVERQjISI1ETQRMyEyFREUIyEiNRE0ATMhMhURFCMhIjURNBEzITIVERQjISI1ETQUKQFxKSn+jykpAXEpKf6PKQIVKQFxKSn+jykpAXEpKf6PKQFXKf6PKSkBcSkCFSn+jykpAXEp/esp/o8pKQFxKQIVKf6PKSkBcSkAAAoAAP+UA+wDbAAAAAwADQAZABoAJgAnADMANABAAAATOwEyFREUKwEiNRE0ITsBMhURFCsBIjURNCE7ATIVERQrASI1ETQBMyEyFREUIyEiNRE0ITMhMhURFCMhIjURNBQpuSkpuSkBXSm4KSm4KQFwKbkpKbkp/TMpAXEpKf6PKQIVKQFxKSn+jykBVyn+jykpAXEpKf6PKSkBcSkp/o8pKQFxKQIVKf6PKSkBcSkp/o8pKQFxKQAGAAD/lAPsA2wAAAAMAA0AGQAaACYAAAEzITIVERQjISI1ETQBMyEyFREUIyEiNRE0ETMhMhURFCMhIjURNAIpKQFxKSn+jyn96ykBcSkp/o8pKQFxKSn+jykDbCn8eikpA4Yp/esp/o8pKQFxKQIVKf6PKSkBcSkAAAAAAgAA/5QD7ANsAAAADAAAEzMhMhURFCMhIjURNBQpA4YpKfx6KQNsKfx6KSkDhikABQAA/7AD0ANQABcANQBBAE0AWQAAARcRFAYjISImPQEjIiY1ETQ2OwERNDYzBSEiBhURITIWFREUBiMhFRQWMyEyNjURJyMiJj0BASMVMzUjNTM1IzUzJSMVMzUjNTM1IzUzJSMXBzM3FzMnNyMHAtH+LSD9cCAtThAWFhBOLSABx/45CAsCQxAWFhD9vAwIApAICwlyJTT+cbC2joCAiAHWr7WOgICI/oUwUVcxPz4xV1IxOQNP//2uIC0tIGAXEAFIEBcBDiAtOgsI/vIXEP64EBdgCAsLCAI6CTQldP6K8yJJI0Mi8yJJI0MidX5eXn51VgAAAAAFAAD/sAPQA1AAFwA1AD0ASQBRAAABFxEUBiMhIiY9ASMiJjURNDY7ARE0NjMFISIGFREhMhYVERQGIyEVFBYzITI2NREnIyImPQEBIxUzFTM1MzcjFwczNxczJzcjByUjFTMVMzUzAtH+LSD9cCAtThAWFhBOLSABx/45CAsCQxAWFhD9vAwIApAICwlyJTT+f8dQJ1BNMFFXMT8+MVdSMTkBRsdQKE8DT//9riAtLSBgFxABSBAXAQ4gLToLCP7yFxD+uBAXYAgLCwgCOgk0JXT+iiLR0SJ1fl5efnVWViLR0QACAAD/1QOPAysAEAAhAAAJASYiBhQXCQEGFBYyNwE2NCUBJiIGFBcJAQYUFjI3ATY0A4P+fAwfFwsBaf6XCxcgCwGEC/7j/nsLIBYLAWn+lwsWIAwBhAsBmwGEDBcgC/6X/pcLIBcMAYQLIAsBhAwXIAv+l/6XCyAXDAGECyAAAAMAAP/hA6cDLwAUAB4AQwAAASIHBgcGFBcWFxYyNzY3NjQnJicmAwYiJjQ2MhYGBzcGBw4BFxUjNSY3Nj8BNjcmJyYHJgYHBhcjJj4CFzYeAgcUAgBzYmA4OTk4YGLmYmA4OTk4YGJYDiQaGiUbAQ1XGRsQEwFAAQ0bKQoQAQETFh0RHwsSAj4BFCg3HRoyJxMBAy86OGBi5mJgODk5OGBi5mJgODr9ig0aJBoaJQ3sGRYNJRUKCh4bLCALFBgcFBMBAQ4OHCEcNigUAQIPIS0ZKQAABQAA/74DwwNDABAAFAAnADwAUQAAJSIvAS4BNwE+AR8BHgEHAQYnFwEnASImPwE+AR4BDwE3Nh4BBg8BBhciJyYnJjQ3Njc2MhcWFxYUBwYHBgMiBwYHBhQXFhcWMjc2NzY0JyYnJgHBBwV6BgEFAToFDwZ6BgEF/sYGaV4BI17+nwkLAhoCDA4JARV7Bw0FBQeZA9t6aWY7Pj47Zmn0aWY8PT08Zml6cGFdNzk5N11h4GFdNzk5N11huARkBQ8GAW8GAQRkBRAF/pAGeU0BU0397g0JoQcIAgwHgi8CBw0OAzoBtD47Zmn0aWY7Pj47Zmn0aWY7PgNgOTddYeBhXTc5OTddYeBhXTc5AAMAAAAAA7UB3wAIABEAGgAAEyImNDYyFhQGISImNDYyFhQGISImNDYyFhQGqSc3N044OAEwJzc3Tjc3ATAnODhONzcBIjdONzdONzdONzdONzdONzdONwACAAD/gAQAA4AAGAApAAABMhceARcWFAcOAQcGIicuAScmNDc+ATc2EyYiBhQfAQcGFBYyPwE2NCcCAGhfXI4nKCgnjlxf0F9cjicoKCeOXF8nBxYPCK6uCBAUCMAICAOAKCeOXF/QX1yOJygoJ45cX9BfXI4nKP7TBw8VCK6tCBUQCMAIFQgABAAA/74DwwNDABQAKQA0AD8AAAUiJyYnJjQ3Njc2MhcWFxYUBwYHBgMiBwYHBhQXFhcWMjc2NzY0JyYnJgEiJjcBNh4BBwEGISInASY+ARcBFgYCAHppZjs+PjtmafRpZjs+PjtmaXpxYF44ODg4XmDiYF44ODg4XmD+8AwJCQE+BxMFB/7CBQE3BwX+wgcFEwcBPggIQj47Zmn0aWY7Pj47Zmn0aWY7PgNhODheYOJgXjg4ODheYOJgXjg4/bEVCAE+BwUTB/7CBQUBPgcTBQf+wggVAAAAAQAA/5kDKwMaAAUAAAURIwERMwH2/QE6+GYBkwHs/qEAAAAAAwAA/8ADwANAAAwAGgA5AAA3LgEnNjc2NzY3MhYXAyImJwEeARUGBwYHBgcBLwEjLgEjIgcGBwYVFBYXBxc3HgEzMjc2NzY1NCYnxSUnAQE1NFhcakN9NPRPkDgCNTM3ATU0WFxqAUcWEwE8k055aWU8PS8tASUBP6ZaeWllPD0/O5gzdj9qXFg0NQEtKv1IPDgCHjaLSmpcWDQ1AQK7FBIyNT08ZWl5SYs7ASoBQUY9PGVpeVadPwAAAAAJAAD/ogPeA14ADAAaADkARgBKAFYAXwBtAHoAACUVFA4BKwE3MzI2PQElHwEVFBY7ARcjIi4BNQEyFh8BIycuASMiBhQWMzI2PwEzBwYHBiMiJyY0NzYhMhcWFAcGIicmNDc2BRUjNSEfATUzFSMvARUjNQciBhQWMjY0JgMPASMiBh0BBzU0PgEzITIeAR0BJzU0JisBJwPeKUYqqEVjJDH8iBwoMSRjRagqRikBBCw5BQIzAgUbFyIhICQWHQcBMwEJHx0oPh8bHB8BMDkhHx8hcyAfHyD+uTUCcwZpNS0FazSQIiMjQyQk4BsnXiQxRClGKgKKKkYpRDEkXkLboilFKUQxImBCGydgIjFEKUUpAbouJggFFRIrTioXGQUILBkXJyJvIiglI3IjJSUjcSMmBfn5A5mc+QOcn/krLEssK00rAZscKDEiZUWqKUUpKUUpqkVlIjFEAAANAAD/vwO8A0AADwAQABkAHQAtADoAOwBHAFcAYwBwAHwAiQAAARUUBiMhIiY9ATQ+ATIeASUjFBYyNjQmIgYXMxEjFxUUBiMhIiY9ATQ+ATIeARUUBiMhIiY0NjMhMhYlOwEyFTEUKwEiNTE0BSMiJicDJjYzITIWBwMOAQMXFjY9ATQmDwEGFDcVMhYVFBYyNjU0LgEXJyYGHQEUFj8BNjQHNSImNTQmIgYVFB4BA6AJB/6gBwk0WGhYNP1gQCU2JSU2JSBAQOAJB/6gBwk0WGhYNAkH/qAHCQkHAWAHCf7AEOAQEOAQAsfuGCUDMQQnHQFQHScEMQMlxywECAgELAQ8KDgJDgkiOxUsBAgIBCwEPCg4CQ4JIjsCQBAHCQkHEDRYNDRYjBslJTYlJTv9sLAQBwkJBxA0WDQ0WEQHCQkOCQlJEBAQEGAhGAHAHSoqHf5AGCEBuBoCBQQzBQQCGQMJFiA4KAcJCQcjOyLIGgIFBDMFBAIZAwkWIDgoBwkJByM7IgAAAAIAAP+zA80DTQAUACQAAAEiBwYHBhQXFhcWMjc2NzY0JyYnJhMHBiIuAT0BND4BHwEeAQYCAH5raD0/Pz1oa/xraD0/Pz1oazDFDB0ZDhkmEcUQDAwDTT89aGv8a2g9Pz89aGv8a2g9P/4FcQgPGQ7iEx0HCXEKJCQAAAABAAAAAAO5Ae8AFAAAEz4BFx4BMjY3Nh4BBgcOASImJy4BVxAuEUi0v7JHEi0fAxFX2OjaVxICAdwQAw9ARUM+EAMiLg9MUVNODy4ABwAA/7sDxQNNAEEASgBUAF4AaAB7AIsAAAEeAR8BNz4BNzYWFx4BFRYGDwIzMhYdARQGBycHHgEVERQGIyEiJjURNDc2PwIjLgE9ATQ2MxczJyYnNDY3PgETISIGFREUMwUTAyEyNjURNCYjJSEiBh0BFBYzBTcHITI2PQE0JiMlDwEOARUUFhcxFh8BMycuAScmBQYHBg8CFz4BNTQmJyYHAS82biYCBiZuNiMxFhEXBAsNCQM3Iy0hFQoBBQItI/2HJC0BAQUGAg0ZIy0jIRYMEwEWExoz1/7XDhYkASYsAwEqDRcXDf6w/pwNFxQQAWEsAwFkDRcXDf1oAgoHBhARBgSTUgwnWSYsAeUpLSonCgPlERsNDBksA0MNUzUHBjZTDQYGDQwlERIrFAQELSN0GSwFAwsFCg3+oyMtLSMBXQgFCAYGAwUrGnQjLQMMJSoVJQkQBv5BFw3+oyQDAav+WBcNAV0NF+IXDXQQFAPCvxYOdA0XqQIKBgsIECEYCAcDEiw/CAsLDB4cJgoFARIwEAwTBRELAAAAAAIAAP+4A8gDSAAdADsAAD8BNjIfARYUDwEzMhYdARQGIyEiJjURNDY7ATIWFQEHBiIvASY0PwEjIiY9ATQ2MyEyFhURFAYrASImNYvpAwgCLQMD6akICwYE/uYPFQUENwcLAurqAggCLQMD6akICwYEARoPFQUENwcLRekDAy0CCAPpCwc3BAUVDwEaBAYLCAHO6gMDLQMHA+kLBzcEBRUP/uYEBgsIAAQAAP/SA64DLgAVACsAQQBXAAATNzYmLwEmBh8BHgE/ARcWMj8BNjQnBRYyPwEXFjY/ATYmDwEOAR8BBwYUFwEuAQ8BJyYiDwEGFB8BBwYWHwEWNicBJiIPAScmBg8BBhY/AT4BLwE3NjQn8TYEBAbDBQcBFwELBTWjAwgDMwMDAQsDCAOjNQULARcBBwXDBgQENqMDAwEqAQsFNaMDCAMzAwOjNgQEBsMFBwH9tAMIA6M1BQsBFwEHBcMGBAQ2owMDAtA2BAsBFwEHBcMGBAQ2owMDMwMIA0EDA6M2BAQGwwUHARcBCwU1owMIA/6CBgQENaIDAzMDCAOjNQULARcBBwUBNgMDojUEBAbDBQcBFwELBTWjAwgDAAAABAAA/74DwgNCABMAJwA/AFcAAAEhIg4BFREUHgEzITI+ATURNC4BExQOASMhIi4BNRE0PgEzITIeARUBBzU0JiIGHQEUFjsBMjY0JisBNzY0JiIBIyIGFBY7AQcGFBYyPwEVFBYyNj0BNCYDLP2oKUUoKEUpAlgpRSgoRTEZKRj9qBgpGRkpGAJYGCkZ/hquEBsREA60DhAQDmyuCRIYAYO0DhAQDmyuCRIYCa4QGxEQA0IoRSn9qClFKChFKQJYKUUo/RIYKRkZKRgCWBgpGRkpGP6ermwOEBAOtA0REBwQrgkYEgF3EBwQrgkYEgmubA4QEA60DREAAAAAAwAA/7kDvANAABQAGwAcAAAFIy4BJwMlLgI2NwE2HgIHAQ4BAQUeARcTCQECTAMSHQVk/rQSFgIUEAMMECEYBwb+ywYd/jMBNw4VBF4BJP5FRwEWEgFUYAUcJB8HATgHBxghEPztEBQCFFoEFA7+wALo/j8AAAAAAQAAAAADwwIGABUAACUiJy4BNz4CFxYzMjc2HgIOAQcGAgDOuyUbEQssNBiPpqKTGDQsFgUdGLv7VBFJJRccBQtCQgsFHC4zKgtUAAQAAP++A8IDQgAUACkAOgA+AAAFMjc2NzY0JyYnJiIHBgcGFBcWFxY3IicmJyY0NzY3NjIXFhcWFAcGBwYDMj4CNC4CIg4CFB4CEwMjAwIAemlmOz4+O2Zp9GlmOz4+O2ZpemxcWTM2NjNZXNhcWTM2NjNZXGwMExEICBETGBMRCAgREz8XPhFCPjtmafRpZjs+PjtmafRpZjs+ODYzWVzYXFkzNjYzWVzYXFkzNgIzCBETGBMRCAgRExgTEQj+PgGV/msAAAAAAwAA/74DwwNDAA8AHwBFAAABITIWFREUBiMhIiY1ETQ2FyIGFREUFjMhMjY1ETQmIwM+ATIWFxUUBiMhIiY1ETQ2OwE2HgEUDgErASIGFREUFjMhMjY1AX4B8SIxMSL+DyMwMCMFBwcFAfEFBwcF4QEUHRQBMCP+DyIxMSJTChEKChEKUwUHBwUB8QUHA0IxIv4PIzAwIwHxIjFHBwX+DwUHBwUB8QUH/WkOFBQOUyIxMSIB8SMwAQoRExEJBwX+DwUHBwUAAAACAAD/1QO3AzkAGwA0AAATKwEvBDU/Az4BHgIGDwEhMhYUBiMhBTMfBRYPAwYiJjQ/ASEiJjQ2M3MBAwwIBgkDAQIH4QkXFxEGBgmQAqcTGhoT/OoDGQEIBwcJBwIBAQIG4g0lGw2R/VkSGxsSAgAEBAYQDAUHBQ3iCAYGERcXCZEaJRvyAgIECQ4KAwMNC+MOGyUNkRomGgAAAAAFAAD/vwPBA0EADQAaADsASQBXAAA3FRQWOwEVIyIuAj0BIRUUDgErATUzMjY9AQE2Mh8BFgcRNzYyFhQPAgYHIyIvASY0PwE+AR8BESY2JTIeAh0BIzU0JisBNSEVIyIGHQEjNTQ+AjOaIxiWlh03KhcDgChFKJaWGCP+iAgUCAQNAjMKHBMKaQIIDAYTCmQKCgQJFQo2AQgBRR03KhdaIxiW/taWGCNaFyo3HeuWGCNaFyo3HZaWKEUoWiMYlgFcBgYDDBL+7TULFRwKcAMJAhBsCxwKBAYCBTsBFAoR/hcqNx2WlhgjWlojGJaWHTcqFwAAAgAA/6cD1ANTABcALwAAARYUBiIvAREWDgEiLgE3ETQ/ATY3NjIXBREUBxUGBwYiJwEuAT4CFh8BETQ2MhYDwxAgLRC3AQ8ZHxkPAQIBAgwQLRD+/gMCDRAtEP7qCggIFRwcC7kgLSECKxAtIBC6/UwPGw8PGw8DMgQHAxINDw8o/MkEBwMRDRAQARgLHB0UCAgKuwK4FyAgAAAABQAA/9EDmgMKAC4APwBLAGYAfQAAAR4BFAYHIwYHBgcGHQEWFxYzITIXHgEXFhURFAcGBwYjISImJy4BNRE3NDY3NjMHERQWFxYzITI2NRE0JiMhIgEyFhQGKwEiJjQ2MxM2Fx4BHwEWFAYjIiYvAS4BDwEGIyImNTQ2NyUyFxYXFh0BFAYiJj0BNCYrAQYmNDYzATIMEBAMbQYFBwcKAgkMEAJ4Dg4UHQYGBQYNHCT9fBIiCw8KAQwOGiQdCAULDwJuEBcXEP2IDwI3DRERDdgNERENHRQUCgsGRwcSDQkSBDQDDgeZCwgNFAoIAaIlGA4IBhIYEhQRGgwSEgwC0QERFxABAQIDBgsOLA0JCwUGHBEODf5WDg0TDRsODRAcGQI2Fg4fDRni/kMJDwQKFhABkxAW/p8RGRERGRECdQsIBAsLaQkXEQwJTgcGBGMGEQ0JDwRGGA4PDAsUDBERDAIQFAERGREABAAA/8ADzQM8ACMAWABsAHEAAAEyFh0BMzIWFxUUBiMnFRQGByMiJj0BByImJzU0NjsBNTQ2NxMeARUUBw4BJyYnJjc0NTQuAgcGBwYHBgcGHgIXNzIXHgEVFAYjIi4CNzY3Njc2NzYWBzIWHwEWBg8BBiIvAS4BPwE+ATMXIwcXNwMdEBFuDhECEg9uDw0FDxJtDxEBERBtDw0mQUcBAhoPCAYNATpri0tiVVIxMwIBN2eHSgcMCgcJExNapn1AAwU6OV9hcVqpaxAaBy4IBA24DiwOuQ0ECzcIGQ768jGmpQEgERBtDw4EEBIBbg4SAREQbgEPDgUPEm0OEgEBnT+mWgYFDxIEAwULEQIDS4ppNwEBMzFSVGNKi2o8AQEGBREJDRRHgqhacWJeOTsEA0DIEA5bESYP0xEQ0w8pElwMDkVRvb4AAAQAAP+4A8MDTgAUACkAQQBbAAABMhcWFxYUBwYHBiInJicmNDc2NzYXIgcGBwYUFxYXFjI3Njc2NCcmJyYTDwIhIiY0NjMhJyY+AR8DFgcxBgcFFScmNSY/ATE/ATYzITIWFAYjIRcWFAYiJwH4fGtoPT8/PWhr+GtoPT8/PWhrfGlaWDM1NTNYWtJaWDM1NTNYWoQBAwj+QwwPDwwBdVMMCR8LgwUCAwUCAv4dAgMECgMEBQQFAbkLDw8L/opTCBAXCANOPz1oavlraD0/Pz1oa/lqaD0/SDUzWFrSWlc0NTU0V1rSWlgzNf6rAQIDEBcQVAweCQyDBgULCgQCfwEEBAQOCwMDAgEQFxBUCBcRCQAAAAQAAP/VA3cDKwARACIAMAA8AAABMhYVERQOAiMhIiY1ETQ2MwUhIgYVERQWMyEyPgE1ETQmATIeARQOASsBIiY0NjMlMhYUBiMhIiY0NjMDGCc4M116Qv60Jzg4JwI5/ccKDg4KAUxGeEYN/uUKEAoKEAqmDhUVDgE0DxUVD/7MDxQUDwMrOCf+VUJ6XTM4JwKYJzhHDgr9aAoOR3dHAasKDv6cChATEQkVHRWmFR0VFR0VAAMAAP+1A8cDLQAVADEAUwAAARUUDgEjISIuAT0BMxUUFjMhMjY9AQMyFh8BFg4CLwEHBiIvAQcGJi8BLgE/AT4BMwUhIgYPAQYWHwEeAT8BNhYfARYyPwE2HwEWNjc+AS8BLgEDhh0yHf3IHjIdRBgRAjgRFzIdMQtJFAo9aDNgNCZYJzNBLmMjDikVF00LMB0CHf3jCA4ETBAOGw4UORpKCxYKPRc0Fz0TFGkdOxEUCA5JBA4BAN4dMh0dMh3HxxAYGBDeAi0hG7MybVshEyQdFhUdHhUTJQ4rdTewGiBFCQewJE0cDhULDCMEAQUiDQ0iCwgnCxMaH0ojswgJAAACAAD/ogPiA0YALwBVAAAFJi8BBwYmLwEuAT8BJy4BPwE+AT8CPgE3MzIWHwIeAR8BFgYPARcWBg8BBiczAyIGDwIOAQcGHwEHBh4CPwEXFjMxMj4BLwE3NicuAS8CLgEC6xMRu7wWNBUHFhUFJ5QRDgQCCSobzV0LKxkHHDALW80aKAkCCQ0UkyUFERMGGSEB6AgOA2zxCAwDBAyuLgEGDREH29kHCAkNBgEsrQ0GAg0I72wEDV0DCWFhDAEOBRI1HM+PEzIaCRwlAyfCGB8CIBnCJQQhGQcbORSQzxoyEgQWAQNcCQjiLgEKCBIPqPUIEAoBBHFxBAsQCPWpDhQICwEr5AcIAAAEAAD/pAOPA2oAHAA4AEUAUgAAATIXFhcWFxQHBgcGDwEGIi8BJicmJyY1NDc2NzYXIgcGBwYVFBcWFxYfATY/ATY3Njc2NTQnJicmBx4CFA4BIi4BND4BFyIOARQeATI+ATQuAQIHa1tYNDUBOy1SL08bFj0XGlAuUi46NjNZW2pVSUYqKzYqSypJGw0PAUkqSyk1KipHSVU1WjU1WmpaNDRaNSA1ICA1QDYgIDYDaTU0WVtqcnNZWTNHGBQUGEczWVpycmpbWTQ1TispR0lVYmZPUS1CGAwMAkEuUU9kYlVJRykrdQE0WmpaNTVaalo1Tx82QDYfHzZANh8AAAAABAAA/64D0gNSABkAMAA8AEgAAAEyFxYXFhQHBgcGIyIjMyEiLgEnETQ3Njc2FyIOAhcHExQWMyE3Fj4CNTQnJicmAzIeAQYHIyIuATY3JTIeAQYHISIuATY3AgB+bWk+Pz8+aW1+DAwH/rshNyIBPz5pbX5QlG44BAEBHBQBOQlQl3RANjRYW5UPFQIUD1gPFgEUDwEDDxYBFA/+/Q8WARQOA1E/Pmlt/G1pPj8fNiABXH5taT4/SkB0l1AI/sMTGwEEOG6UUGpbWDQ2/h4VHhYCFR4WAsEVHhcBFR4WAgADAAD/vQPCA04AGgBGALIAAAEmJyYnJgYHBgcGFRQXFhcWMjc2NzY1NCcmJwU0NxYXFhcWFRQXFhcWFzIXFhcWFxYzFjc2MzIWBwYVFBcWFzEUFyYnJicmATY3Njc+ASc0JgcGJy4BJy4BJyYnJicuAScmJyIHBiMGNTQvATQnNTMWMxY3PgE3PgEXFhcWNzYXFhcWFxY3NjU0JyY1ND8BNjc2LgEHBhUUBgcGLgE3Njc2NzY3Njc2Nx4BFwYHBhcWFw4BA54pUE5jZs9TUS4vPTxmafRpZjs+CQcL/NoZBQwPBgkDBQ8SIgMJDQsPCAMIBQ4SCwUBAgQ1GxoEZ1dUMjMB2wEBDQcMKQEfEgoEAwQCBBEMCBAeEAYaCA0MCxcPBQkFAgECCRAGBAIEAwMOGBEHDQQCBgMJEQgOBwoCAgQcFAYLAyoSBAIEGCkTBwQJBg0UCQ4CBAJmoCZYBAQqGiAijgIvYUVDGxsqQT9cXmp6aWY8PT08Zml6JS0hIZRGQgQEBwQHCzEZJxQYAQUHCw8UBwEDBQoNGhUdMBgSJyUBNTNWWP70AwUyEhwiExEXAgIGAxEEBQIIBg8aCAMSBAYBBgQBBygyDwMDAQMBBgMTAwYBBQQBAgMBCAUQHAoSBQcsBQwPCAwHMCEMEwcBBgEHBQUBBQkUCwYDAwMGBgkSKiMPgF9AOSokGDBagAABAAAAAAPEAmEADgAACQEGIicBJj4BMyEyHgEHA7L+fhM6E/5/EgMkGgMDGyQDEgH0/k8WFgGxFDQlJTQUAAAABQAA/74DgwNDAAsAKAA0AEAATAAAATMyNi4BByMiDgEWBTUuAQ4BFxEUBiMhIiY1ES4BDgEVEQYWFyE+AS8BES4CBhURFBYyNhMhIgYeATchMj4BJgERLgIGBxEUHgE2AZHkDRIBFA3hDBICEwG/ARQaEwEMBf4hBgsBFBoSAzAlAd8lMAPWARIaFBMbE/b9Og0SARQNAsMMEgES/lwBERoUARMbEwMFExoRAREZEu0DDBIBEw3+AA0REQ0CAwwSARMN/gAjNQMDNSN4AWoMEQERDf6WDBISAjgTGhEBERgT/dUBagwRAREN/pYMEgESAAAAAAEAAAAAA8ECugATAAAJATEGIicBLgE+AhYXCQE2MhYUA7f96AoaCv7YBgUFDBERBgERAgIJGhMCg/3oCgoBKAYREQwEBAf+7wIBChMbAAAABQAA/+cDowMjAAsAFwBBAFEAXwAAJTIeARQOASMiJjQ2ITIeARQOASMiJjQ2ATIXFhcWFxYlMhcWFxYVFAYHDgEHBiMiJyYnJicmJzU0JicuASMiJjQ2ASMiDgEUHgE7ATI+ATQuAScjIgYUFjsBMj4BNC4BAbMOFw4OFw4VHR0BTA4XDg4XDhUdHf2nHiIVJBUKDwGpOy8yHB8sNyJMPDVhZEdBIwoEAwEDAwo7GA0SEgJQ+AkOCAgOCfgJDgkJDgn4DRISDfgJDgkJDk0OFxwXDh4qHg4XHBcOHioeAtYbESkWChQBFRcsL0N1ijEfHwYGMS1SFjEsYB5QRwscLxIaEv46CQ4RDgkJDhEOCZsSGhIIDxAPCAAAAAACAAD/3QOGAyMADAAeAAABMh4BFA4BIi4BND4BATIeAhQOAiMhIi4BND4BMwIIR3hGRniNeEZGeAE2HDQoFRUoNBz+ISdAJiZAJwMjRnaNd0VFd412Rv3TFSgzODQoFSZATUAmAAAAAAQAAP/dA6MDIwATACcAPABQAAABMh4BHQEUDgErASIuAT0BND4BMyEyHgEdARQOASsBIi4BPQE0PgEzATIeAR0BFA4CKwEiLgE9ATQ+ATMhMh4BHQEUDgErASIuAT0BND4BMwFCKUYpKUYpTSlGKSlGKQIWKUYpKUYpTSlGKSlGKf6EKUYpFys4Hk0pRikpRikCFilGKSlGKU0pRikpRikDIylGKU0pRikpRilNKUYpKUYpTSlGKSlGKU0pRin+NylGKU0eOCsXKUYpTSlGKSlGKU0pRikpRilNKUYpAAAAAQAA/9wDpAMkACcAACUOASsBLgM1ESY2NyU+ARcFHgEVERQOAisBIicuAT0BNCYiBhUBugE4J3YbMiYUARcXARknaikBExkaFigzHHYlGw0NKTopMSMxARQjLRkBYRsxEekgAh/UETMc/ooZLyMTGQsfEYodKiodAAAAAAkAAP+CBV0DeAAIABIAHAAsADwASQBaAG8AewAAARQWMjY0JiIGJSEyFh0BITU0NgchFRQGIyEiJjU3IgYdARQWMyEyNj0BNCYjBSIGHQEUFjsBMjY9ATQmIxcUHgEyPgE0LgEiDgEHFB4BMj4BJicmJyYiBwYHBiUiBwYHBhQXFhcWMjc2NzY0JyYnJgMnByc3JzcXNxcHFwUyDREMDBEN+44B8CU1/Vw1NQKkNSX+ECU1XgkNDQkBDgkNDQn+8gkNDQmoCg0NCkFwwd/Cb2/C38FwMVWTqpNVASsqR0qsSkgqKwHSXE9MLS4uLUxPuE5NLC4uLE1OCVVQKlBMKExHKkZUAwEIDQ0RDAxtNCYfHyY0y+YlNTUliw0KBQoNDQoFCg1XDQkGCQ0NCQYJDddwwXBwwd/Cb2/CQlSUVVWUq0lIKisrKkhJzS4sTU64T0wtLi4tTE+4Tk0sLv4yUlcpV0krSU0pTVIAAAADAAAAAAP0ApAAEwAlAEEAAAEyFhURFAYjISImLwEmNj8BPgEzBSEiDwEOAR8BFjMhMjY1ETQmBxYUDwEXFg4BLwEHBiImND8BJyY0NjIfATc2MgOrHioqHv1UER8Kmw8CD5kKHhACrv1SEw2ZCAEImwwVAqwRGBjeBgZtbQgGFgdubQYQCwZtbQYLEAZtbgUQApArHv5yHisQDtQUMRO7DQ4gD7oLHQvTERgRAY4RGGcGEAZtbQgWBQdubgULEAZtbQYQCwVubgUAAAAEAAD/oAPhA2EAFAApADsATgAAATIXFhcWEAcGBwYgJyYnJhA3Njc2FyIHBgcGFBcWFxYyNzY3NjQnJicmEzIeAQYPAQYiLgE/ASEiJjYzExYUDwEhMhYGIyEiLgE2PwE2MgIAgnBtP0JCP21w/vxwbT9CQj9tcIJzZGA4Ojo4YGTmZGA4Ojo4YGQ/CQ4GBQZ0CBcPAQhH/t4QEBAQiQgIRwEiEBAQEP6cCQ4GBQZ0CBcDYEI/bXD+/HBtP0JCP21wAQRwbT9CNzo4YGTmZGA4Ojo4YGTmZGA4Ov3/ChARBnQHEBYIRxscAQoIFwhGHBsKEBEFdAgAAAMAAP/2A74C+gAZACYANwAAATIWHwEzMhYVERQGIyEiJjURNDY7ATc+ATMXIg4BFB4BMj4BNC4BBzIeAhQOAiIuAjQ+AgJ5Fy8JGGcyRUUy/XIyRUUyaRoKLhh0NVo1NVpqWjU1WjUaMSUTEyUxNDElExMlMQL5IRc+RTL+YTJFRTIBnzJFPhch8TVaalo1NVpqWjVDEyUxNDElFBQlMTQwJRQAAwAA/74DwwNCACoAOABEAAAFIicmJyY0NzY3NjMyFhQGIyIHBgcGFBcWFxYyNzY3NjU0NjIWFRQHBgcGAyImNRE0NzYyFhURFAYjIiY0NjsBMhYUBiMCAHppZjw9PjtmaXoRFxgQZFdTMTMzMVNXyFdTMTMXIhc+O2ZpfBAYCwwiGBgREBgXEc4RFxcRQj47Zmn0aWY8PRciFjIxVFbJVlQxMjIxVFZlEBgYEHtpZjw+AZoXEQERDw4LFxH+7xEXFyIXFyIXAAAEAAD/rgPqA1IAFQAgAD4ARwAAATIeAhURFAYHBSIuAjURND4CMwEhIgYUFjMhMjY1AyMRFA4BJi8BBwYmLwEmNREjIg4BFRE+ATMhETQmISMRNz4BHwIDaBovJRQrIP1ZI0IyGxsyQiMCrv1SGiQkGgKgBgg+/g0VGApWVg0hCgQIPh4zHRE7IgKuJP6krD0KGAsFPQNSFCUvGv0wIC8CARsyQiMCQCNCMhv9HCQ0JAgGAw7+tAwUCwEHPDwJAwwFCw0BTB0zHv3UHSECHhok/uIrBwIGAysAAAAABQAA/8sDtQM1ABMAJwA0AEAATAAAAR4CFREUDgEjIS4CNRE+AjMFISIOARURFB4BMyEWPgE1ETQuAQUyFhURFAYiJjURNDYFMhYUBisBIiY0NjM3MhYUBisBIiY0NjMDDi1NLS1NLf3kLU0tASxNLQIc/eQcMBsbMBwCHBwwHBww/hUNEhIbEhIBkQ0SEg3PDhISDs8NEhINzw4SEg4DNQEsTS395C1NLQEsTS0CHC1NLT8cMBz95BwwGwEcMBwCHBwwHDsSDf3JDhISDgI3DRLhEhsSEhsStBIbEhIbEgAEAAD/sQOrAzwAAwAIAA0AEgAABRUhNQEXAS8BCQEfAQE3Bxc3JwOr/LsCPc79ysUIAcT+gQRpAX4FQW1BbApFRQNGzf3KCMUBZP6BaAUBf95BbUJsAAAABgAAAAADyAMPAAMABwALAA8AEwAXAAABIRUhJzMVIxMhFSEnMxUjEyEVISczFSMBHAKr/VXjUFDjAqv9VeNQUOMCq/1V41BQAw5PT0/++lBQUP77UFBQAAIAAP/8A7QDQQAdAC0AAAUhIiY1EzQ/ATY3NjMyFxYXFgcGBzMyHgIHAw4BISIuAT0BEz4BMzIWFREUBgLZ/mwRGAEgfBUUHSsiGRMOHQUDF8kXKhsKAzsPVv2vIzoiLQItHxUeHAQYEQGsOTO/IA4WDgsSKUo5SRMiJxT+5ERUIzoiBgFVHiseFf5AFBwAAAIAAP/GA+cDJwAiAEQAAAEyFwEWFAcBDgEuAT0BIw4BDwEOAS4BNzY3Njc2PwE1NDY3FyIGHQEHBgcGBwYHBgcGBxQWNzY3NjM3FRQWNwE2NCcBJgI4IhgBXRcX/qMSMC4bAlSdQxEUMywWAxNHPFZbdhAqHwgCAx14WlU6KBcIBAICBgJcbGZxJgYDAVwCAv6kAgMmF/6jGEQY/qQSCRMpGGsGPDMPEAUZLhlxcWBDRiQFlB8vA0wDAtAHHUE9XUBIFxUKBgQDAk0mJAG6AwICAV0BBAIBXAIAAAAEAAD/8APTAwEAGwA2AEMAUAAAJRQGKwEiBg8BBiY9ATQmKwEiJjURNDYzITIWFQEyFhQWPwE+ATsBMjY1ETQmIyEiBhURFBY7ASc0NjMhMhYUBiMhIiY1NDYzITIWFAYjISImA9IsIPIfVR1/HSkWEIwfLS0fAvofLf2OEBYUD0UdVh/gEBYWEP1SEBYWEK48FxABfBAXFxD+hBAXFxABfBAXFxD+hBAXnh8tEgw3DRsfAhAWLR8CFiAsLCD96xcfDgceDRIWEAHIEBcXEP44EBe/EBYWIBYWqBAWFh8XFwAAAAADAAD//AO0A0EAJABAAEcAAAEyFxYXFgcGBzMyHgIHAw4BIyEiLgI9ARM+ATsBNj8BNjc2FyIGDwEGFQMhMjY3EzQnJisBIiYnLgE3PgEnJgEjAx4BFzMCKiIZEw4dBQMXyRcqGwoDOw9WN/3mGS8kEy0CLR9yBwl8FRQdKxAQDXsTAQFrGSsIOgIFC9IUJAsJAggTCA0G/t9dLQEaEl0DQA4LEilKOUkTIicU/uREVBQjLxkGAVUeKxAOvyAOFlILFL8dIv59MSYBHQQCBhURECQQPF8SCf7g/qsSGAEAAAEAAAAAA8ECVwBFAAABJzc2NzY0LgEOAQcGBw4BJwYmJyYnLgIOARQXFh8BBw4BHgI2PwEWFwcGHgI+AT8BHgE3Fx4BPgEvATY3FxYyNjQnA7ReCSwbBQ0UFxQFEx5BmFBQmEEeEwUUFxQNBRssCV0IBgYQFhYIbDU5IwMGEBYWEAMlJUgkJQUeIhIEIzk1bA0jGQwBXl4GIzIKFxQKAQwLIhguLgMDLi4YIgsMAgsUFwoyIwZeCBYWEAYGCGwZDYILFhAGBhALiQMBBIkREgoeEYEOGWwNGSMNAAAHAAD/2wO5AywACAARACsAOgBHAGMAbQAAJTIWFAYiJjQ2ITIWFAYiJjQ2ATIWFxMeATMhMhYUBiMhIiYnAy4BIyImNDYBFjMyNw4BBwUGLgE2PwETNh4CDgIuAj4BFyIGHQEjIgYUFhczFRQWNj0BMz4BNCYrATU0JgUVFBcjLgE0NjMBJhcgIC4hIQHBFyEhLiAg/aQwSwlGAQoGAawMEREM/lQaKgVGBisbDBERAjUfIRoaCCAV/tsLEgMNC/ZAQG9BAj5tgW5CAj9sQQkOZgkMDAlmFxdmCQwMCWYO/twFOQsQEAtNITAhITAhITAhITAhAlY+L/6DBgcRGBAhGgF9HCMQGBH+hggFExoDJgEOFxICIAIDAT9tgG9BAj5tgW5CWg0KZg0SDQFmDg0NDmYBDRINZgoNkQIcGwEQFxEAAAACAAD//APLAvwALgA9AAABMhYfARYGBxc3Jjc+AR4BDgEHAw4BIyEiJicDLgEnNTQ+AR4CBxc3LgEnNTQ2EyEiBzcOAR4BMyEyNjQmAgIXJgsEDhYeeacFFA0pKBYEHBVJBSob/gYbKgVJFB0DEyAlHQ4CrHEUGgMxuv7XBwcDDQ4FFA0BKQ8VFQL7FxIIHz8P7GUeGBALESQrHwX+lhojIxoBagQeFQkSHxACFiESaOoJJBUKIzH9ngMBBBcaEhYeFQAACwAA/8QDvAM8AA8ALwA7AD8ATwBfAG8AcwB3AIcAlwAAATIWFREUBiMhIiY1ETQ2MyEyFh0BMzU0NjIWHQEUBisBIiY9ASMRFAYiJjURNDYzATIWFAYrASImNDYzASERIScyFh0BFAYrASImPQE0NjMTMhYVERQGIyEiJjURNDYzITIWFREUBiMhIiY1ETQ2MwchESEBIREhJTIWHQEUBisBIiY9ATQ2MyEyFh0BFAYrASImPQE0NjMBrBYfHxb+zhYfHxYCVw8UghQdFBQOyA4USxUcFBQOAVgOFBQOyA4UFA7+y/7uARJyEBcXEC4QFxcQsBYfHxb+zhYfHxYDDBYfHxb+zhYfHxa4/u4BEgHa/u4BEv20EBcXEC4QFxcQAggQFxcQLhAXFxABYR8W/s4WHx8WATIWHxQOrKwOFBQOzg8UFA+r/ssOFBQOAVgOFP6pFRwUFBwVARL+7sAXEC4QFxcQLhAXAnEfFv7OFh8fFgEyFh8fFv7OFh8fFgEyFh9F/u4BEv7uwBcQLhAXFxAuEBcXEC4QFxcQLhAXAAACAAD/3wO/Az8ALABHAAAlJicmJyYvAS4BBwUOAR8BFhcWFxYfAR4CNzY3Njc2Nz4BFxYXFhcWMxY3NiUGBwYxFjc2NzY1HwEWFxY3Nj8BNjcDBwYHBgO5ExIsHhsaFAUgEf7XEhIEEBISGRMeIRkEFRcGEhAKERIKECQeEiQbDBUNFggG/JABAwUIKB0qJQgUFxEXBw8JASk0ejU+LT5sOjuMcWV2YRISBU8FHxIrNzhPRnKTewsVBgcMFgwbHQsSCgoGEg0FCQMTEUIDCA4EAgEFAwEDHiEVHAEDGwF1cgGidIhljwAAAgAA/8cDwwL3ABIAKwAAAQcOASImLwEmPgEWHwE3PgEeATcnLgEjISIGDwEGFhcBHgE2PwU+AQLAhwoeIh4KhwkFGB4JhYUIHxgE8WcKIxb94hUlCWcKAwwBWBVHSBcuVHdLEwsCATu7Dg8PDrsMHhIFDLi4DAUTHdezEhQUErMRKBD+Jx8WFh9BcaVnGxEnAAAAAAEAAP/LA6kDNwALAAABESEVIREzESE1IREBxP6UAWx4AWz+lAM3/oZ4/oYBengBegAAAAAEAAD/uAOPA0gAFAApADYAQwAAATIXFhcWFRQGBwYiJy4BNTQ3Njc2FyIHBgcGFRQWFxYyNz4BNTQnJicmBzIeARQOASIuATQ+ARciDgEUHgEyPgE0LgECAGxdWjU2oKAhWiGgoDY1Wl1sW01MLC2Wlg4mDpaWLSxMTVs1WjQ0WmpaNDRaNSM8IyM8RjwjIzwDRzU0WFtqY/OUHh6U82NqW1g0NT8tK0pMWVPfig0Nit9TWUxKKy2IM1hnWDMzWGdYMz8jOkU7IiI7RTojAAAABQAA/9ADgwMuAAAADAAgACwANQAANzMhMhUxFCMhIjUxNAEXHgEGBwEGDwEiJj8BNjcBPgEWByIHAQc3ATY0LwEmBxQWMjY0JiIG1CQCECQk/fAkAixcFxAQF/5mEhqzHSgCCgISAZoXPT09Ew7+aQumAZkODlwNfiY1JSU1JhgkJCQkAu9cFz09F/5mEgEJKxyuGRIBmhcQED0O/mqmBgGaDSYNXA6uGiYmNSUlAAACAAD/vgPDA0MAFAA0AAAFIicmJyY0NzY3NjIXFhcWFAcGBwYBFwcOAR4CNj8BFxY+Ai8BNz4BLgIGDwEnJg4CAgB6aWY8PT08Zmn0aWY8PT08Zmn+0Xx8CAYFEBUVCHx8DCEWAQt8fAgHBg8WFQh8fAwhFgFCPTxmafRpZjw9PTxmafRpZjw9Aj58fAgVFg8GBwh8fAsBFiEMfHwIFRYPBgcIfHwLARYhAAAABQAA/70DwwNDAA8AGwAqADoASgAABSM1MzI+Aj0BMxUUDgITISImNDYzITIWFAYDNC4BKwE1MzIeAh0BIyUVIzU0PgI7ARUjIg4CERQeAjsBFSMiLgI9ATMDIYCAEyQbD0AYLjth/LwNExMNA0QNExMtGi0agIAgOy4YQPz8QBguOyCAgBMkGw8PGyQTgIAgOy4YQEJADxskE4CAIDsuGAGiExoTExoTAUEaLRpAGC47IICAgIAgOy4YQA8bJP2rEyQbD0AYLjsggAAAAwAAAAADtQKyABQAIQAuAAABMhcWFxYUBwYHBiInJicmNDc2NzYXIg4BFB4BMj4BNC4BBzIeARQOASIuATQ+AQIAd2VjOjs7OmNl7mVjOjs7OmNldzNVMjJVZVYyMlUzJDwkJDxIPCQkPAKxKCdDRKFEQycoKCdDRKFEQycobDJWZVUyMlVlVTM2JD1HPSMjPUc9JAAAAAADAAD/twOPA0gAIQAuADcAAAEyFxYXFhUUBwYHBg8BBg8BBiInJi8BJicmJyY1NDc2NzYXIg4BFB4BMj4BNC4BBzIWFAYiJjQ2AgBsXVo1NhoWLRs8HSF5BgwhDXQsNTEcJhMWNjVaXWwtTS0tTVpNLS1NLSg4OFA4OANHNjVaXWxAPDE2ID4eInEFCwtqLjcyJDEvNztsXVo1NtYtTFtNLCxNW0wtRjhQODhQOAAAAAIAAP/aA6YDJgAUACcAABM0NzY3NjIXFhcWFAcGBwYiJyYnJgUWMjcBPgEuAQ8BJy4BDgIWF1o6OF9i5mJfODo6OF9i5mJfODoBWggYCAEVCAEQGAn/dwYPDwsFBAYBgHNiXzg6OjhfYuZiXzg6OjhfYi0JCAEBCBgRAQjuewYEAwsQDwYAAAACAAD/2gOmAyYAFAApAAABMhcWFxYUBwYHBiInJicmNDc2NzYXIgcGBwYUFxYXFjI3Njc2NCcmJyYCAHNiXzg6OjhfYuZiXzg6OjhfYnNpWVgzNDQzWFnSWVgzNDQzWFkDJjo4X2LmYl84Ojo4X2LmYl84OiU0M1hZ0llYMzQ0M1hZ0llYMzQAAQAA/9oDpgMmACMAAAkBNjQvASYiBwkBJiIPAQYUFwkBBhQfARYyNwkBFjI/ATY0JwJBAVgNDQIOJA7+qf6pDiQOAg0NAVj+qA0NAg4kDgFXAVcOJA4CDQ0BgAFYDSUNAg0N/qgBWA0NAg0lDf6o/qgNJQ0CDQ0BWP6oDQ0CDSUNAAAABAAA/9wDpQMkABUAJgAyAD4AAAEyFxYXFhURFA4BIyEiLgE1ETQ+ATMFISIGFREUFjMhMjY1ETQuAQMyFhQGIyEiJjQ2MyUyFhQGIyEiJjQ2MwJ4UUZEKCkgNyH9qCE3ICA3IQGk/lwUHBwUAlgUHD1pJg8VFQ/+4A8VFQ8BIA8VFQ/+4A8VFQ8DJCkoREZR/lwhNyAgNyECWCE3IEgcFP2oFBwcFAGkPmk9/iwVHhUVHhXwFR4VFR4VAAAEAAD/nwQJA2EAFAApADUAVgAAASIHBgcGEBcWFxYgNzY3NhAnJicmAyInJicmNDc2NzYyFxYXFhQHBgcGJyIOARQeATM+ATQmAyIOARUUFjI2NzQ+AR4BDgIdARQWMjY9ATQ2Nz4BLgECKIJwbT9CQj9tcAEEcG0/QkI/bXCCcGBdNjg4Nl1g4GBdNjg4Nl1gcAkRCgoRCQ4TEw4vTi4UHBMBMkxAFx9GKxQcFBYSNjQaXgNgQj9tcP78cG0/QkI/bXABBHBtP0L8hTg2XWDgYF02ODg2XWDgYF02OKsJEBMQCQEUGxQCJi9OLw4TEw4mOgwpSUYiQyg5DhQUDjkUIgkabHVKAAABAAD/ywPgAysAKAAAASIGBy4BIyIHBgcGFRQXFhcWFxYXFhcWMjc2NzY3Njc2NzY1NCcmJyYC0j5uJiVvPkk/PSMlGg8lLVxDVTIcDyYPGzNUQ10tJQ8aJSM9PwMqODIxOScmQENNPjwjOEVZQUUpFAwMEypFQVpEOCM8Pk1DQCYnAAABAAD/3wPPAxAAJwAAARQOAQcGKwEiJwYHBgcGByMiJjU0NzY1JicuATU0NzY3NjcyFxYXFgPOSIBSVl0YHBcMHyUnMCkIChACLjstKy9BP2lreH5taD4/AbhEg2YdHwQPFhsUGAcOCwUFTTgfMjB1OlhPTC8xBDAuTlAAAwAA/8kDtwNCABgALgBDAAABBwYiJjQ/AScmPgEfATc2HgEPARcWDgEnAyYnJicmNDc2NzYyFxYXFhQHBgcGIzUyNzY3NjQnJicmIgcGBwYUFxYXFgICigcVDweKigsHHgqKigoeCAyJiQwIHgqSeGhkOz09O2Ro8WdlOzw8O2VneWtbWTQ2NjRZW9VcWTQ1NTRZXAFZiQgPFQiKigoeBwuKigsHHgqKigoeCAz++QE8O2Vn8WhkOz09O2Ro8WdlOzwzNjRZW9VcWTQ1NTRZXNVbWTQ2AAAAAgAA/8ADwgNAACcARAAAATQ2MhYVERQOAiMhIi4BNRE0PgEzITIWFAYjISIGFREUFjMhMjY1AycmPgEyHwEeAQ4BKwEiDgEdARQGIiY9ATQ+ATMDeRUdFRQkMBr9hCQ7IyM7JAEyDxUVD/7OGSIiGQJ8GSIuZAkCFB0KmwgDCBIKsixMLBUdFT9sQAFoDxUVD/7aGjAkFCM8IwJZIzwjFR0VIxj9pxkiIhkCWWkLHRMKpQgVEwwvUTHUDhUVDtREcUMAAAUAAP/dA8EDQAArAD8ATABZAGUAABMyFhQGKwEiBhURFBYzITI2NRE0JisBIiY0NjsBMhYVERQGIyEiJjURNDYzATYyFhQHAQYHBiMiLwEmNDYyHwEDMhYdARQGIiY9ATQ2BTIWHQEUBiImJzU0NgcyFhQGKwEiJjQ2M+IMEREMSwwREQwC0gwREQwxDBERDDEkMzMk/S4kMzMkAjQIGBAI/u0FBwQEDAmJCBEYCHWMDBERGBERAaMMEREYEAERUwwREQzaDBERDALxERgREQz9mgwREQwCZgwRERgRMyT9miQzMyQCZiQz/vsJERgJ/u0FAgEIiQkYEQl0AlIRDIMMEREMgwwRCBEMewwREQx7DBFHERgRERgRAAAAAwAA/+8D2AMIACgARgBXAAABMh4CFRQGBx4BFxYHFSM2NTQuAiIOAh0BIzU0PgE3LgE1ND4CBR4CFRQGBxYXFhUUBhUjNjU0LgIHNTI2NTQmJyUiDgIUHgIyPgI0LgIBpy5VQSM2LURoHB0BQgMtU252bVQtQjlpRS80I0FVAVAnQCQcGVMyNANCAyNBVS4qOTAj/ughPS4ZGS49Qj0uGRkuPQMII0FVLjhkIBtlQ0VMIQoXO21ULS1UbTshIUqHZxwfZDkuVUEjZwUtRyglPxYhSktfBRgECRguVUEjAUI5KiU5BWcZLzxCPS8ZGS89QjwvGQAAAAACAAD/vgPCA0IAFAAnAAABMhcWFxYUBwYHBiInJicmNDc2NzYTJiIGFB8BBw4BHwEWMj8BNjQnAgB6aWY7Pj47Zmn0aWY7Pj47ZmlBBhMOB5mZBgEEAwcSB6kHBwNCPjtmafRpZjs+PjtmafRpZjs+/vcHDhIHmZgGEAcDBweoBxMGAAACAAD/vgPCA0IABAAZAAABIBAgEBMGFB8BFjI3ATYuASIHAQYiLwEmIgIAAcL8fMQKCpEKHQoBPwoBExwK/uIFDgVuCRsDQvx8A4T+IAobCZIKCgE/ChwUCf7iBQVuCQADAAD/2gOmAyYAFAAcACUAAAEyFxYXFhQHBgcGIicmJyY0NzY3NgUBHgE+AiYlDgIWFwEuAQIAc2JfODo6OF9i5mJfODo6OF9iAYL+MkOfl3EvGv7AYaVUFj0B0SxnAyY6OF9i5mJfODo6OF9i5mJfODrd/iEuFTR1mZ7LAWewwUwB4SEjAAAAAwAA/9oDpgMmABQAKQAtAAABMhcWFxYUBwYHBiInJicmNDc2NzYXIgcGBwYUFxYXFjI3Njc2NCcmJyYBFSE1AgBzYl84Ojo4X2LmYl84Ojo4X2JzZ1lWMjQ0MlZZzllWMjQ0MlZZ/uEBcAMmOjhfYuZiXzg6OjhfYuZiXzg6KjQyVlnOWVYyNDQyVlnOWVYyNP6eMzMAAAACAAD/2gOmAyYAFAAgAAABMhcWFxYUBwYHBiInJicmNDc2NzYXIxUjFTMVMzUzNSMCAHNiXzg6OjhfYuZiXzg6OjhfYo00np40np4DJjo4X2LmYl84Ojo4X2LmYl84OuelM6WlMwAAAAQAAP/aA6YDJgADAAcACwAdAAATIRUhESEVIREhFSEBBhQfARYyPwE2NCYiDwEnJiJaA0z8tAFS/q4DTPy0AbAKCrAKHgqwChUdCpeXCh4B1FT+r1UDTFT9+wseCrULC7UKHhUKnJwKAAAAAAMAAP/aA6YDJgAUACkAPgAAATIXFhcWFAcGBwYiJyYnJjQ3Njc2FyIHBgcGFBcWFxYyNzY3NjQnJicmBzIWHQEXHgEPAQ4BLwImPQE0NjMCAHNiXzg6OjhfYuZiXzg6OjhfYnNeUE4uLy8uTlC8UE4uLy8uTlBLCAxoBQQCGAQNBgOACgsIAyY6OF9i5mJfODo6OF9i5mJfODpNLy5OULxQTi4vLy5OULxQTi4vmQsIyEYEDQciBgQDAVcFDOYICwAAAAAEAAD/xgPCA0IAFwAsAEYAYAAAASUmIgcFBgcGFBcWFwUWMjclNjc2NCcmBwUGBwYiJyYnJTUlNjc2MhcWFwUVFwUGBwYiJyYnJSYOARYXBRYyNyU+AS4BJyYHBQYHBiInJiclJg4BFhcFFjI3JT4BLgEnJgOo/oISMBL+ggQDExMDBAF+EjASAX4EAxMTAyj+hQQDAQIBAwT+hQF7BAMBAgEDBAF8Bf5/BAMBAgEDBP5/CxkMBwsBfhIwEgF+CAkCDAkNC/5/BAMBAgEDBP5/CxkMBwsBfhIwEgF+CAkCDAkNAlvYDw/YAgMUNhMDAtgQENgCAxM2FAMy1wIDAQEDAtcB1gIDAQEDAtYBoNoCAwEBAwLaBgcWGQbYEBDYBRATDgMEqtkCAwICAwLZBwcXGQbYEBDYBRATDwIEAAAAAAQAAP++A8MDQwAUACkALQAxAAAFIicmJyY0NzY3NjIXFhcWFAcGBwYnMjc2NzY0JyYnJiIHBgcGFBcWFxYDMxEjEzMRIwIAemlmPD09PGZp9GlmPD09PGZpemJUUTAxMTBRVMRUUTAxMTBRVCVaWrRaWkI9PGZp9GlmPD09PGZp9GlmPD1aMTBRVMRUUTAxMTBRVMRUUTAxAhz+mAFo/pgAAAAAAwAA/74DwgNDABQAKQA5AAABMhcWFxYUBwYHBiInJicmNDc2NzYXIgcGBwYUFxYXFjI3Njc2NCcmJyYHITIWFREUBiMhIiY1ETQ2AgB6aWY8PT08Zmn0aWY8PT08Zml6YlRRMDExMFFUxFRRMDExMFFU6QEOBgkJBv7yBgkJA0I9PGZp9GlmPD09PGZp9GlmPD1aMTBRVMRUUTAxMTBRVMRUUTAx0gkG/vIGCQkGAQ4GCQAAAQAA/8kDtgM2AEEAACU2JyYnJicmDwEGBwYnJicmJyYnJicmJyYnJjc2NzY/ATY3NicmLwEmJyYHBhcWFxYXFh8BFhcWHwEWFxY/ATY3NgOcGQwMMEEqNiQHCQ0TFhwhJy4hGRYPDgcHAQECAgMDBAMdBAMRCyAHKyovOTYBASghOC4wLzkyRi44QDpCLAkLCw8kLSYlJDELDikGBgEDBwcWGSogHhsYFhQSDw0MCQcGBAMeHRkgEywJOwoLLitLP1RGTD4xLzcqOxkgIQcIGwYIDBAAAAAAAQAA/90DoAMjABQAAAEiBwEOAhYXBRMeAT4BNwE2LgIDbQoI/R8OEgERDgEqgAYZHxkGARwFAw4WAyID/uMFGR8ZB4D+1g0RAREPAuAMGBULAAAAAwAA/74DwgNCAAAADABCAAATMyEyFREUIyEiNRE0ATYmJyYnJg8BBgcGJyYnJicmJyY3NjcxPgEnJi8BJicmBwYXFhcWHwEWFxYfARYXFj8BNjc2PrQCHLS0/eS0ApoNDBohFh0TAwUHCgwOEhQYLA4LBQMEEAMJBREEFxYYHiUMCSceJRgeGiUYHSIfIhcFBgUIA0K0/eS0tAIctP2IFycTGgYHFQMDAQIEBAsNFiohFxEIBBAcEQoXBR8FBhgeOS47LSUZHRYfDRASBAQOAwUGCAADAAD/vgPCA0IAAAAMAB8AABMzITIVERQjISI1ETQBIgcFDgEUFh8CHgEyNjcTNiY+tAIctLT95LQCXgUE/pwHCQgHkD4DDA8MA4kFDgNCtP3ktLQCHLT+8gKJAwwPDAM+kQYICAcBZQwVAAADAAD/ywO2AycAEgAlADcAAAEuASIOAhQeAjI2NzY3NicmAw4BIi4CND4CMhYXFhcWBwYvATUuASIGBxUUFxYfARY+ASYDKTyeq516QUF5nquePFIeHBweeTWJlYlpOTlpiZWJNUcaGBgalpQBFRwVARsDC5YNGQ8LAqk9QUF5nqycekFBPVJwbW1w/hs0OTlpiZWJaTk5NUdiX15iV1bqDhQUDvoPEAQGWwcHGh0AAAQAAP/UA10DMAAbADMAQABNAAABMhcWFxYXFAYHBg8BBiInJicmJy4BNTY3Njc2FyIHBgcGBxQWFxYfATc2Nz4BNSYnJicmBx4CDgIuAj4CFw4CHgI+AjQuAQH7X1FQLzEBJCIzxxAHFQgtQnEnIyUCMC9QUl9SRkQoKgEfHS27Cw+4LB0fAiooREZOLEssAS1MWEkqASxJKR8zHQEeND4zHh81Ay8vLk9RXzhrLUPTEQcIL0l7Mi1rOV9RTy4vMiknQ0ZRMFwnOsgLEMU5J1swUUZDJylmASxLWUssAi1LV0osMQEfNT0zHgEeND40HgAAAAAEAAD/uQPIA0kAGgA5AFsAcQAAASYnJiciBhUUFx4BFAYHDgEVFBYzMjc2NzY0BzQnJicxJiMiBhUUFhceARQGBzEGFRQWMzE2PwE+AQMmBgcxDgEHBgcjIgYVERQWOwEWFxYXFhceAT4BPQEDNCYDFScmJyYrASImNRE0NjsBMjc2NzY3A5A1XQgKDRIST1xcTwgKEg0KCF01N6chHzcKBw0SCAgpMDErDxINCAcBOEL/CRYILngmFQq3DRISDc4IFCI2MC8IFRUMAQsyLU4nHBKdDggFCowSHSpUGyACWmA6BgETDhMKMarCqjEFDwoNEwY6YGbodEU7OSIFEw0JDwUZV2dZGAoSDhMBAwEhdwIHBQIHKF4YDgQTDf4jDRMEDhguKiwHBAoTC6ICnQsT/UtoJ0MYEAoPAW0MCRAYQhUZAAACAAD/vgPBA1AAGwAxAAAlJzY3NicuAScmBwYHDgEUHgIzMjY3FxYyNjQlJicmNzY3PgEyFhcWFxYHBgcOASImA7V/SRQUIiOobWtqbFA9QUF5nlZKjjt/DCAX/TJDGBcXGEMygYyBMkMYFxcYQzKBjIEBf1dvbGhrmRkYHR9QPJ6rnnlCMzF/DBcgpURcWVlcRDE2NjFEXFlZXEQxNjYABAAA/6sEAANVAGUAlgCjALAAAAE2FhcWFxYyNzY3PgEfAR4BBzEGFRQeATsBMhYXFhcWFAcGBw4BKwEiDgEVFBcxFgYPAQYiJicmJyYiBwYHDgEvAS4BNzE2NTQuASsBIiYnJicmNDc2Nz4BOwEyPgE1NCcxJjY/AgcWFRQOAQcGFBceAhUUBxc2NzYyFxYXNyY1ND4BNzY0Jy4CNTQ3JwcGBwYiJyYXMh4BFA4BIi4BND4BFyIOARQeATI+ATQuAQFwEiwOEBcgLSEWEA4sEnwTDAkKIDYgBBIaBQIDBQUDAgUaEQUgNiAKCQwTfgwcGwkQGCEtIBkRDS0SehIMCQogNiAEExoEAgQEBAMDBBoSBSA2IAoJDBICmW0OLlAwCAgwUC4OZhIYN2I4FhNqDS5PMAgIME8uDWgBFBU2XzcWeC9QLy9QXlAvL1AvHC8cHC84LxwcLwNNCAoOERAVFQ8RDgkIRg0sFRkUITYhGxgKFyU1JRcKFxwgNyAVGRUsDUYGDAoSERcVERMPCQhFDSwVGhQgNyAcFwoXJTUlFgsYGyE2IRQZFSwNAQQ9JB8xVTUELT4uBDVUMSAkOhMSKCkRFDskIDFUNQQuPS4ENVUxICM7ARMPJicQxy9RX1EvL1FfUS9IHC85MBwcMDkvHAAAAAADAAD/wAPLAyoALQA/AEUAAAEWFxYXFhUjFxUzMhYUBisBDgIiLgEnIyImNDY7ATU3IzQ3Njc2NzU0NjIWFQEhPQExNCcmJyYiBwYHBhUxFQEjHgEyNgIkX09NLC4BAS0PFRUP8gY0TllOMwbyDxUVDy0BAS4sTE9fFh4V/qwCYCooRUelRkUoKgGa1Ak7SzwC5AkyMExPWQXpFB0UKUImJkIpFB0U6QVZT0wwMgkjDxQUD/2Q6QVNQ0AlJyclQENNBf7SIisrAAQAAP+9A5oDQwAUACEANQBBAAABMhcWFxYUBwYHBiInJicmNDc2NzYXIg4BFB4BMj4BNC4BEzIeARUUDgIjISIuAjQ+AjMFISIGFBYzITI2NCYCAExBQCUmJiVAQZhBQCUmJiVAQUw6Yzk5Y3RjOTljyClFKRcrNx79/B43KxcXKzceAgT9/CMzMyMCBCMzMwNCJiU/QJdBPyUlJSU/QZdAPyUmQTlic2I5OWJzYjn96ylFKR44KhcXKjg8NysXQTNHMjJHMwAAAgAA/70DwwNGACgAUwAAAQUeARURFA4CKwEiJy4BNzU0JiIGHQEOASsBLgM1ESY2NyU+ARYHBQ4BFxEGFx4BFzMyNjc9ATQ+AT8BMh4CHQEUFxY7ATI3NjURNCclJgYCZAEoGhwXKzcefygdDQ8BLT4sAjsqfx42JxYCGhkBLRxHSIH+0AwLAQEVDB8Qfw4VAiQ9JAgcNCgVBwoOfyYZFx3+2BlEAyLkEjce/m4bMiYUGwwhEpUfLCwflSU1ARYlMBsBfB00E/kXEQ5M/AgXDP5/GRQLDAEOCgOTJEAmAgEWKDMclwcGChcUGwGTHRXkEwEAAAUAAP+jA/kDgQALABcAZgByAIIAAAUyPgE0LgEjDgEUFgUyPgE0LgEjDgEUFgEyHgEXFhcWHQEUFhcWFxYzMjc+ATc+AjU0JyYnJiMhIi4BND4BMyEyFxYXFhUUBw4BBw4BBwYjIicmJyYnJic1NCYnLgIjIi4BND4BATIWFAYjISImNDYzJTIeARQOASMhIi4BND4BMwGoER0QEB0RGCIiAYwQHRERHRAZIiL9MiJLOw0HAwIHByI9Ql9pOj5MHyMpEhoXKigz/mcKEQoKEQoBmUY4PCIkCws0LChcRkB0d1VOKgwEBAEDBQcnLhIKEQoKEQK+DxYWD/7XEBYWEAEpChEKChEK/tcKEgoKEgpcEBwhHBABIzEjARAcIRwQASMxIwPbJ0AlFS0obyRjahJNKi0FBh0cIE9xVTcnJBMRChEUEgoaGzQ4UF9AQ2IoJSUHBzs1Yhs6NXIkYFQNFioaChEUEQr94hYfFhYfFrkKERQRCgoRFBEKAAAAAAASAN4AAQAAAAAAAAATAAAAAQAAAAAAAQAIABMAAQAAAAAAAgAHABsAAQAAAAAAAwAIACIAAQAAAAAABAAIACoAAQAAAAAABQALADIAAQAAAAAABgAIAD0AAQAAAAAACgArAEUAAQAAAAAACwATAHAAAwABBAkAAAAmAIMAAwABBAkAAQAQAKkAAwABBAkAAgAOALkAAwABBAkAAwAQAMcAAwABBAkABAAQANcAAwABBAkABQAWAOcAAwABBAkABgAQAP0AAwABBAkACgBWAQ0AAwABBAkACwAmAWNDcmVhdGVkIGJ5IGljb25mb250aWNvbmZvbnRSZWd1bGFyaWNvbmZvbnRpY29uZm9udFZlcnNpb24gMS4waWNvbmZvbnRHZW5lcmF0ZWQgYnkgc3ZnMnR0ZiBmcm9tIEZvbnRlbGxvIHByb2plY3QuaHR0cDovL2ZvbnRlbGxvLmNvbQBDAHIAZQBhAHQAZQBkACAAYgB5ACAAaQBjAG8AbgBmAG8AbgB0AGkAYwBvAG4AZgBvAG4AdABSAGUAZwB1AGwAYQByAGkAYwBvAG4AZgBvAG4AdABpAGMAbwBuAGYAbwBuAHQAVgBlAHIAcwBpAG8AbgAgADEALgAwAGkAYwBvAG4AZgBvAG4AdABHAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAHMAdgBnADIAdAB0AGYAIABmAHIAbwBtACAARgBvAG4AdABlAGwAbABvACAAcAByAG8AagBlAGMAdAAuAGgAdAB0AHAAOgAvAC8AZgBvAG4AdABlAGwAbABvAC4AYwBvAG0AAAIAAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzgECAQMBBAEFAQYBBwEIAQkBCgELAQwBDQEOAQ8BEAERARIBEwEUARUBFgEXARgBGQEaARsBHAEdAR4BHwEgASEBIgEjASQBJQEmAScBKAEpASoBKwEsAS0BLgEvATABMQEyATMBNAE1ATYBNwE4ATkBOgE7ATwBPQE+AT8BQAFBAUIBQwFEAUUBRgFHAUgBSQFKAUsBTAFNAU4BTwFQAVEBUgFTAVQBVQFWAVcBWAFZAVoBWwFcAV0BXgFfAWABYQFiAWMBZAFlAWYBZwFoAWkBagFrAWwBbQFuAW8BcAFxAXIBcwF0AXUBdgF3AXgBeQF6AXsBfAF9AX4BfwGAAYEBggGDAYQBhQGGAYcBiAGJAYoBiwGMAY0BjgGPAZABkQGSAZMBlAGVAZYBlwGYAZkBmgGbAZwBnQGeAZ8BoAGhAaIBowGkAaUBpgGnAagBqQGqAasBrAGtAa4BrwGwAbEBsgGzAbQBtQG2AbcBuAG5AboBuwG8Ab0BvgG/AcABwQHCAcMBxAHFAcYBxwHIAckBygHLAcwBzQHOAc8ABmNhbWVyYQpsZWZ0LWFycm93Emhpc3RvcmljYWwtcmVjb3JkcwtyaWdodC1hcnJvdwhncm91cGluZxBtb3JlLWZvdXItcGllY2VzC2xpc3Qtd2lkZ2V0CnNldHRsZW1lbnQKdXNlci1ncm91cApzaG9wLXNldHVwEHRyaWFuZ2xlLWxldmVsLTMJbG9nLWNoZWNrCm1lbnUtc2V0dXAKbGlzdC1hbmdsZQpsaXN0LXNldHVwCGRvd24tZ2FwFWFycm93LXJpZ2h0LWJnLXJhZGl1cwZtYXJnaW4NbWVudS1jYXRlZ29yeQxtYXAtbG9jYXRpb24HdW5pZmllZAVhbG9uZQRjaGF0FGFycm93LXJpZ2h0LWJnLXJvdW5kCGRlbGV0ZS1vBm1vcmUtbwVsYWJlbARmaXJlBnRvcC11cAlib3R0b20tdXAGZG9tYWluDGRvd25sb2FkLWJ0bgt1cGxvYWQtZmlsZQVwYW5lbARkb3duAnVwBGxlZnQFcmVzZXQKcmFkaXVzLWwtdAVyaWdodApyYWRpdXMtci1iDGFycm93LWJvdHRvbQhlbGxpcHRpYwVvdXQtdAdlbnRlci1yBHRpbGULc3ByZWFkLW92ZXIHZW50ZXItbAdlbnRlci1iBnNlYXJjaAZtaWRkbGUGY2VudGVyB2VudGVyLXQFY2xvc2UEZWRpdAR0ZXh0DmF1eGlsaWFyeS1saW5lA2ltZwVvdXQtbAVvdXQtYgNkZWwEZHJhZwVvdXQtcgpsaW5lLXBvaW50BWRlbC1vBGxpbmUMY2xvc2UtZmlsbHVwCnJhZGl1cy1yLXQKcmFkaXVzLWwtYglhcnJvdy10b3AKYXJyb3ctbGVmdAthcnJvdy1yaWdodANhZGQJZXllLWNsb3NlA2V5ZQZ0cnVlLW8JZXJyb3ItaW1nBmZvbGRlcgRmaWxlAnZmBXZpZGVvA3ppcANpcGEFZXhjZWwDdnNkA2FwawR3b3JkA3BkZgNwcHQEY2FydAR0cnVlBnVwbG9hZARzaHUyBWhlbmcyBWEtNHg0CHp1bzF5b3UyBHNodTMKc2hhbmcyeGlhMRR6dW8xeW91c2hhbmcxeW91eGlhMgpzaGFuZzF4aWEyCHRpYW56aWdlCnNoYW5nMnhpYTMIenVvMnlvdTEFYS0xZ2UDZXhlA3R4dA9hcnJvdy1yaWdodC1kYmwEdGlwcwZlZGl0LW8IZWxsaXBzaXMNYXJyb3ctcmlnaHQtbw1jbG9zZS1yb3VuZC1vCWEtbWlhb3NoYQZqaW56aGkGdHViaWFvCGNsZWFuaW5nBmJvZmFuZw5jaGVja2VkLXNtb290aAlnaWZ0LWZpbmUHZW5sYXJnZQxlbmxhcmdlLWZvdXIOZW5sYXJnZS1ib3JkZXINbWFwLW5hdmlnYXRvcglkb3duLW1hcmsGc2lnaC1vBGNvcHkOdHJhbnNmZXItY291bnQKY29sbGVjdGlvbgdjb252ZXJ0BGNhc2gIcmVjaGFyZ2UJY29udmVydC1vBmRldGFpbAVzdG9yZQRzdGFyCGxvY2F0aW9uB21lc3NhZ2UObG9naW4tbGFuZ3VhZ2UQbG9naW4tZG93bi1hcnJvdwZkZWxldGUHY2hlY2tlZBBtZW51LWNhcnQtZmlsbHVwEG1lbnUtdXNlci1maWxsdXAUbWVudS1jYXRlZ29yeS1maWxsdXAQbWVudS1ob21lLWZpbGx1cAxwYXltZW50LWZhaWwSa2V5Ym9hcmQtYmFja3NwYWNlCHRyYW5zZmVyCXd5dHctc2N0cAt0aW1pbmctdGltZQhiaWxsZm9sZAhsb2ctbGlzdA9lZGl0LWJlbG93LWxpbmUIbGlzdC1kb3QJZ2l2ZWFsaWtlBXNoYXJlDm1lc3NhZ2Utc3F1YXJlC2dpdmVhbGlrZS1vCGV5ZS1oYWxmCGNhcnQtYWRkCndkaHktZ2FvamkGcXJjb2RlCXdkZngtcHRmeAl3ZGZ4LWdqZngReHpkei10aWFuamlhYmlhb3EMeHpkei1kaW5nd2VpC3dkZHotYmlhbmppC2JqZHotZ3VhbmJpBHNjYW4Pd29kZXFpYW5iYW8tZXllD21lbmRpYW4tZGluZ3dlaQx6aGlmdS15aXh1YW4NemhpZnUtd2VpeHVhbgdjbG9zZS1vE2thaXRvbmdodWl5LWRpbmdkYW4MbWlhb3NoYS1oZGd6Cm1lbmRpYW4tc2MMbWVuZGlhbi1rZWZ1EnFpYW5kYW8tdGFuY2d1YW5iaQxzaGFyZS1zcXVhcmUMcWlhbmRhby13ZHFkDXFpYW5kYW8tenVkdWkRYXJyb3ctcmlnaHQtcm91bmQOcWlhbmRhby15aXh1YW4NemhpYm8tc2hpeGlhbwhjYXJ0LWRlYwhjYXJ0LWluYw1jYXRlZ29yeS1tb3JlCnpoaWJvLXRpbWUGcHAtYWxsDHBsYXllci1wYXVzZQpwbGF5ZXItZW5kA3RlbARzZW5kDXRlbC1iZy1zcXVhcmUOc2VuZC1iZy1zcXVhcmUEdGltZQttYXAtYWRkcmVzcwZub3RpY2UKc2VhcmNoLW1heAVzZXR1cARiZWxsCW1lbnUtdXNlcgltZW51LWhvbWUJbWVudS1jYXJ0AAAA') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-camera:before {
+  content: "\e7bb";
+}
+
+.icon-left-arrow:before {
+  content: "\e7b4";
+}
+
+.icon-historical-records:before {
+  content: "\e7b9";
+}
+
+.icon-right-arrow:before {
+  content: "\e7ba";
+}
+
+.icon-grouping:before {
+  content: "\e7d6";
+}
+
+.icon-more-four-pieces:before {
+  content: "\e7b8";
+}
+
+.icon-list-widget:before {
+  content: "\e7ad";
+}
+
+.icon-settlement:before {
+  content: "\e7ae";
+}
+
+.icon-user-group:before {
+  content: "\e7af";
+}
+
+.icon-shop-setup:before {
+  content: "\e7b0";
+}
+
+.icon-triangle-level-3:before {
+  content: "\e7b1";
+}
+
+.icon-log-check:before {
+  content: "\e7b2";
+}
+
+.icon-menu-setup:before {
+  content: "\e7b3";
+}
+
+.icon-list-angle:before {
+  content: "\e7b5";
+}
+
+.icon-list-setup:before {
+  content: "\e7b7";
+}
+
+.icon-down-gap:before {
+  content: "\e7ac";
+}
+
+.icon-arrow-right-bg-radius:before {
+  content: "\e7ab";
+}
+
+.icon-margin:before {
+  content: "\e7aa";
+}
+
+.icon-menu-category:before {
+  content: "\e7a9";
+}
+
+.icon-map-location:before {
+  content: "\e8ad";
+}
+
+.icon-unified:before {
+  content: "\e7a7";
+}
+
+.icon-alone:before {
+  content: "\e7a8";
+}
+
+.icon-chat:before {
+  content: "\e7a6";
+}
+
+.icon-arrow-right-bg-round:before {
+  content: "\e7a5";
+}
+
+.icon-delete-o:before {
+  content: "\e7a3";
+}
+
+.icon-more-o:before {
+  content: "\e7a4";
+}
+
+.icon-label:before {
+  content: "\e79f";
+}
+
+.icon-fire:before {
+  content: "\e7a2";
+}
+
+.icon-top-up:before {
+  content: "\e7a1";
+}
+
+.icon-bottom-up:before {
+  content: "\e7a0";
+}
+
+.icon-domain:before {
+  content: "\e7cf";
+}
+
+.icon-download-btn:before {
+  content: "\e707";
+}
+
+.icon-upload-file:before {
+  content: "\e72d";
+}
+
+.icon-panel:before {
+  content: "\e79e";
+}
+
+.icon-down:before {
+  content: "\e779";
+}
+
+.icon-up:before {
+  content: "\e79b";
+}
+
+.icon-left:before {
+  content: "\e755";
+}
+
+.icon-reset:before {
+  content: "\e756";
+}
+
+.icon-radius-l-t:before {
+  content: "\e757";
+}
+
+.icon-right:before {
+  content: "\e754";
+}
+
+.icon-radius-r-b:before {
+  content: "\e758";
+}
+
+.icon-arrow-bottom:before {
+  content: "\e759";
+}
+
+.icon-elliptic:before {
+  content: "\e75a";
+}
+
+.icon-out-t:before {
+  content: "\e75b";
+}
+
+.icon-enter-r:before {
+  content: "\e75c";
+}
+
+.icon-tile:before {
+  content: "\e752";
+}
+
+.icon-spread-over:before {
+  content: "\e753";
+}
+
+.icon-enter-l:before {
+  content: "\e75d";
+}
+
+.icon-enter-b:before {
+  content: "\e75f";
+}
+
+.icon-search:before {
+  content: "\e760";
+}
+
+.icon-middle:before {
+  content: "\e761";
+}
+
+.icon-center:before {
+  content: "\e762";
+}
+
+.icon-enter-t:before {
+  content: "\e763";
+}
+
+.icon-close:before {
+  content: "\e764";
+}
+
+.icon-edit:before {
+  content: "\e765";
+}
+
+.icon-text:before {
+  content: "\e766";
+}
+
+.icon-auxiliary-line:before {
+  content: "\e767";
+}
+
+.icon-img:before {
+  content: "\e768";
+}
+
+.icon-out-l:before {
+  content: "\e769";
+}
+
+.icon-out-b:before {
+  content: "\e76a";
+}
+
+.icon-del:before {
+  content: "\e76b";
+}
+
+.icon-drag:before {
+  content: "\e76c";
+}
+
+.icon-out-r:before {
+  content: "\e76d";
+}
+
+.icon-line-point:before {
+  content: "\e76e";
+}
+
+.icon-del-o:before {
+  content: "\e76f";
+}
+
+.icon-line:before {
+  content: "\e772";
+}
+
+.icon-close-fillup:before {
+  content: "\e773";
+}
+
+.icon-radius-r-t:before {
+  content: "\e774";
+}
+
+.icon-radius-l-b:before {
+  content: "\e775";
+}
+
+.icon-arrow-top:before {
+  content: "\e738";
+}
+
+.icon-arrow-left:before {
+  content: "\e73f";
+}
+
+.icon-arrow-right:before {
+  content: "\e737";
+}
+
+.icon-add:before {
+  content: "\e720";
+}
+
+.icon-eye-close:before {
+  content: "\e776";
+}
+
+.icon-eye:before {
+  content: "\e777";
+}
+
+.icon-true-o:before {
+  content: "\e77a";
+}
+
+.icon-error-img:before {
+  content: "\e77b";
+}
+
+.icon-folder:before {
+  content: "\e77c";
+}
+
+.icon-file:before {
+  content: "\e77d";
+}
+
+.icon-vf:before {
+  content: "\e77e";
+}
+
+.icon-video:before {
+  content: "\e77f";
+}
+
+.icon-zip:before {
+  content: "\e780";
+}
+
+.icon-ipa:before {
+  content: "\e781";
+}
+
+.icon-excel:before {
+  content: "\e782";
+}
+
+.icon-vsd:before {
+  content: "\e783";
+}
+
+.icon-apk:before {
+  content: "\e784";
+}
+
+.icon-word:before {
+  content: "\e785";
+}
+
+.icon-pdf:before {
+  content: "\e787";
+}
+
+.icon-ppt:before {
+  content: "\e788";
+}
+
+.icon-cart:before {
+  content: "\e791";
+}
+
+.icon-true:before {
+  content: "\e741";
+}
+
+.icon-upload:before {
+  content: "\e72b";
+}
+
+.icon-shu2:before {
+  content: "\e786";
+}
+
+.icon-heng2:before {
+  content: "\e789";
+}
+
+.icon-a-4x4:before {
+  content: "\e78a";
+}
+
+.icon-zuo1you2:before {
+  content: "\e78b";
+}
+
+.icon-shu3:before {
+  content: "\e78c";
+}
+
+.icon-shang2xia1:before {
+  content: "\e78d";
+}
+
+.icon-zuo1youshang1youxia2:before {
+  content: "\e78e";
+}
+
+.icon-shang1xia2:before {
+  content: "\e78f";
+}
+
+.icon-tianzige:before {
+  content: "\e790";
+}
+
+.icon-shang2xia3:before {
+  content: "\e792";
+}
+
+.icon-zuo2you1:before {
+  content: "\e793";
+}
+
+.icon-a-1ge:before {
+  content: "\e794";
+}
+
+.icon-exe:before {
+  content: "\e795";
+}
+
+.icon-txt:before {
+  content: "\e796";
+}
+
+.icon-arrow-right-dbl:before {
+  content: "\e7b6";
+}
+
+.icon-tips:before {
+  content: "\e74a";
+}
+
+.icon-edit-o:before {
+  content: "\e797";
+}
+
+.icon-ellipsis:before {
+  content: "\e635";
+}
+
+.icon-arrow-right-o:before {
+  content: "\e799";
+}
+
+.icon-close-round-o:before {
+  content: "\e745";
+}
+
+.icon-a-miaosha:before {
+  content: "\e79a";
+}
+
+.icon-jinzhi:before {
+  content: "\e79c";
+}
+
+.icon-tubiao:before {
+  content: "\e79d";
+}
+
+.icon-cleaning:before {
+  content: "\e64d";
+}
+
+.icon-bofang:before {
+  content: "\e798";
+}
+
+.icon-checked-smooth:before {
+  content: "\e778";
+}
+
+.icon-gift-fine:before {
+  content: "\e771";
+}
+
+.icon-enlarge:before {
+  content: "\e60d";
+}
+
+.icon-enlarge-four:before {
+  content: "\e602";
+}
+
+.icon-enlarge-border:before {
+  content: "\e6f2";
+}
+
+.icon-map-navigator:before {
+  content: "\10183";
+}
+
+.icon-down-mark:before {
+  content: "\e729";
+}
+
+.icon-sigh-o:before {
+  content: "\e71f";
+}
+
+.icon-copy:before {
+  content: "\e71e";
+}
+
+.icon-transfer-count:before {
+  content: "\e71b";
+}
+
+.icon-collection:before {
+  content: "\e71c";
+}
+
+.icon-convert:before {
+  content: "\e71d";
+}
+
+.icon-cash:before {
+  content: "\e717";
+}
+
+.icon-recharge:before {
+  content: "\e718";
+}
+
+.icon-convert-o:before {
+  content: "\e719";
+}
+
+.icon-detail:before {
+  content: "\e71a";
+}
+
+.icon-store:before {
+  content: "\e6f3";
+}
+
+.icon-star:before {
+  content: "\e6ef";
+}
+
+.icon-location:before {
+  content: "\e6f0";
+}
+
+.icon-message:before {
+  content: "\e6f1";
+}
+
+.icon-login-language:before {
+  content: "\e6ed";
+}
+
+.icon-login-down-arrow:before {
+  content: "\e6ee";
+}
+
+.icon-delete:before {
+  content: "\e6ec";
+}
+
+.icon-checked:before {
+  content: "\e6eb";
+}
+
+.icon-menu-cart-fillup:before {
+  content: "\e6e7";
+}
+
+.icon-menu-user-fillup:before {
+  content: "\e6e8";
+}
+
+.icon-menu-category-fillup:before {
+  content: "\e6e9";
+}
+
+.icon-menu-home-fillup:before {
+  content: "\e6ea";
+}
+
+.icon-payment-fail:before {
+  content: "\e6e6";
+}
+
+.icon-keyboard-backspace:before {
+  content: "\e6e5";
+}
+
+.icon-transfer:before {
+  content: "\e6e4";
+}
+
+.icon-wytw-sctp:before {
+  content: "\e6e3";
+}
+
+.icon-timing-time:before {
+  content: "\e6e2";
+}
+
+.icon-billfold:before {
+  content: "\e6e0";
+}
+
+.icon-log-list:before {
+  content: "\e6e1";
+}
+
+.icon-edit-below-line:before {
+  content: "\e6de";
+}
+
+.icon-list-dot:before {
+  content: "\e6df";
+}
+
+.icon-givealike:before {
+  content: "\e6dd";
+}
+
+.icon-share:before {
+  content: "\e6dc";
+}
+
+.icon-message-square:before {
+  content: "\e6ce";
+}
+
+.icon-givealike-o:before {
+  content: "\e6da";
+}
+
+.icon-eye-half:before {
+  content: "\e6db";
+}
+
+.icon-cart-add:before {
+  content: "\e6d9";
+}
+
+.icon-wdhy-gaoji:before {
+  content: "\e6d8";
+}
+
+.icon-qrcode:before {
+  content: "\e6d7";
+}
+
+.icon-wdfx-ptfx:before {
+  content: "\e6c6";
+}
+
+.icon-wdfx-gjfx:before {
+  content: "\e6d5";
+}
+
+.icon-xzdz-tianjiabiaoq:before {
+  content: "\e6d6";
+}
+
+.icon-xzdz-dingwei:before {
+  content: "\e6d2";
+}
+
+.icon-wddz-bianji:before {
+  content: "\e6d3";
+}
+
+.icon-bjdz-guanbi:before {
+  content: "\e6d4";
+}
+
+.icon-scan:before {
+  content: "\e6cf";
+}
+
+.icon-wodeqianbao-eye:before {
+  content: "\e6d0";
+}
+
+.icon-mendian-dingwei:before {
+  content: "\e6cd";
+}
+
+.icon-zhifu-yixuan:before {
+  content: "\e6ca";
+}
+
+.icon-zhifu-weixuan:before {
+  content: "\e6cb";
+}
+
+.icon-close-o:before {
+  content: "\e6c9";
+}
+
+.icon-kaitonghuiy-dingdan:before {
+  content: "\e6c8";
+}
+
+.icon-miaosha-hdgz:before {
+  content: "\e6c7";
+}
+
+.icon-mendian-sc:before {
+  content: "\e6c4";
+}
+
+.icon-mendian-kefu:before {
+  content: "\e6c5";
+}
+
+.icon-qiandao-tancguanbi:before {
+  content: "\e6c3";
+}
+
+.icon-share-square:before {
+  content: "\e6bd";
+}
+
+.icon-qiandao-wdqd:before {
+  content: "\e6be";
+}
+
+.icon-qiandao-zudui:before {
+  content: "\e6bf";
+}
+
+.icon-arrow-right-round:before {
+  content: "\e6c0";
+}
+
+.icon-qiandao-yixuan:before {
+  content: "\e6c1";
+}
+
+.icon-zhibo-shixiao:before {
+  content: "\e6bb";
+}
+
+.icon-cart-dec:before {
+  content: "\e6ba";
+}
+
+.icon-cart-inc:before {
+  content: "\e6b9";
+}
+
+.icon-category-more:before {
+  content: "\e6b7";
+}
+
+.icon-zhibo-time:before {
+  content: "\e6b3";
+}
+
+.icon-pp-all:before {
+  content: "\e6b4";
+}
+
+.icon-player-pause:before {
+  content: "\e6b5";
+}
+
+.icon-player-end:before {
+  content: "\e6b6";
+}
+
+.icon-tel:before {
+  content: "\e6b1";
+}
+
+.icon-send:before {
+  content: "\e6b2";
+}
+
+.icon-tel-bg-square:before {
+  content: "\e6ac";
+}
+
+.icon-send-bg-square:before {
+  content: "\e6ad";
+}
+
+.icon-time:before {
+  content: "\e6ae";
+}
+
+.icon-map-address:before {
+  content: "\e6af";
+}
+
+.icon-notice:before {
+  content: "\e6a8";
+}
+
+.icon-search-max:before {
+  content: "\e6a9";
+}
+
+.icon-setup:before {
+  content: "\e6a6";
+}
+
+.icon-bell:before {
+  content: "\e6a7";
+}
+
+.icon-menu-user:before {
+  content: "\e6a2";
+}
+
+.icon-menu-home:before {
+  content: "\e6a4";
+}
+
+.icon-menu-cart:before {
+  content: "\e6a3";
+}
+
diff --git a/static/images/black/tabbar/cart.png b/static/images/black/tabbar/cart.png
new file mode 100644
index 0000000..064d042
Binary files /dev/null and b/static/images/black/tabbar/cart.png differ
diff --git a/static/images/black/tabbar/category.png b/static/images/black/tabbar/category.png
new file mode 100644
index 0000000..f154eb0
Binary files /dev/null and b/static/images/black/tabbar/category.png differ
diff --git a/static/images/black/tabbar/home.png b/static/images/black/tabbar/home.png
new file mode 100644
index 0000000..c8599f2
Binary files /dev/null and b/static/images/black/tabbar/home.png differ
diff --git a/static/images/black/tabbar/user.png b/static/images/black/tabbar/user.png
new file mode 100644
index 0000000..65f90ee
Binary files /dev/null and b/static/images/black/tabbar/user.png differ
diff --git a/static/images/blue/tabbar/cart.png b/static/images/blue/tabbar/cart.png
new file mode 100644
index 0000000..55a4e18
Binary files /dev/null and b/static/images/blue/tabbar/cart.png differ
diff --git a/static/images/blue/tabbar/category.png b/static/images/blue/tabbar/category.png
new file mode 100644
index 0000000..41654f8
Binary files /dev/null and b/static/images/blue/tabbar/category.png differ
diff --git a/static/images/blue/tabbar/home.png b/static/images/blue/tabbar/home.png
new file mode 100644
index 0000000..fafb716
Binary files /dev/null and b/static/images/blue/tabbar/home.png differ
diff --git a/static/images/blue/tabbar/user.png b/static/images/blue/tabbar/user.png
new file mode 100644
index 0000000..0b8577b
Binary files /dev/null and b/static/images/blue/tabbar/user.png differ
diff --git a/static/images/brown/tabbar/cart.png b/static/images/brown/tabbar/cart.png
new file mode 100644
index 0000000..0ea8ae6
Binary files /dev/null and b/static/images/brown/tabbar/cart.png differ
diff --git a/static/images/brown/tabbar/category.png b/static/images/brown/tabbar/category.png
new file mode 100644
index 0000000..5001226
Binary files /dev/null and b/static/images/brown/tabbar/category.png differ
diff --git a/static/images/brown/tabbar/home.png b/static/images/brown/tabbar/home.png
new file mode 100644
index 0000000..137ce29
Binary files /dev/null and b/static/images/brown/tabbar/home.png differ
diff --git a/static/images/brown/tabbar/user.png b/static/images/brown/tabbar/user.png
new file mode 100644
index 0000000..b55d46a
Binary files /dev/null and b/static/images/brown/tabbar/user.png differ
diff --git a/static/images/common/empty.png b/static/images/common/empty.png
new file mode 100644
index 0000000..48c15e0
Binary files /dev/null and b/static/images/common/empty.png differ
diff --git a/static/images/common/error.png b/static/images/common/error.png
new file mode 100644
index 0000000..cd88d8c
Binary files /dev/null and b/static/images/common/error.png differ
diff --git a/static/images/common/image-empty.png b/static/images/common/image-empty.png
new file mode 100644
index 0000000..c24ea3f
Binary files /dev/null and b/static/images/common/image-empty.png differ
diff --git a/static/images/common/round-error-icon.png b/static/images/common/round-error-icon.png
new file mode 100644
index 0000000..1593468
Binary files /dev/null and b/static/images/common/round-error-icon.png differ
diff --git a/static/images/common/round-success-icon.png b/static/images/common/round-success-icon.png
new file mode 100644
index 0000000..9cc73b2
Binary files /dev/null and b/static/images/common/round-success-icon.png differ
diff --git a/static/images/common/tabbar/cart.png b/static/images/common/tabbar/cart.png
new file mode 100644
index 0000000..6782acc
Binary files /dev/null and b/static/images/common/tabbar/cart.png differ
diff --git a/static/images/common/tabbar/category.png b/static/images/common/tabbar/category.png
new file mode 100644
index 0000000..dab409b
Binary files /dev/null and b/static/images/common/tabbar/category.png differ
diff --git a/static/images/common/tabbar/home.png b/static/images/common/tabbar/home.png
new file mode 100644
index 0000000..5145831
Binary files /dev/null and b/static/images/common/tabbar/home.png differ
diff --git a/static/images/common/tabbar/user.png b/static/images/common/tabbar/user.png
new file mode 100644
index 0000000..d85073c
Binary files /dev/null and b/static/images/common/tabbar/user.png differ
diff --git a/static/images/common/toast-error.png b/static/images/common/toast-error.png
new file mode 100644
index 0000000..f969523
Binary files /dev/null and b/static/images/common/toast-error.png differ
diff --git a/static/images/common/user.png b/static/images/common/user.png
new file mode 100644
index 0000000..c92cec3
Binary files /dev/null and b/static/images/common/user.png differ
diff --git a/static/images/common/video.png b/static/images/common/video.png
new file mode 100644
index 0000000..cd19bfc
Binary files /dev/null and b/static/images/common/video.png differ
diff --git a/static/images/green/tabbar/cart.png b/static/images/green/tabbar/cart.png
new file mode 100644
index 0000000..bfa2fce
Binary files /dev/null and b/static/images/green/tabbar/cart.png differ
diff --git a/static/images/green/tabbar/category.png b/static/images/green/tabbar/category.png
new file mode 100644
index 0000000..afeeeb2
Binary files /dev/null and b/static/images/green/tabbar/category.png differ
diff --git a/static/images/green/tabbar/home.png b/static/images/green/tabbar/home.png
new file mode 100644
index 0000000..b74047c
Binary files /dev/null and b/static/images/green/tabbar/home.png differ
diff --git a/static/images/green/tabbar/user.png b/static/images/green/tabbar/user.png
new file mode 100644
index 0000000..c6aa717
Binary files /dev/null and b/static/images/green/tabbar/user.png differ
diff --git a/static/images/orange/tabbar/cart.png b/static/images/orange/tabbar/cart.png
new file mode 100644
index 0000000..6f532b1
Binary files /dev/null and b/static/images/orange/tabbar/cart.png differ
diff --git a/static/images/orange/tabbar/category.png b/static/images/orange/tabbar/category.png
new file mode 100644
index 0000000..65a51d8
Binary files /dev/null and b/static/images/orange/tabbar/category.png differ
diff --git a/static/images/orange/tabbar/home.png b/static/images/orange/tabbar/home.png
new file mode 100644
index 0000000..1e18d02
Binary files /dev/null and b/static/images/orange/tabbar/home.png differ
diff --git a/static/images/orange/tabbar/user.png b/static/images/orange/tabbar/user.png
new file mode 100644
index 0000000..c0df81f
Binary files /dev/null and b/static/images/orange/tabbar/user.png differ
diff --git a/static/images/purple/tabbar/cart.png b/static/images/purple/tabbar/cart.png
new file mode 100644
index 0000000..8eaa69f
Binary files /dev/null and b/static/images/purple/tabbar/cart.png differ
diff --git a/static/images/purple/tabbar/category.png b/static/images/purple/tabbar/category.png
new file mode 100644
index 0000000..7119d5b
Binary files /dev/null and b/static/images/purple/tabbar/category.png differ
diff --git a/static/images/purple/tabbar/home.png b/static/images/purple/tabbar/home.png
new file mode 100644
index 0000000..76c4c15
Binary files /dev/null and b/static/images/purple/tabbar/home.png differ
diff --git a/static/images/purple/tabbar/user.png b/static/images/purple/tabbar/user.png
new file mode 100644
index 0000000..d32afa0
Binary files /dev/null and b/static/images/purple/tabbar/user.png differ
diff --git a/static/images/red/tabbar/cart.png b/static/images/red/tabbar/cart.png
new file mode 100644
index 0000000..a9c7315
Binary files /dev/null and b/static/images/red/tabbar/cart.png differ
diff --git a/static/images/red/tabbar/category.png b/static/images/red/tabbar/category.png
new file mode 100644
index 0000000..c0a5868
Binary files /dev/null and b/static/images/red/tabbar/category.png differ
diff --git a/static/images/red/tabbar/home.png b/static/images/red/tabbar/home.png
new file mode 100644
index 0000000..eeb1211
Binary files /dev/null and b/static/images/red/tabbar/home.png differ
diff --git a/static/images/red/tabbar/user.png b/static/images/red/tabbar/user.png
new file mode 100644
index 0000000..b72fd43
Binary files /dev/null and b/static/images/red/tabbar/user.png differ
diff --git a/static/images/yellow/tabbar/cart.png b/static/images/yellow/tabbar/cart.png
new file mode 100644
index 0000000..2ba1db9
Binary files /dev/null and b/static/images/yellow/tabbar/cart.png differ
diff --git a/static/images/yellow/tabbar/category.png b/static/images/yellow/tabbar/category.png
new file mode 100644
index 0000000..e1ca545
Binary files /dev/null and b/static/images/yellow/tabbar/category.png differ
diff --git a/static/images/yellow/tabbar/home.png b/static/images/yellow/tabbar/home.png
new file mode 100644
index 0000000..1fab751
Binary files /dev/null and b/static/images/yellow/tabbar/home.png differ
diff --git a/static/images/yellow/tabbar/user.png b/static/images/yellow/tabbar/user.png
new file mode 100644
index 0000000..0a582f2
Binary files /dev/null and b/static/images/yellow/tabbar/user.png differ
diff --git a/template.h5.html b/template.h5.html
new file mode 100644
index 0000000..bec1372
--- /dev/null
+++ b/template.h5.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <link rel="shortcut icon" type="image/x-icon" href="https://d1.shopxo.vip/favicon.ico" />
+        <title>
+            <%= htmlWebpackPlugin.options.title %>
+        </title>
+        <meta name="keywords" content="商城系统,开源电商系统,免费电商系统,PHP电商系统,商城系统,B2C电商系统,B2B2C电商系统" />
+        <meta name="description" content="ShopXO是国内领先的商城系统提供商，为企业提供php商城系统、微信商城、小程序。" />
+        <script src="https://d1.shopxo.vip/static/common/app/sp-edit/quill.min.js"></script>  
+        <script src="https://d1.shopxo.vip/static/common/app/sp-edit/image-resize.min.js"></script>  
+        <script>
+            var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+        </script>
+        <link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css" />
+    </head>
+    <body>
+        <noscript>
+            <strong>Please enable JavaScript to continue.</strong>
+        </noscript>
+        <div id="app"></div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/getPhoneNumber/index.js b/uniCloud-aliyun/cloudfunctions/getPhoneNumber/index.js
new file mode 100644
index 0000000..0a79070
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/getPhoneNumber/index.js
@@ -0,0 +1,9 @@
+'use strict';
+exports.main = async(event, context) => {
+    const res = await uniCloud.getPhoneNumber({
+        provider: 'univerify',
+        access_token: event.access_token,
+        openid: event.openid
+    });
+    return (res.code == 0) ? res.phoneNumber : null;
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/getPhoneNumber/package.json b/uniCloud-aliyun/cloudfunctions/getPhoneNumber/package.json
new file mode 100644
index 0000000..e6481b3
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/getPhoneNumber/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "getPhoneNumber",
+  "dependencies": {},
+  "extensions": {
+    "uni-cloud-verify": {}
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/mp-html/README.md b/uni_modules/mp-html/README.md
new file mode 100644
index 0000000..efd81b3
--- /dev/null
+++ b/uni_modules/mp-html/README.md
@@ -0,0 +1,160 @@
+## 功能介绍
+- 全端支持（含 `v3、NVUE`）
+- 支持丰富的标签（包括 `table`、`video`、`svg` 等）
+- 支持丰富的事件效果（自动预览图片、链接处理等）
+- 支持设置占位图（加载中、出错时、预览时）
+- 支持锚点跳转、长按复制等丰富功能
+- 支持大部分 *html* 实体
+- 丰富的插件（关键词搜索、内容 **编辑** 等）
+- 效率高、容错性强且轻量化
+
+查看 [功能介绍](https://jin-yufeng.gitee.io/mp-html/#/overview/feature) 了解更多
+
+## 使用方法
+- 源码方式  
+  1. 点击上方的使用 `HBuilder X` 导入插件或将下载的插件包拷贝到项目根目录下  
+     由于插件市场的 **非 uni_modules 版本** 无法更新，若需使用请从 [github](https://github.com/jin-yufeng/mp-html/tree/master/dist/uni-app) 或 [gitee](https://gitee.com/jin-yufeng/mp-html/tree/master/dist/uni-app) 获取最新版本
+  2. 在需要使用页面的 `(n)vue` 文件中添加  
+     ```html
+     <mp-html :content="html" />
+     ```
+     ```javascript
+     import mpHtml from '@/components/mp-html/mp-html'
+     export default {
+       // HBuilderX 2.5.5+ 可以通过 easycom 自动引入
+       components: {
+         mpHtml
+       },
+       data() {
+         return {
+           html: '<div>Hello World!</div>'
+         }
+       }
+     }
+     ```
+
+- npm 方式  
+  1. 在项目根目录下执行  
+     ```bash
+     npm install mp-html
+     ```
+  2. 在需要使用页面的 `(n)vue` 文件中添加  
+     ```html
+     <mp-html :content="html" />
+     ```
+     ```javascript
+     import mpHtml from 'mp-html/dist/uni-app/components/mp-html/mp-html'
+     export default {
+       // 不可省略
+       components: {
+         mpHtml
+       },
+       data() {
+         return {
+           html: '<div>Hello World!</div>'
+         }
+       }
+     }
+     ```
+  
+  使用 *cli* 方式运行的项目，通过 *npm* 方式引入时，需要在 *vue.config.js* 中配置 *transpileDependencies*，详情可见 [#330](https://github.com/jin-yufeng/mp-html/issues/330#issuecomment-913617687)  
+  如果在 **nvue** 中使用还要将 `dist/uni-app/static` 目录下的内容拷贝到项目的 `static` 目录下，否则无法运行  
+
+查看 [快速开始](https://jin-yufeng.gitee.io/mp-html/#/overview/quickstart) 了解更多
+
+## 组件属性
+
+| 属性 | 类型 | 默认值 | 说明 |
+|:---:|:---:|:---:|---|
+| container-style | String |  | 容器的样式（[2.1.0+](https://jin-yufeng.gitee.io/mp-html/#/changelog/changelog#v210)） |
+| content | String |  | 用于渲染的 html 字符串 |
+| copy-link | Boolean | true | 是否允许外部链接被点击时自动复制 |
+| domain | String |  | 主域名（用于链接拼接） |
+| error-img | String |  | 图片出错时的占位图链接 |
+| lazy-load | Boolean | false | 是否开启图片懒加载 |
+| loading-img | String |  | 图片加载过程中的占位图链接 |
+| pause-video | Boolean | true | 是否在播放一个视频时自动暂停其他视频 |
+| preview-img | Boolean | true | 是否允许图片被点击时自动预览 |
+| scroll-table | Boolean | false | 是否给每个表格添加一个滚动层使其能单独横向滚动 |
+| selectable | Boolean | false | 是否开启文本长按复制 |
+| set-title | Boolean | true | 是否将 title 标签的内容设置到页面标题 |
+| show-img-menu | Boolean | true | 是否允许图片被长按时显示菜单 |
+| tag-style | Object |  | 设置标签的默认样式 |
+| use-anchor | Boolean | false | 是否使用锚点链接 |
+
+查看 [属性](https://jin-yufeng.gitee.io/mp-html/#/basic/prop) 了解更多
+
+## 组件事件
+
+| 名称 | 触发时机 |
+|:---:|---|
+| load | dom 树加载完毕时 |
+| ready | 图片加载完毕时 |
+| error | 发生渲染错误时 |
+| imgtap | 图片被点击时 |
+| linktap | 链接被点击时 |
+
+查看 [事件](https://jin-yufeng.gitee.io/mp-html/#/basic/event) 了解更多
+
+## api
+组件实例上提供了一些 `api` 方法可供调用
+
+| 名称 | 作用 |
+|:---:|---|
+| in | 将锚点跳转的范围限定在一个 scroll-view 内 |
+| navigateTo | 锚点跳转 |
+| getText | 获取文本内容 |
+| getRect | 获取富文本内容的位置和大小 |
+| setContent | 设置富文本内容 |
+| imgList | 获取所有图片的数组 |
+
+查看 [api](https://jin-yufeng.gitee.io/mp-html/#/advanced/api) 了解更多
+
+## 插件扩展  
+除基本功能外，本组件还提供了丰富的扩展，可按照需要选用
+
+| 名称 | 作用 |
+|:---:|---|
+| audio | 音乐播放器 |
+| editable | 富文本编辑（[示例项目](https://6874-html-foe72-1259071903.tcb.qcloud.la/editable.zip?sign=cc0017be203fb3dbca62d33a0c15792e&t=1608447445)） |
+| emoji | 解析 emoji |
+| highlight | 代码块高亮显示 |
+| markdown | 渲染 markdown |
+| search | 关键词搜索 |
+| style | 匹配 style 标签中的样式 |
+| txv-video | 使用腾讯视频 |
+| img-cache | 图片缓存 by [@PentaTea](https://github.com/PentaTea) |
+
+从插件市场导入的包中 **不含有** 扩展插件，需要使用插件参考以下方法：  
+1. 获取完整组件包  
+   ```bash
+   npm install mp-html
+   ```
+2. 编辑 `tools/config.js` 中的 `plugins` 项，选择需要的插件  
+3. 生成新的组件包  
+   在 `node_modules/mp-html` 目录下执行  
+   ```bash
+   npm install
+   npm run build:uni-app
+   ```
+4. 拷贝 `dist/uni-app` 中的内容到项目根目录  
+
+查看 [插件](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin) 了解更多
+
+## 示例体验
+![富文本插件](https://gitee.com/jin-yufeng/mp-html/raw/master/docs/assets/case/富文本插件.jpg)
+
+## 关于 nvue
+`nvue` 使用原生渲染，不支持部分 `css` 样式，为实现和 `html` 相同的效果，组件内部通过 `web-view` 进行渲染，性能上差于原生，根据 `weex` 官方建议，`web` 标签仅应用在非常规的降级场景。因此，如果通过原生的方式（如 `richtext`）能够满足需要，则不建议使用本组件，如果有较多的富文本内容，则可以直接使用 `vue` 页面  
+由于渲染方式与其他端不同，有以下限制：  
+1. 不支持 `lazy-load` 属性
+2. 视频不支持全屏播放
+
+纯 `nvue` 模式下，[此问题](https://ask.dcloud.net.cn/question/119678) 修复前，不支持通过 `uni_modules` 引入，需要本地引入（将 [dist/uni-app](https://github.com/jin-yufeng/mp-html/tree/master/dist/uni-app) 中的内容拷贝到项目根目录下）  
+
+## 问题反馈
+遇到问题时，请先查阅 [常见问题](https://jin-yufeng.gitee.io/mp-html/#/question/faq) 和 [issue](https://github.com/jin-yufeng/mp-html/issues) 中是否已有相同的问题  
+可通过 [issue](https://github.com/jin-yufeng/mp-html/issues/new/choose) 、插件问答或发送邮件到 [mp_html@126.com](mailto:mp_html@126.com) 提问，不建议在评论区提问（不方便回复）  
+提问请严格按照 [issue 模板](https://github.com/jin-yufeng/mp-html/issues/new/choose) ，描述清楚使用环境、`html` 内容或可复现的 `demo` 项目以及复现方式，对于 **描述不清**、**无法复现** 或重复的问题将不予回复  
+
+查看 [问题反馈](https://jin-yufeng.gitee.io/mp-html/#/question/feedback) 了解更多
\ No newline at end of file
diff --git a/uni_modules/mp-html/changelog.md b/uni_modules/mp-html/changelog.md
new file mode 100644
index 0000000..8512c30
--- /dev/null
+++ b/uni_modules/mp-html/changelog.md
@@ -0,0 +1,62 @@
+## v2.2.0（2021-10-12）
+1. `A` 增加 `customElements` 配置项，便于添加自定义功能性标签 [详细](https://github.com/jin-yufeng/mp-html/issues/350)
+2. `A` `editable` 插件增加切换音视频自动播放状态的功能 [详细](https://github.com/jin-yufeng/mp-html/pull/341) by [@leeseett](https://github.com/leeseett)
+3. `A` `editable` 插件删除媒体标签时触发 `remove` 事件，便于删除已上传的文件
+4. `U` `editable` 插件 `insertImg` 方法支持同时插入多张图片 [详细](https://github.com/jin-yufeng/mp-html/issues/342)
+5. `U` `editable` 插入图片和音视频时支持拼接 `domian` 主域名
+6. `F` 修复了内部链接参数中包含 `://` 时被认为是外部链接的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/356)
+7. `F` 修复了部分 `svg` 标签名或属性名大小写不正确时不生效的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/351)
+8. `F` 修复了 `nvue` 页面运行到非 `app` 平台时可能样式错误的问题
+## v2.1.5（2021-08-13）
+1. `A` 增加支持标签的 `dir` 属性
+2. `F` 修复了 `ruby` 标签文字与拼音没有居中对齐的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/325)
+3. `F` 修复了音视频标签内有 `a` 标签时可能无法播放的问题
+4. `F` 修复了 `externStyle` 中的 `class` 名包含下划线或数字时可能失效的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/326)
+5. `F` 修复了 `h5` 端引入 `externStyle` 可能不生效的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/326)
+## v2.1.4（2021-07-14）
+1. `F` 修复了 `rt` 标签无法设置样式的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/318)
+2. `F` 修复了表格中有单元格同时合并行和列时可能显示不正确的问题
+3. `F` 修复了 `app` 端无法关闭图片长按菜单的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/322)
+4. `F` 修复了 `editable` 插件只能添加图片链接不能修改的问题 [详细](https://github.com/jin-yufeng/mp-html/pull/312) by [@leeseett](https://github.com/leeseett)
+## v2.1.3（2021-06-12）
+1. `A` `editable` 插件增加 `insertTable` 方法
+2. `U` `editable` 插件支持编辑表格中的空白单元格 [详细](https://github.com/jin-yufeng/mp-html/issues/310)
+3. `F` 修复了 `externStyle` 中使用伪类可能失效的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/298)
+4. `F` 修复了多个组件同时使用时 `tag-style` 属性时可能互相影响的问题 [详细](https://github.com/jin-yufeng/mp-html/pull/305) by [@woodguoyu](https://github.com/woodguoyu)
+5. `F` 修复了包含 `linearGradient` 的 `svg` 可能无法显示的问题
+6. `F` 修复了编译到头条小程序时可能报错的问题
+7. `F` 修复了 `nvue` 端不触发 `click` 事件的问题
+8. `F` 修复了 `editable` 插件尾部插入时无法撤销的问题
+9. `F` 修复了 `editable` 插件的 `insertHtml` 方法只能在末尾插入的问题
+10. `F` 修复了 `editable` 插件插入音频不显示的问题
+## v2.1.2（2021-04-24）
+1. `A` 增加了 [img-cache](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin#img-cache) 插件，可以在 `app` 端缓存图片 [详细](https://github.com/jin-yufeng/mp-html/issues/292) by [@PentaTea](https://github.com/PentaTea)
+2. `U` 支持通过 `container-style` 属性设置 `white-space` 来保留连续空格和换行符 [详细](https://jin-yufeng.gitee.io/mp-html/#/question/faq#space)
+3. `U` 代码风格符合 [standard](https://standardjs.com) 标准
+4. `U` `editable` 插件编辑状态下支持预览视频 [详细](https://github.com/jin-yufeng/mp-html/issues/286)
+5. `F` 修复了 `svg` 标签内嵌 `svg` 时无法显示的问题
+6. `F` 修复了编译到支付宝和头条小程序时部分区域不可复制的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/291)
+## v2.1.1（2021-04-09）
+1. 修复了对 `p` 标签设置 `tag-style` 可能不生效的问题
+2. 修复了 `svg` 标签中的文本无法显示的问题
+3. 修复了使用 `editable` 插件编辑表格时可能报错的问题
+4. 修复了使用 `highlight` 插件运行到头条小程序时可能没有样式的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/280)
+5. 修复了使用 `editable` 插件 `editable` 属性为 `false` 时会报错的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/284)
+6. 修复了 `style` 插件连续子选择器失效的问题
+7. 修复了 `editable` 插件无法修改图片和字体大小的问题
+## v2.1.0.2（2021-03-21）
+修复了 `nvue` 端使用可能报错的问题
+## v2.1.0（2021-03-20）
+1. `A` 增加了 [container-style](https://jin-yufeng.gitee.io/mp-html/#/basic/prop#container-style) 属性 [详细](https://gitee.com/jin-yufeng/mp-html/pulls/1)
+2. `A` 增加支持 `strike` 标签
+3. `A` `editable` 插件增加 `placeholder` 属性 [详细](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin#editable)
+4. `A` `editable` 插件增加 `insertHtml` 方法 [详细](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin#editable)
+5. `U` 外部样式支持标签名选择器 [详细](https://jin-yufeng.gitee.io/mp-html/#/overview/quickstart#setting)
+6. `F` 修复了 `nvue` 端部分情况下可能不显示的问题
+## v2.0.5（2021-03-12）
+1. `U` [linktap](https://jin-yufeng.gitee.io/mp-html/#/basic/event#linktap) 事件增加返回内部文本内容 `innerText` [详细](https://github.com/jin-yufeng/mp-html/issues/271)
+2. `U` [selectable](https://jin-yufeng.gitee.io/mp-html/#/basic/prop#selectable) 属性设置为 `force` 时能够在微信 `iOS` 端生效（文本块会变成 `inline-block`） [详细](https://github.com/jin-yufeng/mp-html/issues/267)
+3. `F` 修复了部分情况下竖向无法滚动的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/182)
+4. `F` 修复了多次修改富文本数据时部分内容可能不显示的问题
+5. `F` 修复了 [腾讯视频](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin#txv-video) 插件可能无法播放的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/265)
+6. `F` 修复了 [highlight](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin#highlight) 插件没有设置高亮语言时没有应用默认样式的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/276) by [@fuzui](https://github.com/fuzui)
diff --git a/uni_modules/mp-html/components/mp-html/mp-html.vue b/uni_modules/mp-html/components/mp-html/mp-html.vue
new file mode 100644
index 0000000..85ccc0a
--- /dev/null
+++ b/uni_modules/mp-html/components/mp-html/mp-html.vue
@@ -0,0 +1,432 @@
+<template>
+  <view id="_root" :class="(selectable?'_select ':'')+'_root'" :style="containerStyle">
+    <slot v-if="!nodes[0]" />
+    <!-- #ifndef APP-PLUS-NVUE -->
+    <node v-else :childs="nodes" :opts="[lazyLoad,loadingImg,errorImg,showImgMenu]" name="span" />
+    <!-- #endif -->
+    <!-- #ifdef APP-PLUS-NVUE -->
+    <web-view ref="web" src="/uni_modules/mp-html/static/app-plus/mp-html/local.html" :style="'margin-top:-2px;height:' + height + 'px'" @onPostMessage="_onMessage" />
+    <!-- #endif -->
+  </view>
+</template>
+
+<script>
+/**
+ * mp-html v2.2.0
+ * @description 富文本组件
+ * @tutorial https://github.com/jin-yufeng/mp-html
+ * @property {String} container-style 容器的样式
+ * @property {String} content 用于渲染的 html 字符串
+ * @property {Boolean} copy-link 是否允许外部链接被点击时自动复制
+ * @property {String} domain 主域名，用于拼接链接
+ * @property {String} error-img 图片出错时的占位图链接
+ * @property {Boolean} lazy-load 是否开启图片懒加载
+ * @property {string} loading-img 图片加载过程中的占位图链接
+ * @property {Boolean} pause-video 是否在播放一个视频时自动暂停其他视频
+ * @property {Boolean} preview-img 是否允许图片被点击时自动预览
+ * @property {Boolean} scroll-table 是否给每个表格添加一个滚动层使其能单独横向滚动
+ * @property {Boolean | String} selectable 是否开启长按复制
+ * @property {Boolean} set-title 是否将 title 标签的内容设置到页面标题
+ * @property {Boolean} show-img-menu 是否允许图片被长按时显示菜单
+ * @property {Object} tag-style 标签的默认样式
+ * @property {Boolean | Number} use-anchor 是否使用锚点链接
+ * @event {Function} load dom 结构加载完毕时触发
+ * @event {Function} ready 所有图片加载完毕时触发
+ * @event {Function} imgTap 图片被点击时触发
+ * @event {Function} linkTap 链接被点击时触发
+ * @event {Function} error 媒体加载出错时触发
+ */
+// #ifndef APP-PLUS-NVUE
+import node from './node/node'
+// #endif
+const plugins=[]
+const Parser = require('./parser')
+// #ifdef APP-PLUS-NVUE
+const dom = weex.requireModule('dom')
+// #endif
+export default {
+  name: 'mp-html',
+  data () {
+    return {
+      nodes: [],
+      // #ifdef APP-PLUS-NVUE
+      height: 3
+      // #endif
+    }
+  },
+  props: {
+    containerStyle: {
+      type: String,
+      default: ''
+    },
+    content: String,
+    copyLink: {
+      type: [Boolean, String],
+      default: true
+    },
+    domain: String,
+    errorImg: {
+      type: String,
+      default: ''
+    },
+    lazyLoad: {
+      type: [Boolean, String],
+      default: false
+    },
+    loadingImg: {
+      type: String,
+      default: ''
+    },
+    pauseVideo: {
+      type: [Boolean, String],
+      default: true
+    },
+    previewImg: {
+      type: [Boolean, String],
+      default: true
+    },
+    scrollTable: [Boolean, String],
+    selectable: [Boolean, String],
+    setTitle: {
+      type: [Boolean, String],
+      default: true
+    },
+    showImgMenu: {
+      type: [Boolean, String],
+      default: true
+    },
+    tagStyle: Object,
+    useAnchor: [Boolean, Number]
+  },
+  // #ifndef APP-PLUS-NVUE
+  components: {
+    node
+  },
+  // #endif
+  watch: {
+    content (content) {
+      this.setContent(content)
+    }
+  },
+  created () {
+    this.plugins = []
+    for (let i = plugins.length; i--;) {
+      this.plugins.push(new plugins[i](this))
+    }
+  },
+  mounted () {
+    if (this.content && !this.nodes.length) {
+      this.setContent(this.content)
+    }
+  },
+  beforeDestroy () {
+    this._hook('onDetached')
+    clearInterval(this._timer)
+  },
+  methods: {
+    /**
+     * @description 将锚点跳转的范围限定在一个 scroll-view 内
+     * @param {Object} page scroll-view 所在页面的示例
+     * @param {String} selector scroll-view 的选择器
+     * @param {String} scrollTop scroll-view scroll-top 属性绑定的变量名
+     */
+    in (page, selector, scrollTop) {
+      // #ifndef APP-PLUS-NVUE
+      if (page && selector && scrollTop) {
+        this._in = {
+          page,
+          selector,
+          scrollTop
+        }
+      }
+      // #endif
+    },
+
+    /**
+     * @description 锚点跳转
+     * @param {String} id 要跳转的锚点 id
+     * @param {Number} offset 跳转位置的偏移量
+     * @returns {Promise}
+     */
+    navigateTo (id, offset) {
+      return new Promise((resolve, reject) => {
+        if (!this.useAnchor) {
+          reject(Error('Anchor is disabled'))
+          return
+        }
+        offset = offset || parseInt(this.useAnchor) || 0
+        // #ifdef APP-PLUS-NVUE
+        if (!id) {
+          dom.scrollToElement(this.$refs.web, {
+            offset
+          })
+          resolve()
+        } else {
+          this._navigateTo = {
+            resolve,
+            reject,
+            offset
+          }
+          this.$refs.web.evalJs('uni.postMessage({data:{action:"getOffset",offset:(document.getElementById(' + id + ')||{}).offsetTop}})')
+        }
+        // #endif
+        // #ifndef APP-PLUS-NVUE
+        let deep = ' '
+        // #ifdef MP-WEIXIN || MP-QQ || MP-TOUTIAO
+        deep = '>>>'
+        // #endif
+        const selector = uni.createSelectorQuery()
+          // #ifndef MP-ALIPAY
+          .in(this._in ? this._in.page : this)
+          // #endif
+          .select((this._in ? this._in.selector : '._root') + (id ? `${deep}#${id}` : '')).boundingClientRect()
+        if (this._in) {
+          selector.select(this._in.selector).scrollOffset()
+            .select(this._in.selector).boundingClientRect()
+        } else {
+          // 获取 scroll-view 的位置和滚动距离
+          selector.selectViewport().scrollOffset() // 获取窗口的滚动距离
+        }
+        selector.exec(res => {
+          if (!res[0]) {
+            reject(Error('Label not found'))
+            return
+          }
+          const scrollTop = res[1].scrollTop + res[0].top - (res[2] ? res[2].top : 0) + offset
+          if (this._in) {
+            // scroll-view 跳转
+            this._in.page[this._in.scrollTop] = scrollTop
+          } else {
+            // 页面跳转
+            uni.pageScrollTo({
+              scrollTop,
+              duration: 300
+            })
+          }
+          resolve()
+        })
+        // #endif
+      })
+    },
+
+    /**
+     * @description 获取文本内容
+     * @return {String}
+     */
+    getText (nodes) {
+      let text = '';
+      (function traversal (nodes) {
+        for (let i = 0; i < nodes.length; i++) {
+          const node = nodes[i]
+          if (node.type === 'text') {
+            text += node.text.replace(/&amp;/g, '&')
+          } else if (node.name === 'br') {
+            text += '\n'
+          } else {
+            // 块级标签前后加换行
+            const isBlock = node.name === 'p' || node.name === 'div' || node.name === 'tr' || node.name === 'li' || (node.name[0] === 'h' && node.name[1] > '0' && node.name[1] < '7')
+            if (isBlock && text && text[text.length - 1] !== '\n') {
+              text += '\n'
+            }
+            // 递归获取子节点的文本
+            if (node.children) {
+              traversal(node.children)
+            }
+            if (isBlock && text[text.length - 1] !== '\n') {
+              text += '\n'
+            } else if (node.name === 'td' || node.name === 'th') {
+              text += '\t'
+            }
+          }
+        }
+      })(nodes || this.nodes)
+      return text
+    },
+
+    /**
+     * @description 获取内容大小和位置
+     * @return {Promise}
+     */
+    getRect () {
+      return new Promise((resolve, reject) => {
+        uni.createSelectorQuery()
+          // #ifndef MP-ALIPAY
+          .in(this)
+          // #endif
+          .select('#_root').boundingClientRect().exec(res => res[0] ? resolve(res[0]) : reject(Error('Root label not found')))
+      })
+    },
+
+    /**
+     * @description 设置内容
+     * @param {String} content html 内容
+     * @param {Boolean} append 是否在尾部追加
+     */
+    setContent (content, append) {
+      if (!append || !this.imgList) {
+        this.imgList = []
+      }
+      const nodes = new Parser(this).parse(content)
+      // #ifdef APP-PLUS-NVUE
+      if (this._ready) {
+        this._set(nodes, append)
+      }
+      // #endif
+      this.$set(this, 'nodes', append ? (this.nodes || []).concat(nodes) : nodes)
+
+      // #ifndef APP-PLUS-NVUE
+      this._videos = []
+      this.$nextTick(() => {
+        this._hook('onLoad')
+        this.$emit('load')
+      })
+
+      // 等待图片加载完毕
+      let height
+      clearInterval(this._timer)
+      this._timer = setInterval(() => {
+        this.getRect().then(rect => {
+          // 350ms 总高度无变化就触发 ready 事件
+          if (rect.height === height) {
+            this.$emit('ready', rect)
+            clearInterval(this._timer)
+          }
+          height = rect.height
+        }).catch(() => { })
+      }, 350)
+      // #endif
+    },
+
+    /**
+     * @description 调用插件钩子函数
+     */
+    _hook (name) {
+      for (let i = plugins.length; i--;) {
+        if (this.plugins[i][name]) {
+          this.plugins[i][name]()
+        }
+      }
+    },
+
+    // #ifdef APP-PLUS-NVUE
+    /**
+     * @description 设置内容
+     */
+    _set (nodes, append) {
+      this.$refs.web.evalJs('setContent(' + JSON.stringify(nodes) + ',' + JSON.stringify([this.containerStyle.replace(/(?:margin|padding)[^;]+/g, ''), this.errorImg, this.loadingImg, this.pauseVideo, this.scrollTable, this.selectable]) + ',' + append + ')')
+    },
+
+    /**
+     * @description 接收到 web-view 消息
+     */
+    _onMessage (e) {
+      const message = e.detail.data[0]
+      switch (message.action) {
+        // web-view 初始化完毕
+        case 'onJSBridgeReady':
+          this._ready = true
+          if (this.nodes) {
+            this._set(this.nodes)
+          }
+          break
+        // 内容 dom 加载完毕
+        case 'onLoad':
+          this.height = message.height
+          this._hook('onLoad')
+          this.$emit('load')
+          break
+        // 所有图片加载完毕
+        case 'onReady':
+          this.getRect().then(res => {
+            this.$emit('ready', res)
+          }).catch(() => { })
+          break
+        // 总高度发生变化
+        case 'onHeightChange':
+          this.height = message.height
+          break
+        // 图片点击
+        case 'onImgTap':
+          this.$emit('imgtap', message.attrs)
+          if (this.previewImg) {
+            uni.previewImage({
+              current: parseInt(message.attrs.i),
+              urls: this.imgList
+            })
+          }
+          break
+        // 链接点击
+        case 'onLinkTap': {
+          const href = message.attrs.href
+          this.$emit('linktap', message.attrs)
+          if (href) {
+            // 锚点跳转
+            if (href[0] === '#') {
+              if (this.useAnchor) {
+                dom.scrollToElement(this.$refs.web, {
+                  offset: message.offset
+                })
+              }
+            } else if (href.includes('://')) {
+              // 打开外链
+              if (this.copyLink) {
+                plus.runtime.openWeb(href)
+              }
+            } else {
+              uni.navigateTo({
+                url: href,
+                fail () {
+                  uni.switchTab({
+                    url: href
+                  })
+                }
+              })
+            }
+          }
+          break
+        }
+        // 获取到锚点的偏移量
+        case 'getOffset':
+          if (typeof message.offset === 'number') {
+            dom.scrollToElement(this.$refs.web, {
+              offset: message.offset + this._navigateTo.offset
+            })
+            this._navigateTo.resolve()
+          } else {
+            this._navigateTo.reject(Error('Label not found'))
+          }
+          break
+        // 点击
+        case 'onClick':
+          this.$emit('tap')
+          this.$emit('click')
+          break
+        // 出错
+        case 'onError':
+          this.$emit('error', {
+            source: message.source,
+            attrs: message.attrs
+          })
+      }
+    }
+    // #endif
+  }
+}
+</script>
+
+<style>
+/* #ifndef APP-PLUS-NVUE */
+/* 根节点样式 */
+._root {
+  padding: 1px 0;
+  overflow-x: auto;
+  overflow-y: hidden;
+  -webkit-overflow-scrolling: touch;
+}
+
+/* 长按复制 */
+._select {
+  user-select: text;
+}
+/* #endif */
+</style>
diff --git a/uni_modules/mp-html/components/mp-html/node/node.vue b/uni_modules/mp-html/components/mp-html/node/node.vue
new file mode 100644
index 0000000..369e8bc
--- /dev/null
+++ b/uni_modules/mp-html/components/mp-html/node/node.vue
@@ -0,0 +1,534 @@
+<template>
+  <view :id="attrs.id" :class="'_block _'+name+' '+(attrs.class || '')" :style="attrs.style">
+    <block v-for="(n, i) in childs" v-bind:key="i">
+      <!-- 图片 -->
+      <!-- 占位图 -->
+      <image v-if="n.name==='img'&&((opts[1]&&!ctrl[i])||ctrl[i]<0)" class="_img" :style="n.attrs.style" :src="ctrl[i]<0?opts[2]:opts[1]" mode="widthFix" />
+      <!-- 显示图片 -->
+      <!-- #ifdef H5 || APP-PLUS -->
+      <img v-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+(n.attrs.class || '')" :style="(ctrl[i]===-1?'display:none;':'')+n.attrs.style" :src="n.attrs.src||(ctrl.load?n.attrs['data-src']:'')" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap"/>
+      <!-- #endif -->
+      <!-- #ifndef H5 || APP-PLUS -->
+      <image v-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+(n.attrs.class || '')" :style="(ctrl[i]===-1?'display:none;':'')+'width:'+(ctrl[i]||1)+'px;height:1px;'+n.attrs.style" :src="n.attrs.src" :mode="n.h?'':'widthFix'" :lazy-load="opts[0]" :webp="n.webp" :show-menu-by-longpress="opts[3]&&!n.attrs.ignore" :image-menu-prevent="!opts[3]||n.attrs.ignore" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap" />
+      <!-- #endif -->
+      <!-- 文本 -->
+      <!-- #ifndef MP-BAIDU || MP-ALIPAY || MP-TOUTIAO -->
+      <text v-else-if="n.text" :user-select="n.us" decode>{{n.text}}</text>
+      <!-- #endif -->
+      <text v-else-if="n.name==='br'">\n</text>
+      <!-- 链接 -->
+      <view v-else-if="n.name==='a'" :id="n.attrs.id" :class="(n.attrs.href?'_a ':'')+(n.attrs.class || '')" hover-class="_hover" :style="'display:inline;'+n.attrs.style" :data-i="i" @tap.stop="linkTap">
+        <node name="span" :childs="n.children" :opts="opts" style="display:inherit" />
+      </view>
+      <!-- 视频 -->
+      <!-- #ifdef APP-PLUS -->
+      <view v-else-if="n.html" :id="n.attrs.id" :class="'_video '+(n.attrs.class || '')" :style="n.attrs.style" v-html="n.html" />
+      <!-- #endif -->
+      <!-- #ifndef APP-PLUS -->
+      <video v-else-if="n.name==='video'" :id="n.attrs.id" :class="(n.attrs.class || '')" :style="n.attrs.style" :autoplay="n.attrs.autoplay" :controls="n.attrs.controls" :loop="n.attrs.loop" :muted="n.attrs.muted" :poster="n.attrs.poster" :src="n.src[ctrl[i]||0]" :data-i="i" @play="play" @error="mediaError" />
+      <!-- #endif -->
+      <!-- #ifdef H5 || APP-PLUS -->
+      <iframe v-else-if="n.name==='iframe'" :style="n.attrs.style" :allowfullscreen="n.attrs.allowfullscreen" :frameborder="n.attrs.frameborder" :src="n.attrs.src" />
+      <embed v-else-if="n.name==='embed'" :style="n.attrs.style" :src="n.attrs.src" />
+      <!-- #endif -->
+      <!-- #ifndef MP-TOUTIAO -->
+      <!-- 音频 -->
+      <audio v-else-if="n.name==='audio'" :id="n.attrs.id" :class="(n.attrs.class || '')" :style="n.attrs.style" :author="n.attrs.author" :controls="n.attrs.controls" :loop="n.attrs.loop" :name="n.attrs.name" :poster="n.attrs.poster" :src="n.src[ctrl[i]||0]" :data-i="i" @play="play" @error="mediaError" />
+      <!-- #endif -->
+      <view v-else-if="(n.name==='table'&&n.c)||n.name==='li'" :id="n.attrs.id" :class="'_'+n.name+' '+(n.attrs.class || '')" :style="n.attrs.style">
+        <node v-if="n.name==='li'" :childs="n.children" :opts="opts" />
+        <view v-else v-for="(tbody, x) in n.children" v-bind:key="x" :class="'_'+tbody.name+' '+tbody.attrs.class" :style="tbody.attrs.style">
+          <node v-if="tbody.name==='td'||tbody.name==='th'" :childs="tbody.children" :opts="opts" />
+          <block v-else v-for="(tr, y) in tbody.children" v-bind:key="y">
+            <view v-if="tr.name==='td'||tr.name==='th'" :class="'_'+tr.name+' '+tr.attrs.class" :style="tr.attrs.style">
+              <node :childs="tr.children" :opts="opts" />
+            </view>
+            <view v-else :class="'_'+tr.name+' '+tr.attrs.class" :style="tr.attrs.style">
+              <view v-for="(td, z) in tr.children" v-bind:key="z" :class="'_'+td.name+' '+td.attrs.class" :style="td.attrs.style">
+                <node :childs="td.children" :opts="opts" />
+              </view>
+            </view>
+          </block>
+        </view>
+      </view>
+      
+      <!-- 富文本 -->
+      <!-- #ifdef H5 || MP-WEIXIN || MP-QQ || APP-PLUS || MP-360 -->
+      <rich-text v-else-if="handler.use(n)" :id="n.attrs.id" :style="n.f" :nodes="[n]" />
+      <!-- #endif -->
+      <!-- #ifndef H5 || MP-WEIXIN || MP-QQ || APP-PLUS || MP-360 -->
+      <rich-text v-else-if="!n.c" :id="n.attrs.id" :style="n.f+';display:inline'" :preview="false" :nodes="[n]" />
+      <!-- #endif -->
+      <!-- 继续递归 -->
+      <view v-else-if="n.c===2" :id="n.attrs.id" :class="'_block _'+n.name+' '+(n.attrs.class || '')" :style="n.f+';'+n.attrs.style">
+        <node v-for="(n2, j) in n.children" v-bind:key="j" :style="n2.f" :name="n2.name" :attrs="n2.attrs" :childs="n2.children" :opts="opts" />
+      </view>
+      <node v-else :style="n.f" :name="n.name" :attrs="n.attrs" :childs="n.children" :opts="opts" />
+    </block>
+  </view>
+</template>
+<script module="handler" lang="wxs">
+// 行内标签列表
+var inlineTags = {
+  abbr: true,
+  b: true,
+  big: true,
+  code: true,
+  del: true,
+  em: true,
+  i: true,
+  ins: true,
+  label: true,
+  q: true,
+  small: true,
+  span: true,
+  strong: true,
+  sub: true,
+  sup: true
+}
+/**
+ * @description 是否使用 rich-text 显示剩余内容
+ */
+module.exports = {
+  use: function (item) {
+    if (item.c) return false
+    // 微信和 QQ 的 rich-text inline 布局无效
+    return !inlineTags[item.name] && (item.attrs.style || '').indexOf('display:inline') == -1
+  }
+}
+</script>
+<script>
+
+import node from './node'
+export default {
+  name: 'node',
+  options: {
+    // #ifdef MP-WEIXIN
+    virtualHost: true,
+    // #endif
+    // #ifdef MP-TOUTIAO
+    addGlobalClass: false
+    // #endif
+  },
+  data () {
+    return {
+      ctrl: {}
+    }
+  },
+  props: {
+    name: String,
+    attrs: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+    childs: Array,
+    opts: Array
+  },
+  components: {
+
+    node
+  },
+  mounted () {
+    this.$nextTick(() => {
+      for (this.root = this.$parent; this.root.$options.name !== 'mp-html'; this.root = this.root.$parent);
+    })
+    // #ifdef H5 || APP-PLUS
+    if (this.opts[0]) {
+      let i
+      for (i = this.childs.length; i--;) {
+        if (this.childs[i].name === 'img') break
+      }
+      if (i !== -1) {
+        this.observer = uni.createIntersectionObserver(this).relativeToViewport({
+          top: 500,
+          bottom: 500
+        })
+        this.observer.observe('._img', res => {
+          if (res.intersectionRatio) {
+            this.$set(this.ctrl, 'load', 1)
+            this.observer.disconnect()
+          }
+        })
+      }
+    }
+    // #endif
+  },
+  beforeDestroy () {
+    // #ifdef H5 || APP-PLUS
+    if (this.observer) {
+      this.observer.disconnect()
+    }
+    // #endif
+  },
+  methods:{
+    // #ifdef MP-WEIXIN
+    toJSON () { },
+    // #endif
+    /**
+     * @description 播放视频事件
+     * @param {Event} e
+     */
+    play (e) {
+      // #ifndef APP-PLUS
+      if (this.root.pauseVideo) {
+        let flag = false; const id = e.target.id
+        for (let i = this.root._videos.length; i--;) {
+          if (this.root._videos[i].id === id) {
+            flag = true
+          } else {
+            this.root._videos[i].pause() // 自动暂停其他视频
+          }
+        }
+        // 将自己加入列表
+        if (!flag) {
+          const ctx = uni.createVideoContext(id
+            // #ifndef MP-BAIDU
+            , this
+            // #endif
+          )
+          ctx.id = id
+          this.root._videos.push(ctx)
+        }
+      }
+      // #endif
+    },
+
+    /**
+     * @description 图片点击事件
+     * @param {Event} e
+     */
+    imgTap (e) {
+      const node = this.childs[e.currentTarget.dataset.i]
+      if (node.a) {
+        this.linkTap(node.a)
+        return
+      }
+      if (node.attrs.ignore) return
+      // #ifdef H5 || APP-PLUS
+      node.attrs.src = node.attrs.src || node.attrs['data-src']
+      // #endif
+      this.root.$emit('imgtap', node.attrs)
+      // 自动预览图片
+      if (this.root.previewImg) {
+        uni.previewImage({
+          current: parseInt(node.attrs.i),
+          urls: this.root.imgList
+        })
+      }
+    },
+
+    /**
+     * @description 图片长按
+     */
+    imgLongTap (e) {
+      // #ifdef APP-PLUS
+      const attrs = this.childs[e.currentTarget.dataset.i].attrs
+      if (this.opts[3] && !attrs.ignore) {
+        uni.showActionSheet({
+          itemList: ['保存图片'],
+          success: () => {
+            const save = path => {
+              uni.saveImageToPhotosAlbum({
+                filePath: path,
+                success () {
+                  uni.showToast({
+                    title: '保存成功'
+                  })
+                }
+              })
+            }
+            if (this.root.imgList[attrs.i].startsWith('http')) {
+              uni.downloadFile({
+                url: this.root.imgList[attrs.i],
+                success: res => save(res.tempFilePath)
+              })
+            } else {
+              save(this.root.imgList[attrs.i])
+            }
+          }
+        })
+      }
+      // #endif
+    },
+
+    /**
+     * @description 图片加载完成事件
+     * @param {Event} e
+     */
+    imgLoad (e) {
+      const i = e.currentTarget.dataset.i
+      /* #ifndef H5 || APP-PLUS */
+      if (!this.childs[i].w) {
+        // 设置原宽度
+        this.$set(this.ctrl, i, e.detail.width)
+      } else /* #endif */ if ((this.opts[1] && !this.ctrl[i]) || this.ctrl[i] === -1) {
+        // 加载完毕，取消加载中占位图
+        this.$set(this.ctrl, i, 1)
+      }
+    },
+
+    /**
+     * @description 链接点击事件
+     * @param {Event} e
+     */
+    linkTap (e) {
+      const node = e.currentTarget ? this.childs[e.currentTarget.dataset.i] : {}
+      const attrs = node.attrs || e
+      const href = attrs.href
+      this.root.$emit('linktap', Object.assign({
+        innerText: this.root.getText(node.children || []) // 链接内的文本内容
+      }, attrs))
+      if (href) {
+        if (href[0] === '#') {
+          // 跳转锚点
+          this.root.navigateTo(href.substring(1)).catch(() => { })
+        } else if (href.substr(0, 7) == '/pages/') {
+          // 跳转页面
+          uni.navigateTo({
+            url: href,
+            fail () {
+              uni.switchTab({
+                url: href,
+                fail () { }
+              })
+            }
+          })
+        } else {
+            // 复制外部链接
+            if (this.root.copyLink) {
+              if (href.split('?')[0].includes('://')) {
+                  // #ifdef H5
+                  window.open(href)
+                  // #endif
+                  // #ifdef MP
+                  uni.setClipboardData({
+                    data: href,
+                    success: () =>
+                      uni.showToast({
+                        title: '复制成功'
+                      })
+                  })
+                  // #endif
+                  // #ifdef APP-PLUS
+                  plus.runtime.openWeb(href)
+                  // #endif
+              } else {
+                  uni.setClipboardData({
+                    data: href,
+                    success: () =>
+                      uni.showToast({
+                        title: '复制成功'
+                      })
+                  })
+              }
+            }
+        }
+      }
+    },
+
+    /**
+     * @description 错误事件
+     * @param {Event} e
+     */
+    mediaError (e) {
+      const i = e.currentTarget.dataset.i
+      const node = this.childs[i]
+      // 加载其他源
+      if (node.name === 'video' || node.name === 'audio') {
+        let index = (this.ctrl[i] || 0) + 1
+        if (index > node.src.length) {
+          index = 0
+        }
+        if (index < node.src.length) {
+          this.$set(this.ctrl, i, index)
+          return
+        }
+      } else if (node.name === 'img' && this.opts[2]) {
+        // 显示错误占位图
+        this.$set(this.ctrl, i, -1)
+      }
+      if (this.root) {
+        this.root.$emit('error', {
+          source: node.name,
+          attrs: node.attrs,
+          errMsg: e.detail.errMsg
+        })
+      }
+    }
+  }
+}
+</script>
+<style>
+/* a 标签默认效果 */
+._a {
+  padding: 1.5px 0 1.5px 0;
+  color: #366092;
+  word-break: break-all;
+}
+
+/* a 标签点击态效果 */
+._hover {
+  text-decoration: underline;
+  opacity: 0.7;
+}
+
+/* 图片默认效果 */
+._img {
+  max-width: 100%;
+  -webkit-touch-callout: none;
+}
+
+/* 内部样式 */
+
+._block {
+  display: block;
+}
+
+._b,
+._strong {
+  font-weight: bold;
+}
+
+._code {
+  font-family: monospace;
+}
+
+._del {
+  text-decoration: line-through;
+}
+
+._em,
+._i {
+  font-style: italic;
+}
+
+._h1 {
+  font-size: 2em;
+}
+
+._h2 {
+  font-size: 1.5em;
+}
+
+._h3 {
+  font-size: 1.17em;
+}
+
+._h5 {
+  font-size: 0.83em;
+}
+
+._h6 {
+  font-size: 0.67em;
+}
+
+._h1,
+._h2,
+._h3,
+._h4,
+._h5,
+._h6 {
+  display: block;
+  font-weight: bold;
+}
+
+._image {
+  height: 1px;
+}
+
+._ins {
+  text-decoration: underline;
+}
+
+._li {
+  display: list-item;
+}
+
+._ol {
+  list-style-type: decimal;
+}
+
+._ol,
+._ul {
+  display: block;
+  padding-left: 40px;
+  margin: 1em 0;
+}
+
+._q::before {
+  content: '"';
+}
+
+._q::after {
+  content: '"';
+}
+
+._sub {
+  font-size: smaller;
+  vertical-align: sub;
+}
+
+._sup {
+  font-size: smaller;
+  vertical-align: super;
+}
+
+._thead,
+._tbody,
+._tfoot {
+  display: table-row-group;
+}
+
+._tr {
+  display: table-row;
+}
+
+._td,
+._th {
+  display: table-cell;
+  vertical-align: middle;
+}
+
+._th {
+  font-weight: bold;
+  text-align: center;
+}
+
+._ul {
+  list-style-type: disc;
+}
+
+._ul ._ul {
+  margin: 0;
+  list-style-type: circle;
+}
+
+._ul ._ul ._ul {
+  list-style-type: square;
+}
+
+._abbr,
+._b,
+._code,
+._del,
+._em,
+._i,
+._ins,
+._label,
+._q,
+._span,
+._strong,
+._sub,
+._sup {
+  display: inline;
+}
+
+/* #ifdef APP-PLUS */
+._video {
+  width: 300px;
+  height: 225px;
+}
+/* #endif */
+</style>
\ No newline at end of file
diff --git a/uni_modules/mp-html/components/mp-html/parser.js b/uni_modules/mp-html/components/mp-html/parser.js
new file mode 100644
index 0000000..81ab624
--- /dev/null
+++ b/uni_modules/mp-html/components/mp-html/parser.js
@@ -0,0 +1,1223 @@
+/**
+ * @fileoverview html 解析器
+ */
+
+// 配置
+const config = {
+  // 信任的标签（保持标签名不变）
+  trustTags: makeMap('a,abbr,ad,audio,b,blockquote,br,code,col,colgroup,dd,del,dl,dt,div,em,fieldset,h1,h2,h3,h4,h5,h6,hr,i,img,ins,label,legend,li,ol,p,q,ruby,rt,source,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,title,ul,video'),
+
+  // 块级标签（转为 div，其他的非信任标签转为 span）
+  blockTags: makeMap('address,article,aside,body,caption,center,cite,footer,header,html,nav,pre,section'),
+
+  // 要移除的标签
+  ignoreTags: makeMap('area,base,canvas,embed,frame,head,iframe,input,link,map,meta,param,rp,script,source,style,textarea,title,track,wbr'),
+
+  // 自闭合的标签
+  voidTags: makeMap('area,base,br,col,circle,ellipse,embed,frame,hr,img,input,line,link,meta,param,path,polygon,rect,source,track,use,wbr'),
+
+  // html 实体
+  entities: {
+    lt: '<',
+    gt: '>',
+    quot: '"',
+    apos: "'",
+    ensp: '\u2002',
+    emsp: '\u2003',
+    nbsp: '\xA0',
+    semi: ';',
+    ndash: '–',
+    mdash: '—',
+    middot: '·',
+    lsquo: '‘',
+    rsquo: '’',
+    ldquo: '“',
+    rdquo: '”',
+    bull: '•',
+    hellip: '…'
+  },
+
+  // 默认的标签样式
+  tagStyle: {
+    // #ifndef APP-PLUS-NVUE
+    address: 'font-style:italic',
+    big: 'display:inline;font-size:1.2em',
+    caption: 'display:table-caption;text-align:center',
+    center: 'text-align:center',
+    cite: 'font-style:italic',
+    dd: 'margin-left:40px',
+    mark: 'background-color:yellow',
+    pre: 'font-family:monospace;white-space:pre',
+    s: 'text-decoration:line-through',
+    small: 'display:inline;font-size:0.8em',
+    strike: 'text-decoration:line-through',
+    u: 'text-decoration:underline'
+    // #endif
+  },
+
+  // svg 大小写对照表
+  svgDict: {
+    animatetransform: 'animateTransform',
+    lineargradient: 'linearGradient',
+    viewbox: 'viewBox',
+    attributename: 'attributeName',
+    repeatcount: 'repeatCount',
+    repeatdur: 'repeatDur'
+  }
+}
+const tagSelector={}
+const {
+  windowWidth,
+  // #ifdef MP-WEIXIN
+  system
+  // #endif
+} = uni.getSystemInfoSync()
+const blankChar = makeMap(' ,\r,\n,\t,\f')
+let idIndex = 0
+
+// #ifdef H5 || APP-PLUS
+config.ignoreTags.iframe = undefined
+config.trustTags.iframe = true
+config.ignoreTags.embed = undefined
+config.trustTags.embed = true
+// #endif
+// #ifdef APP-PLUS-NVUE
+config.ignoreTags.source = undefined
+config.ignoreTags.style = undefined
+// #endif
+
+/**
+ * @description 创建 map
+ * @param {String} str 逗号分隔
+ */
+function makeMap (str) {
+  const map = Object.create(null)
+  const list = str.split(',')
+  for (let i = list.length; i--;) {
+    map[list[i]] = true
+  }
+  return map
+}
+
+/**
+ * @description 解码 html 实体
+ * @param {String} str 要解码的字符串
+ * @param {Boolean} amp 要不要解码 &amp;
+ * @returns {String} 解码后的字符串
+ */
+function decodeEntity (str, amp) {
+  let i = str.indexOf('&')
+  while (i !== -1) {
+    const j = str.indexOf(';', i + 3)
+    let code
+    if (j === -1) break
+    if (str[i + 1] === '#') {
+      // &#123; 形式的实体
+      code = parseInt((str[i + 2] === 'x' ? '0' : '') + str.substring(i + 2, j))
+      if (!isNaN(code)) {
+        str = str.substr(0, i) + String.fromCharCode(code) + str.substr(j + 1)
+      }
+    } else {
+      // &nbsp; 形式的实体
+      code = str.substring(i + 1, j)
+      if (config.entities[code] || (code === 'amp' && amp)) {
+        str = str.substr(0, i) + (config.entities[code] || '&') + str.substr(j + 1)
+      }
+    }
+    i = str.indexOf('&', i + 1)
+  }
+  return str
+}
+
+/**
+ * @description html 解析器
+ * @param {Object} vm 组件实例
+ */
+function Parser (vm) {
+  this.options = vm || {}
+  this.tagStyle = Object.assign({}, config.tagStyle, this.options.tagStyle)
+  this.imgList = vm.imgList || []
+  this.plugins = vm.plugins || []
+  this.attrs = Object.create(null)
+  this.stack = []
+  this.nodes = []
+  this.pre = (this.options.containerStyle || '').includes('white-space') && this.options.containerStyle.includes('pre') ? 2 : 0
+}
+
+/**
+ * @description 执行解析
+ * @param {String} content 要解析的文本
+ */
+Parser.prototype.parse = function (content) {
+  // 插件处理
+  for (let i = this.plugins.length; i--;) {
+    if (this.plugins[i].onUpdate) {
+      content = this.plugins[i].onUpdate(content, config) || content
+    }
+  }
+
+  new Lexer(this).parse(content)
+  // 出栈未闭合的标签
+  while (this.stack.length) {
+    this.popNode()
+  }
+  return this.nodes
+}
+
+/**
+ * @description 将标签暴露出来（不被 rich-text 包含）
+ */
+Parser.prototype.expose = function () {
+  // #ifndef APP-PLUS-NVUE
+  for (let i = this.stack.length; i--;) {
+    const item = this.stack[i]
+    if (item.c || item.name === 'a' || item.name === 'video' || item.name === 'audio') return
+    item.c = 1
+  }
+  // #endif
+}
+
+/**
+ * @description 处理插件
+ * @param {Object} node 要处理的标签
+ * @returns {Boolean} 是否要移除此标签
+ */
+Parser.prototype.hook = function (node) {
+  for (let i = this.plugins.length; i--;) {
+    if (this.plugins[i].onParse && this.plugins[i].onParse(node, this) === false) {
+      return false
+    }
+  }
+  return true
+}
+
+/**
+ * @description 将链接拼接上主域名
+ * @param {String} url 需要拼接的链接
+ * @returns {String} 拼接后的链接
+ */
+Parser.prototype.getUrl = function (url) {
+  const domain = this.options.domain
+  if (url[0] === '/') {
+    if (url[1] === '/') {
+      // // 开头的补充协议名
+      url = (domain ? domain.split('://')[0] : 'http') + ':' + url
+    } else if (domain) {
+      // 否则补充整个域名
+      url = domain + url
+    }
+  } else if (domain && !url.includes('data:') && !url.includes('://')) {
+    url = domain + '/' + url
+  }
+  return url
+}
+
+/**
+ * @description 解析样式表
+ * @param {Object} node 标签
+ * @returns {Object}
+ */
+Parser.prototype.parseStyle = function (node) {
+  const attrs = node.attrs
+  const list = (this.tagStyle[node.name] || '').split(';').concat((attrs.style || '').split(';'))
+  const styleObj = {}
+  let tmp = ''
+
+  if (attrs.id && !this.xml) {
+    // 暴露锚点
+    if (this.options.useAnchor) {
+      this.expose()
+    } else if (node.name !== 'img' && node.name !== 'a' && node.name !== 'video' && node.name !== 'audio') {
+      attrs.id = undefined
+    }
+  }
+
+  // 转换 width 和 height 属性
+  if (attrs.width) {
+    styleObj.width = parseFloat(attrs.width) + (attrs.width.includes('%') ? '%' : 'px')
+    attrs.width = undefined
+  }
+  if (attrs.height) {
+    styleObj.height = parseFloat(attrs.height) + (attrs.height.includes('%') ? '%' : 'px')
+    attrs.height = undefined
+  }
+
+  for (let i = 0, len = list.length; i < len; i++) {
+    const info = list[i].split(':')
+    if (info.length < 2) continue
+    const key = info.shift().trim().toLowerCase()
+    let value = info.join(':').trim()
+    if ((value[0] === '-' && value.lastIndexOf('-') > 0) || value.includes('safe')) {
+      // 兼容性的 css 不压缩
+      tmp += `;${key}:${value}`
+    } else if (!styleObj[key] || value.includes('import') || !styleObj[key].includes('import')) {
+      // 重复的样式进行覆盖
+      if (value.includes('url')) {
+        // 填充链接
+        let j = value.indexOf('(') + 1
+        if (j) {
+          while (value[j] === '"' || value[j] === "'" || blankChar[value[j]]) {
+            j++
+          }
+          value = value.substr(0, j) + this.getUrl(value.substr(j))
+        }
+      } else if (value.includes('rpx')) {
+        // 转换 rpx（rich-text 内部不支持 rpx）
+        value = value.replace(/[0-9.]+\s*rpx/g, $ => parseFloat($) * windowWidth / 750 + 'px')
+      }
+      styleObj[key] = value
+    }
+  }
+
+  node.attrs.style = tmp
+  return styleObj
+}
+
+/**
+ * @description 解析到标签名
+ * @param {String} name 标签名
+ * @private
+ */
+Parser.prototype.onTagName = function (name) {
+  this.tagName = this.xml ? name : name.toLowerCase()
+  if (this.tagName === 'svg') {
+    this.xml = (this.xml || 0) + 1 // svg 标签内大小写敏感
+  }
+}
+
+/**
+ * @description 解析到属性名
+ * @param {String} name 属性名
+ * @private
+ */
+Parser.prototype.onAttrName = function (name) {
+  name = this.xml ? name : name.toLowerCase()
+  if (name.substr(0, 5) === 'data-') {
+    if (name === 'data-src' && !this.attrs.src) {
+      // data-src 自动转为 src
+      this.attrName = 'src'
+    } else if (this.tagName === 'img' || this.tagName === 'a') {
+      // a 和 img 标签保留 data- 的属性，可以在 imgtap 和 linktap 事件中使用
+      this.attrName = name
+    } else {
+      // 剩余的移除以减小大小
+      this.attrName = undefined
+    }
+  } else {
+    this.attrName = name
+    this.attrs[name] = 'T' // boolean 型属性缺省设置
+  }
+}
+
+/**
+ * @description 解析到属性值
+ * @param {String} val 属性值
+ * @private
+ */
+Parser.prototype.onAttrVal = function (val) {
+  const name = this.attrName || ''
+  if (name === 'style' || name === 'href') {
+    // 部分属性进行实体解码
+    this.attrs[name] = decodeEntity(val, true)
+  } else if (name.includes('src')) {
+    // 拼接主域名
+    this.attrs[name] = this.getUrl(decodeEntity(val, true))
+  } else if (name) {
+    this.attrs[name] = val
+  }
+}
+
+/**
+ * @description 解析到标签开始
+ * @param {Boolean} selfClose 是否有自闭合标识 />
+ * @private
+ */
+Parser.prototype.onOpenTag = function (selfClose) {
+  // 拼装 node
+  const node = Object.create(null)
+  node.name = this.tagName
+  node.attrs = this.attrs
+  // 避免因为自动 diff 使得 type 被设置为 null 导致部分内容不显示
+  if (this.options.nodes.length) {
+    node.type = 'node'
+  }
+  this.attrs = Object.create(null)
+
+  const attrs = node.attrs
+  const parent = this.stack[this.stack.length - 1]
+  const siblings = parent ? parent.children : this.nodes
+  const close = this.xml ? selfClose : config.voidTags[node.name]
+
+  // 替换标签名选择器
+  if (tagSelector[node.name]) {
+    attrs.class = tagSelector[node.name] + (attrs.class ? ' ' + attrs.class : '')
+  }
+
+  // 转换 embed 标签
+  if (node.name === 'embed') {
+    // #ifndef H5 || APP-PLUS
+    const src = attrs.src || ''
+    // 按照后缀名和 type 将 embed 转为 video 或 audio
+    if (src.includes('.mp4') || src.includes('.3gp') || src.includes('.m3u8') || (attrs.type || '').includes('video')) {
+      node.name = 'video'
+    } else if (src.includes('.mp3') || src.includes('.wav') || src.includes('.aac') || src.includes('.m4a') || (attrs.type || '').includes('audio')) {
+      node.name = 'audio'
+    }
+    if (attrs.autostart) {
+      attrs.autoplay = 'T'
+    }
+    attrs.controls = 'T'
+    // #endif
+    // #ifdef H5 || APP-PLUS
+    this.expose()
+    // #endif
+  }
+
+  // #ifndef APP-PLUS-NVUE
+  // 处理音视频
+  if (node.name === 'video' || node.name === 'audio') {
+    // 设置 id 以便获取 context
+    if (node.name === 'video' && !attrs.id) {
+      attrs.id = 'v' + idIndex++
+    }
+    // 没有设置 controls 也没有设置 autoplay 的自动设置 controls
+    if (!attrs.controls && !attrs.autoplay) {
+      attrs.controls = 'T'
+    }
+    // 用数组存储所有可用的 source
+    node.src = []
+    if (attrs.src) {
+      node.src.push(attrs.src)
+      attrs.src = undefined
+    }
+    this.expose()
+  }
+  // #endif
+
+  // 处理自闭合标签
+  if (close) {
+    if (!this.hook(node) || config.ignoreTags[node.name]) {
+      // 通过 base 标签设置主域名
+      if (node.name === 'base' && !this.options.domain) {
+        this.options.domain = attrs.href
+      } /* #ifndef APP-PLUS-NVUE */ else if (node.name === 'source' && parent && (parent.name === 'video' || parent.name === 'audio') && attrs.src) {
+        // 设置 source 标签（仅父节点为 video 或 audio 时有效）
+        parent.src.push(attrs.src)
+      } /* #endif */
+      return
+    }
+
+    // 解析 style
+    const styleObj = this.parseStyle(node)
+
+    // 处理图片
+    if (node.name === 'img') {
+      if (attrs.src) {
+        // 标记 webp
+        if (attrs.src.includes('webp')) {
+          node.webp = 'T'
+        }
+        // data url 图片如果没有设置 original-src 默认为不可预览的小图片
+        if (attrs.src.includes('data:') && !attrs['original-src']) {
+          attrs.ignore = 'T'
+        }
+        if (!attrs.ignore || node.webp || attrs.src.includes('cloud://')) {
+          for (let i = this.stack.length; i--;) {
+            const item = this.stack[i]
+            if (item.name === 'a') {
+              node.a = item.attrs
+              break
+            }
+            // #ifndef H5 || APP-PLUS
+            const style = item.attrs.style || ''
+            if (style.includes('flex:') && !style.includes('flex:0') && !style.includes('flex: 0') && (!styleObj.width || !styleObj.width.includes('%'))) {
+              styleObj.width = '100% !important'
+              styleObj.height = ''
+              for (let j = i + 1; j < this.stack.length; j++) {
+                this.stack[j].attrs.style = (this.stack[j].attrs.style || '').replace('inline-', '')
+              }
+            } else if (style.includes('flex') && styleObj.width === '100%') {
+              for (let j = i + 1; j < this.stack.length; j++) {
+                const style = this.stack[j].attrs.style || ''
+                if (!style.includes(';width') && !style.includes(' width') && style.indexOf('width') !== 0) {
+                  styleObj.width = ''
+                  break
+                }
+              }
+            } else if (style.includes('inline-block')) {
+              if (styleObj.width && styleObj.width[styleObj.width.length - 1] === '%') {
+                item.attrs.style += ';max-width:' + styleObj.width
+                styleObj.width = ''
+              } else {
+                item.attrs.style += ';max-width:100%'
+              }
+            }
+            // #endif
+            item.c = 1
+          }
+          attrs.i = this.imgList.length.toString()
+          let src = attrs['original-src'] || attrs.src
+          // #ifndef H5 || MP-ALIPAY || APP-PLUS || MP-360
+          if (this.imgList.includes(src)) {
+            // 如果有重复的链接则对域名进行随机大小写变换避免预览时错位
+            let i = src.indexOf('://')
+            if (i !== -1) {
+              i += 3
+              let newSrc = src.substr(0, i)
+              for (; i < src.length; i++) {
+                if (src[i] === '/') break
+                newSrc += Math.random() > 0.5 ? src[i].toUpperCase() : src[i]
+              }
+              newSrc += src.substr(i)
+              src = newSrc
+            }
+          }
+          // #endif
+          this.imgList.push(src)
+          // #ifdef H5 || APP-PLUS
+          if (this.options.lazyLoad) {
+            attrs['data-src'] = attrs.src
+            attrs.src = undefined
+          }
+          // #endif
+        }
+      }
+      if (styleObj.display === 'inline') {
+        styleObj.display = ''
+      }
+      // #ifndef APP-PLUS-NVUE
+      if (attrs.ignore) {
+        styleObj['max-width'] = styleObj['max-width'] || '100%'
+        attrs.style += ';-webkit-touch-callout:none'
+      }
+      // #endif
+      // 设置的宽度超出屏幕，为避免变形，高度转为自动
+      if (parseInt(styleObj.width) > windowWidth) {
+        styleObj.height = undefined
+      }
+      // 记录是否设置了宽高
+      if (styleObj.width) {
+        if (styleObj.width.includes('auto')) {
+          styleObj.width = ''
+        } else {
+          node.w = 'T'
+          if (styleObj.height && !styleObj.height.includes('auto')) {
+            node.h = 'T'
+          }
+        }
+      }
+    } else if (node.name === 'svg') {
+      siblings.push(node)
+      this.stack.push(node)
+      this.popNode()
+      return
+    }
+    for (const key in styleObj) {
+      if (styleObj[key]) {
+        attrs.style += `;${key}:${styleObj[key].replace(' !important', '')}`
+      }
+    }
+    attrs.style = attrs.style.substr(1) || undefined
+  } else {
+    if ((node.name === 'pre' || ((attrs.style || '').includes('white-space') && attrs.style.includes('pre'))) && this.pre !== 2) {
+      this.pre = node.pre = 1
+    }
+    node.children = []
+    this.stack.push(node)
+  }
+
+  // 加入节点树
+  siblings.push(node)
+}
+
+/**
+ * @description 解析到标签结束
+ * @param {String} name 标签名
+ * @private
+ */
+Parser.prototype.onCloseTag = function (name) {
+  // 依次出栈到匹配为止
+  name = this.xml ? name : name.toLowerCase()
+  let i
+  for (i = this.stack.length; i--;) {
+    if (this.stack[i].name === name) break
+  }
+  if (i !== -1) {
+    while (this.stack.length > i) {
+      this.popNode()
+    }
+  } else if (name === 'p' || name === 'br') {
+    const siblings = this.stack.length ? this.stack[this.stack.length - 1].children : this.nodes
+    siblings.push({
+      name,
+      attrs: {
+        class: tagSelector[name],
+        style: this.tagStyle[name]
+      }
+    })
+  }
+}
+
+/**
+ * @description 处理标签出栈
+ * @private
+ */
+Parser.prototype.popNode = function () {
+  const node = this.stack.pop()
+  let attrs = node.attrs
+  const children = node.children
+  const parent = this.stack[this.stack.length - 1]
+  const siblings = parent ? parent.children : this.nodes
+
+  if (!this.hook(node) || config.ignoreTags[node.name]) {
+    // 获取标题
+    if (node.name === 'title' && children.length && children[0].type === 'text' && this.options.setTitle) {
+      uni.setNavigationBarTitle({
+        title: children[0].text
+      })
+    }
+    siblings.pop()
+    return
+  }
+
+  if (node.pre && this.pre !== 2) {
+    // 是否合并空白符标识
+    this.pre = node.pre = undefined
+    for (let i = this.stack.length; i--;) {
+      if (this.stack[i].pre) {
+        this.pre = 1
+      }
+    }
+  }
+
+  const styleObj = {}
+
+  // 转换 svg
+  if (node.name === 'svg') {
+    if (this.xml > 1) {
+      // 多层 svg 嵌套
+      this.xml--
+      return
+    }
+    // #ifdef APP-PLUS-NVUE
+    (function traversal (node) {
+      if (node.name) {
+        // 调整 svg 的大小写
+        node.name = config.svgDict[node.name] || node.name
+        for (const item in node.attrs) {
+          if (config.svgDict[item]) {
+            node.attrs[config.svgDict[item]] = node.attrs[item]
+            node.attrs[item] = undefined
+          }
+        }
+        for (let i = 0; i < (node.children || []).length; i++) {
+          traversal(node.children[i])
+        }
+      }
+    })(node)
+    // #endif
+    // #ifndef APP-PLUS-NVUE
+    let src = ''
+    const style = attrs.style
+    attrs.style = ''
+    attrs.xmlns = 'http://www.w3.org/2000/svg';
+    (function traversal (node) {
+      if (node.type === 'text') {
+        src += node.text
+        return
+      }
+      const name = config.svgDict[node.name] || node.name
+      src += '<' + name
+      for (const item in node.attrs) {
+        const val = node.attrs[item]
+        if (val) {
+          src += ` ${config.svgDict[item] || item}="${val}"`
+        }
+      }
+      if (!node.children) {
+        src += '/>'
+      } else {
+        src += '>'
+        for (let i = 0; i < node.children.length; i++) {
+          traversal(node.children[i])
+        }
+        src += '</' + name + '>'
+      }
+    })(node)
+    node.name = 'img'
+    node.attrs = {
+      src: 'data:image/svg+xml;utf8,' + src.replace(/#/g, '%23'),
+      style,
+      ignore: 'T'
+    }
+    node.children = undefined
+    // #endif
+    this.xml = false
+    return
+  }
+
+  // #ifndef APP-PLUS-NVUE
+  // 转换 align 属性
+  if (attrs.align) {
+    if (node.name === 'table') {
+      if (attrs.align === 'center') {
+        styleObj['margin-inline-start'] = styleObj['margin-inline-end'] = 'auto'
+      } else {
+        styleObj.float = attrs.align
+      }
+    } else {
+      styleObj['text-align'] = attrs.align
+    }
+    attrs.align = undefined
+  }
+
+  // 转换 dir 属性
+  if (attrs.dir) {
+    styleObj.direction = attrs.dir
+    attrs.dir = undefined
+  }
+
+  // 转换 font 标签的属性
+  if (node.name === 'font') {
+    if (attrs.color) {
+      styleObj.color = attrs.color
+      attrs.color = undefined
+    }
+    if (attrs.face) {
+      styleObj['font-family'] = attrs.face
+      attrs.face = undefined
+    }
+    if (attrs.size) {
+      let size = parseInt(attrs.size)
+      if (!isNaN(size)) {
+        if (size < 1) {
+          size = 1
+        } else if (size > 7) {
+          size = 7
+        }
+        styleObj['font-size'] = ['xx-small', 'x-small', 'small', 'medium', 'large', 'x-large', 'xx-large'][size - 1]
+      }
+      attrs.size = undefined
+    }
+  }
+  // #endif
+
+  // 一些编辑器的自带 class
+  if ((attrs.class || '').includes('align-center')) {
+    styleObj['text-align'] = 'center'
+  }
+
+  Object.assign(styleObj, this.parseStyle(node))
+
+  if (node.name !== 'table' && parseInt(styleObj.width) > windowWidth) {
+    styleObj['max-width'] = '100%'
+    styleObj['box-sizing'] = 'border-box'
+  }
+
+  // #ifndef APP-PLUS-NVUE
+  if (config.blockTags[node.name]) {
+    node.name = 'div'
+  } else if (!config.trustTags[node.name] && !this.xml) {
+    // 未知标签转为 span，避免无法显示
+    node.name = 'span'
+  }
+
+  if (node.name === 'a' || node.name === 'ad'
+    // #ifdef H5 || APP-PLUS
+    || node.name === 'iframe' // eslint-disable-line
+    // #endif
+  ) {
+    this.expose()
+  } /* #ifdef APP-PLUS */ else if (node.name === 'video') {
+    let str = '<video style="width:100%;height:100%"'
+    for (const item in attrs) {
+      if (attrs[item]) {
+        str += ' ' + item + '="' + attrs[item] + '"'
+      }
+    }
+    if (this.options.pauseVideo) {
+      str += ' onplay="for(var e=document.getElementsByTagName(\'video\'),t=0;t<e.length;t++)e[t]!=this&&e[t].pause()"'
+    }
+    str += '>'
+    for (let i = 0; i < node.src.length; i++) {
+      str += '<source src="' + node.src[i] + '">'
+    }
+    str += '</video>'
+    node.html = str
+  } /* #endif */ else if ((node.name === 'ul' || node.name === 'ol') && node.c) {
+    // 列表处理
+    const types = {
+      a: 'lower-alpha',
+      A: 'upper-alpha',
+      i: 'lower-roman',
+      I: 'upper-roman'
+    }
+    if (types[attrs.type]) {
+      attrs.style += ';list-style-type:' + types[attrs.type]
+      attrs.type = undefined
+    }
+    for (let i = children.length; i--;) {
+      if (children[i].name === 'li') {
+        children[i].c = 1
+      }
+    }
+  } else if (node.name === 'table') {
+    // 表格处理
+    // cellpadding、cellspacing、border 这几个常用表格属性需要通过转换实现
+    let padding = parseFloat(attrs.cellpadding)
+    let spacing = parseFloat(attrs.cellspacing)
+    const border = parseFloat(attrs.border)
+    if (node.c) {
+      // padding 和 spacing 默认 2
+      if (isNaN(padding)) {
+        padding = 2
+      }
+      if (isNaN(spacing)) {
+        spacing = 2
+      }
+    }
+    if (border) {
+      attrs.style += ';border:' + border + 'px solid gray'
+    }
+    if (node.flag && node.c) {
+      // 有 colspan 或 rowspan 且含有链接的表格通过 grid 布局实现
+      styleObj.display = 'grid'
+      if (spacing) {
+        styleObj['grid-gap'] = spacing + 'px'
+        styleObj.padding = spacing + 'px'
+      } else if (border) {
+        // 无间隔的情况下避免边框重叠
+        attrs.style += ';border-left:0;border-top:0'
+      }
+
+      const width = [] // 表格的列宽
+      const trList = [] // tr 列表
+      const cells = [] // 保存新的单元格
+      const map = {}; // 被合并单元格占用的格子
+
+      (function traversal (nodes) {
+        for (let i = 0; i < nodes.length; i++) {
+          if (nodes[i].name === 'tr') {
+            trList.push(nodes[i])
+          } else {
+            traversal(nodes[i].children || [])
+          }
+        }
+      })(children)
+
+      for (let row = 1; row <= trList.length; row++) {
+        let col = 1
+        for (let j = 0; j < trList[row - 1].children.length; j++, col++) {
+          const td = trList[row - 1].children[j]
+          if (td.name === 'td' || td.name === 'th') {
+            // 这个格子被上面的单元格占用，则列号++
+            while (map[row + '.' + col]) {
+              col++
+            }
+            let style = td.attrs.style || ''
+            const start = style.indexOf('width') ? style.indexOf(';width') : 0
+            // 提取出 td 的宽度
+            if (start !== -1) {
+              let end = style.indexOf(';', start + 6)
+              if (end === -1) {
+                end = style.length
+              }
+              if (!td.attrs.colspan) {
+                width[col] = style.substring(start ? start + 7 : 6, end)
+              }
+              style = style.substr(0, start) + style.substr(end)
+            }
+            style += (border ? `;border:${border}px solid gray` + (spacing ? '' : ';border-right:0;border-bottom:0') : '') + (padding ? `;padding:${padding}px` : '')
+            // 处理列合并
+            if (td.attrs.colspan) {
+              style += `;grid-column-start:${col};grid-column-end:${col + parseInt(td.attrs.colspan)}`
+              if (!td.attrs.rowspan) {
+                style += `;grid-row-start:${row};grid-row-end:${row + 1}`
+              }
+              col += parseInt(td.attrs.colspan) - 1
+            }
+            // 处理行合并
+            if (td.attrs.rowspan) {
+              style += `;grid-row-start:${row};grid-row-end:${row + parseInt(td.attrs.rowspan)}`
+              if (!td.attrs.colspan) {
+                style += `;grid-column-start:${col};grid-column-end:${col + 1}`
+              }
+              // 记录下方单元格被占用
+              for (let rowspan = 1; rowspan < td.attrs.rowspan; rowspan++) {
+                for (let colspan = 0; colspan < (td.attrs.colspan || 1); colspan++) {
+                  map[(row + rowspan) + '.' + (col - colspan)] = 1
+                }
+              }
+            }
+            if (style) {
+              td.attrs.style = style
+            }
+            cells.push(td)
+          }
+        }
+        if (row === 1) {
+          let temp = ''
+          for (let i = 1; i < col; i++) {
+            temp += (width[i] ? width[i] : 'auto') + ' '
+          }
+          styleObj['grid-template-columns'] = temp
+        }
+      }
+      node.children = cells
+    } else {
+      // 没有使用合并单元格的表格通过 table 布局实现
+      if (node.c) {
+        styleObj.display = 'table'
+      }
+      if (!isNaN(spacing)) {
+        styleObj['border-spacing'] = spacing + 'px'
+      }
+      if (border || padding) {
+        // 遍历
+        (function traversal (nodes) {
+          for (let i = 0; i < nodes.length; i++) {
+            const td = nodes[i]
+            if (td.name === 'th' || td.name === 'td') {
+              if (border) {
+                td.attrs.style = `border:${border}px solid gray;${td.attrs.style || ''}`
+              }
+              if (padding) {
+                td.attrs.style = `padding:${padding}px;${td.attrs.style || ''}`
+              }
+            } else if (td.children) {
+              traversal(td.children)
+            }
+          }
+        })(children)
+      }
+    }
+    // 给表格添加一个单独的横向滚动层
+    if (this.options.scrollTable && !(attrs.style || '').includes('inline')) {
+      const table = Object.assign({}, node)
+      node.name = 'div'
+      node.attrs = {
+        style: 'overflow:auto'
+      }
+      node.children = [table]
+      attrs = table.attrs
+    }
+  } else if ((node.name === 'td' || node.name === 'th') && (attrs.colspan || attrs.rowspan)) {
+    for (let i = this.stack.length; i--;) {
+      if (this.stack[i].name === 'table') {
+        this.stack[i].flag = 1 // 指示含有合并单元格
+        break
+      }
+    }
+  } else if (node.name === 'ruby') {
+    // 转换 ruby
+    node.name = 'span'
+    for (let i = 0; i < children.length - 1; i++) {
+      if (children[i].type === 'text' && children[i + 1].name === 'rt') {
+        children[i] = {
+          name: 'div',
+          attrs: {
+            style: 'display:inline-block;text-align:center'
+          },
+          children: [{
+            name: 'div',
+            attrs: {
+              style: 'font-size:50%;' + (children[i + 1].attrs.style || '')
+            },
+            children: children[i + 1].children
+          }, children[i]]
+        }
+        children.splice(i + 1, 1)
+      }
+    }
+  } else if (node.c) {
+    node.c = 2
+    for (let i = node.children.length; i--;) {
+      if (!node.children[i].c || node.children[i].name === 'table') {
+        node.c = 1
+      }
+    }
+  }
+
+  if ((styleObj.display || '').includes('flex') && !node.c) {
+    for (let i = children.length; i--;) {
+      const item = children[i]
+      if (item.f) {
+        item.attrs.style = (item.attrs.style || '') + item.f
+        item.f = undefined
+      }
+    }
+  }
+  // flex 布局时部分样式需要提取到 rich-text 外层
+  const flex = parent && (parent.attrs.style || '').includes('flex')
+    // #ifdef MP-WEIXIN
+    // 检查基础库版本 virtualHost 是否可用
+    && !(node.c && wx.getNFCAdapter) // eslint-disable-line
+    // #endif
+    // #ifndef MP-WEIXIN || MP-QQ || MP-BAIDU || MP-TOUTIAO
+    && !node.c // eslint-disable-line
+  // #endif
+  if (flex) {
+    node.f = ';max-width:100%'
+  }
+  // #endif
+
+  for (const key in styleObj) {
+    if (styleObj[key]) {
+      const val = `;${key}:${styleObj[key].replace(' !important', '')}`
+      /* #ifndef APP-PLUS-NVUE */
+      if (flex && ((key.includes('flex') && key !== 'flex-direction') || key === 'align-self' || styleObj[key][0] === '-' || (key === 'width' && val.includes('%')))) {
+        node.f += val
+        if (key === 'width') {
+          attrs.style += ';width:100%'
+        }
+      } else /* #endif */ {
+        attrs.style += val
+      }
+    }
+  }
+  attrs.style = attrs.style.substr(1) || undefined
+}
+
+/**
+ * @description 解析到文本
+ * @param {String} text 文本内容
+ */
+Parser.prototype.onText = function (text) {
+  if (!this.pre) {
+    // 合并空白符
+    let trim = ''
+    let flag
+    for (let i = 0, len = text.length; i < len; i++) {
+      if (!blankChar[text[i]]) {
+        trim += text[i]
+      } else {
+        if (trim[trim.length - 1] !== ' ') {
+          trim += ' '
+        }
+        if (text[i] === '\n' && !flag) {
+          flag = true
+        }
+      }
+    }
+    // 去除含有换行符的空串
+    if (trim === ' ' && flag) return
+    text = trim
+  }
+  const node = Object.create(null)
+  node.type = 'text'
+  node.text = decodeEntity(text)
+  if (this.hook(node)) {
+    // #ifdef MP-WEIXIN
+    if (this.options.selectable === 'force' && system.includes('iOS')) {
+      this.expose()
+      node.us = 'T'
+    }
+    // #endif
+    const siblings = this.stack.length ? this.stack[this.stack.length - 1].children : this.nodes
+    siblings.push(node)
+  }
+}
+
+/**
+ * @description html 词法分析器
+ * @param {Object} handler 高层处理器
+ */
+function Lexer (handler) {
+  this.handler = handler
+}
+
+/**
+ * @description 执行解析
+ * @param {String} content 要解析的文本
+ */
+Lexer.prototype.parse = function (content) {
+  this.content = content || ''
+  this.i = 0 // 标记解析位置
+  this.start = 0 // 标记一个单词的开始位置
+  this.state = this.text // 当前状态
+  for (let len = this.content.length; this.i !== -1 && this.i < len;) {
+    this.state()
+  }
+}
+
+/**
+ * @description 检查标签是否闭合
+ * @param {String} method 如果闭合要进行的操作
+ * @returns {Boolean} 是否闭合
+ * @private
+ */
+Lexer.prototype.checkClose = function (method) {
+  const selfClose = this.content[this.i] === '/'
+  if (this.content[this.i] === '>' || (selfClose && this.content[this.i + 1] === '>')) {
+    if (method) {
+      this.handler[method](this.content.substring(this.start, this.i))
+    }
+    this.i += selfClose ? 2 : 1
+    this.start = this.i
+    this.handler.onOpenTag(selfClose)
+    if (this.handler.tagName === 'script') {
+      this.i = this.content.indexOf('</', this.i)
+      if (this.i !== -1) {
+        this.i += 2
+        this.start = this.i
+      }
+      this.state = this.endTag
+    } else {
+      this.state = this.text
+    }
+    return true
+  }
+  return false
+}
+
+/**
+ * @description 文本状态
+ * @private
+ */
+Lexer.prototype.text = function () {
+  this.i = this.content.indexOf('<', this.i) // 查找最近的标签
+  if (this.i === -1) {
+    // 没有标签了
+    if (this.start < this.content.length) {
+      this.handler.onText(this.content.substring(this.start, this.content.length))
+    }
+    return
+  }
+  const c = this.content[this.i + 1]
+  if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
+    // 标签开头
+    if (this.start !== this.i) {
+      this.handler.onText(this.content.substring(this.start, this.i))
+    }
+    this.start = ++this.i
+    this.state = this.tagName
+  } else if (c === '/' || c === '!' || c === '?') {
+    if (this.start !== this.i) {
+      this.handler.onText(this.content.substring(this.start, this.i))
+    }
+    const next = this.content[this.i + 2]
+    if (c === '/' && ((next >= 'a' && next <= 'z') || (next >= 'A' && next <= 'Z'))) {
+      // 标签结尾
+      this.i += 2
+      this.start = this.i
+      this.state = this.endTag
+      return
+    }
+    // 处理注释
+    let end = '-->'
+    if (c !== '!' || this.content[this.i + 2] !== '-' || this.content[this.i + 3] !== '-') {
+      end = '>'
+    }
+    this.i = this.content.indexOf(end, this.i)
+    if (this.i !== -1) {
+      this.i += end.length
+      this.start = this.i
+    }
+  } else {
+    this.i++
+  }
+}
+
+/**
+ * @description 标签名状态
+ * @private
+ */
+Lexer.prototype.tagName = function () {
+  if (blankChar[this.content[this.i]]) {
+    // 解析到标签名
+    this.handler.onTagName(this.content.substring(this.start, this.i))
+    while (blankChar[this.content[++this.i]]);
+    if (this.i < this.content.length && !this.checkClose()) {
+      this.start = this.i
+      this.state = this.attrName
+    }
+  } else if (!this.checkClose('onTagName')) {
+    this.i++
+  }
+}
+
+/**
+ * @description 属性名状态
+ * @private
+ */
+Lexer.prototype.attrName = function () {
+  let c = this.content[this.i]
+  if (blankChar[c] || c === '=') {
+    // 解析到属性名
+    this.handler.onAttrName(this.content.substring(this.start, this.i))
+    let needVal = c === '='
+    const len = this.content.length
+    while (++this.i < len) {
+      c = this.content[this.i]
+      if (!blankChar[c]) {
+        if (this.checkClose()) return
+        if (needVal) {
+          // 等号后遇到第一个非空字符
+          this.start = this.i
+          this.state = this.attrVal
+          return
+        }
+        if (this.content[this.i] === '=') {
+          needVal = true
+        } else {
+          this.start = this.i
+          this.state = this.attrName
+          return
+        }
+      }
+    }
+  } else if (!this.checkClose('onAttrName')) {
+    this.i++
+  }
+}
+
+/**
+ * @description 属性值状态
+ * @private
+ */
+Lexer.prototype.attrVal = function () {
+  const c = this.content[this.i]
+  const len = this.content.length
+  if (c === '"' || c === "'") {
+    // 有冒号的属性
+    this.start = ++this.i
+    this.i = this.content.indexOf(c, this.i)
+    if (this.i === -1) return
+    this.handler.onAttrVal(this.content.substring(this.start, this.i))
+  } else {
+    // 没有冒号的属性
+    for (; this.i < len; this.i++) {
+      if (blankChar[this.content[this.i]]) {
+        this.handler.onAttrVal(this.content.substring(this.start, this.i))
+        break
+      } else if (this.checkClose('onAttrVal')) return
+    }
+  }
+  while (blankChar[this.content[++this.i]]);
+  if (this.i < len && !this.checkClose()) {
+    this.start = this.i
+    this.state = this.attrName
+  }
+}
+
+/**
+ * @description 结束标签状态
+ * @returns {String} 结束的标签名
+ * @private
+ */
+Lexer.prototype.endTag = function () {
+  const c = this.content[this.i]
+  if (blankChar[c] || c === '>' || c === '/') {
+    this.handler.onCloseTag(this.content.substring(this.start, this.i))
+    if (c !== '>') {
+      this.i = this.content.indexOf('>', this.i)
+      if (this.i === -1) return
+    }
+    this.start = ++this.i
+    this.state = this.text
+  } else {
+    this.i++
+  }
+}
+
+module.exports = Parser
diff --git a/uni_modules/mp-html/package.json b/uni_modules/mp-html/package.json
new file mode 100644
index 0000000..0f1269c
--- /dev/null
+++ b/uni_modules/mp-html/package.json
@@ -0,0 +1,79 @@
+{
+    "id": "mp-html",
+    "displayName": "mp-html 富文本组件【全端支持，可编辑】",
+    "version": "v2.2.0",
+    "description": "一个强大的富文本组件，高效轻量，功能丰富",
+    "keywords": [
+        "富文本",
+        "编辑器",
+        "html",
+        "rich-text",
+        "editor"
+    ],
+    "repository": "https://github.com/jin-yufeng/mp-html",
+    "dcloudext": {
+        "category": [
+            "前端组件",
+            "通用组件"
+        ],
+        "sale": {
+            "regular": {
+                "price": "0.00"
+            },
+            "sourcecode": {
+                "price": "0.00"
+            }
+        },
+        "contact": {
+            "qq": ""
+        },
+        "declaration": {
+            "ads": "无",
+            "data": "无",
+            "permissions": "无"
+        },
+        "npmurl": "https://www.npmjs.com/package/mp-html"
+    },
+    "uni_modules": {
+        "platforms": {
+            "cloud": {
+                "tcb": "y",
+                "aliyun": "y"
+            },
+            "client": {
+                "App": {
+                    "app-vue": "y",
+                    "app-nvue": "y"
+                },
+                "H5-mobile": {
+                    "Safari": "y",
+                    "Android Browser": "y",
+                    "微信浏览器(Android)": "y",
+                    "QQ浏览器(Android)": "y"
+                },
+                "H5-pc": {
+                    "Chrome": "y",
+                    "IE": "u",
+                    "Edge": "y",
+                    "Firefox": "y",
+                    "Safari": "y"
+                },
+                "小程序": {
+                    "微信": "y",
+                    "阿里": "y",
+                    "百度": "y",
+                    "字节跳动": "y",
+                    "QQ": "y"
+                },
+                "快应用": {
+                    "华为": "y",
+                    "联盟": "y"
+                },
+                "Vue": {
+                    "vue2": "y",
+                    "vue3": "u"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/uni_modules/mp-html/static/app-plus/mp-html/js/handler.js b/uni_modules/mp-html/static/app-plus/mp-html/js/handler.js
new file mode 100644
index 0000000..8312a46
--- /dev/null
+++ b/uni_modules/mp-html/static/app-plus/mp-html/js/handler.js
@@ -0,0 +1 @@
+"use strict";function t(t){for(var e=Object.create(null),n=t.attributes.length;n--;)e[t.attributes[n].name]=t.attributes[n].value;return e}function e(){o[1]&&(this.src=o[1],this.onerror=null),this.onclick=null,this.ontouchstart=null,uni.postMessage({data:{action:"onError",source:"img",attrs:t(this)}})}function n(r,i,s){for(var c=0;c<r.length;c++)!function(c){var u=r[c],l=void 0;if(u.type&&"node"!==u.type)l=document.createTextNode(u.text.replace(/&amp;/g,"&"));else{var d=u.name;"svg"===d&&(s="http://www.w3.org/2000/svg"),"html"!==d&&"body"!==d||(d="div"),l=s?document.createElementNS(s,d):document.createElement(d);for(var g in u.attrs)l.setAttribute(g,u.attrs[g]);if(u.children&&n(u.children,l,s),"img"===d){if(!l.src&&l.getAttribute("data-src")&&(l.src=l.getAttribute("data-src")),u.attrs.ignore||(l.onclick=function(e){e.stopPropagation(),uni.postMessage({data:{action:"onImgTap",attrs:t(this)}})}),o[2]){var p=new Image;p.src=l.src,l.src=o[2],p.onload=function(){l.src=this.src},p.onerror=function(){l.onerror()}}l.onerror=e}else if("a"===d)l.addEventListener("click",function(e){e.stopPropagation(),e.preventDefault();var n,o=this.getAttribute("href");o&&"#"===o[0]&&(n=(document.getElementById(o.substr(1))||{}).offsetTop),uni.postMessage({data:{action:"onLinkTap",attrs:t(this),offset:n}})},!0);else if("video"===d||"audio"===d)a.push(l),u.attrs.autoplay||u.attrs.controls||l.setAttribute("controls","true"),o[3]&&(l.onplay=function(){for(var t=0;t<a.length;t++)a[t]!==this&&a[t].pause()}),l.onerror=function(){uni.postMessage({data:{action:"onError",source:d,attrs:t(this)}})};else if("table"===d&&o[4]&&!l.style.cssText.includes("inline")){var h=document.createElement("div");h.style.overflow="auto",h.appendChild(l),l=h}else"svg"===d&&(s=void 0)}i.appendChild(l)}(c)}document.addEventListener("UniAppJSBridgeReady",function(){document.body.onclick=function(){return uni.postMessage({data:{action:"onClick"}})},uni.postMessage({data:{action:"onJSBridgeReady"}})});var o,a=[];window.setContent=function(t,e,r){var i=document.getElementById("content");e[0]&&(document.body.style.cssText=e[0]),e[5]||(i.style.userSelect="none"),r||(i.innerHTML="",a=[]),o=e;var s=document.createDocumentFragment();n(t,s),i.appendChild(s);var c=i.scrollHeight;uni.postMessage({data:{action:"onLoad",height:c}}),clearInterval(window.timer);var u=!1;window.timer=setInterval(function(){i.scrollHeight!==c?(c=i.scrollHeight,uni.postMessage({data:{action:"onHeightChange",height:c}})):u||(u=!0,uni.postMessage({data:{action:"onReady"}}))},350)},window.onunload=function(){clearInterval(window.timer)};
\ No newline at end of file
diff --git a/uni_modules/mp-html/static/app-plus/mp-html/js/uni.webview.min.js b/uni_modules/mp-html/static/app-plus/mp-html/js/uni.webview.min.js
new file mode 100644
index 0000000..b0c8445
--- /dev/null
+++ b/uni_modules/mp-html/static/app-plus/mp-html/js/uni.webview.min.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e=e||self).uni=n()}(this,(function(){"use strict";try{var e={};Object.defineProperty(e,"passive",{get:function(){!0}}),window.addEventListener("test-passive",null,e)}catch(e){}var n=Object.prototype.hasOwnProperty;function t(e,t){return n.call(e,t)}var i=[],a=function(e,n){var t={options:{timestamp:+new Date},name:e,arg:n};if(window.__dcloud_weex_postMessage||window.__dcloud_weex_){if("postMessage"===e){var a={data:[n]};return window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessage(a):window.__dcloud_weex_.postMessage(JSON.stringify(a))}var o={type:"WEB_INVOKE_APPSERVICE",args:{data:t,webviewIds:i}};window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessageToService(o):window.__dcloud_weex_.postMessageToService(JSON.stringify(o))}if(!window.plus)return window.parent.postMessage({type:"WEB_INVOKE_APPSERVICE",data:t,pageId:""},"*");if(0===i.length){var r=plus.webview.currentWebview();if(!r)throw new Error("plus.webview.currentWebview() is undefined");var d=r.parent(),s="";s=d?d.id:r.id,i.push(s)}if(plus.webview.getWebviewById("__uniapp__service"))plus.webview.postMessageToUniNView({type:"WEB_INVOKE_APPSERVICE",args:{data:t,webviewIds:i}},"__uniapp__service");else{var w=JSON.stringify(t);plus.webview.getLaunchWebview().evalJS('UniPlusBridge.subscribeHandler("'.concat("WEB_INVOKE_APPSERVICE",'",').concat(w,",").concat(JSON.stringify(i),");"))}},o={navigateTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;a("navigateTo",{url:encodeURI(n)})},navigateBack:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.delta;a("navigateBack",{delta:parseInt(n)||1})},switchTab:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;a("switchTab",{url:encodeURI(n)})},reLaunch:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;a("reLaunch",{url:encodeURI(n)})},redirectTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;a("redirectTo",{url:encodeURI(n)})},getEnv:function(e){window.plus?e({plus:!0}):e({h5:!0})},postMessage:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};a("postMessage",e.data||{})}},r=/uni-app/i.test(navigator.userAgent),d=/Html5Plus/i.test(navigator.userAgent),s=/complete|loaded|interactive/;var w=window.my&&navigator.userAgent.indexOf("AlipayClient")>-1;var u=window.swan&&window.swan.webView&&/swan/i.test(navigator.userAgent);var c=window.qq&&window.qq.miniProgram&&/QQ/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var g=window.tt&&window.tt.miniProgram&&/toutiaomicroapp/i.test(navigator.userAgent);var v=window.wx&&window.wx.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var p=window.qa&&/quickapp/i.test(navigator.userAgent);for(var l,_=function(){window.UniAppJSBridge=!0,document.dispatchEvent(new CustomEvent("UniAppJSBridgeReady",{bubbles:!0,cancelable:!0}))},f=[function(e){if(r||d)return window.__dcloud_weex_postMessage||window.__dcloud_weex_?document.addEventListener("DOMContentLoaded",e):window.plus&&s.test(document.readyState)?setTimeout(e,0):document.addEventListener("plusready",e),o},function(e){if(v)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.wx.miniProgram},function(e){if(c)return window.QQJSBridge&&window.QQJSBridge.invoke?setTimeout(e,0):document.addEventListener("QQJSBridgeReady",e),window.qq.miniProgram},function(e){if(w){document.addEventListener("DOMContentLoaded",e);var n=window.my;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(u)return document.addEventListener("DOMContentLoaded",e),window.swan.webView},function(e){if(g)return document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(p){window.QaJSBridge&&window.QaJSBridge.invoke?setTimeout(e,0):document.addEventListener("QaJSBridgeReady",e);var n=window.qa;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){return document.addEventListener("DOMContentLoaded",e),o}],m=0;m<f.length&&!(l=f[m](_));m++);l||(l={});var E="undefined"!=typeof uni?uni:{};if(!E.navigateTo)for(var b in l)t(l,b)&&(E[b]=l[b]);return E.webView=l,E}));
\ No newline at end of file
diff --git a/uni_modules/mp-html/static/app-plus/mp-html/local.html b/uni_modules/mp-html/static/app-plus/mp-html/local.html
new file mode 100644
index 0000000..6e2f476
--- /dev/null
+++ b/uni_modules/mp-html/static/app-plus/mp-html/local.html
@@ -0,0 +1 @@
+<head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"><style>body,html{width:100%;height:100%;overflow-x:scroll;overflow-y:hidden}body{margin:0}video{width:300px;height:225px}img{max-width:100%;-webkit-touch-callout:none}@keyframes show{0%{opacity:0}100%{opacity:1}}</style></head><body><div id="content"></div><script type="text/javascript" src="./js/uni.webview.min.js"></script><script type="text/javascript" src="./js/handler.js"></script></body>
\ No newline at end of file
diff --git a/uni_modules/sp-editor/changelog.md b/uni_modules/sp-editor/changelog.md
new file mode 100644
index 0000000..ce129a4
--- /dev/null
+++ b/uni_modules/sp-editor/changelog.md
@@ -0,0 +1,15 @@
+## 1.0.3（2023-10-13）
+	1. 更新readme文档
+	2. 更新调整组件示例项目，添加插件代码中部分注释
+## 1.0.2（2023-10-13）
+	1. 更新uni_modules规范，可一键导入组件
+	2. 更新组件示例项目（包括使用uniCloud.uploadFile多选上传图片示例方法）
+## 1.0.1（2023-10-12）
+	1. 修复小程序中自动聚焦滚动到富文本组件区域的bug
+	2. 略微调整了富文本上方toolbar工具栏中按钮的大小尺寸
+## 1.0.0（2023-9-19）
+	1. 新增字体与背景颜色板
+	2. 可自定义预设内容模板
+	3. 解决官方样例在小程序和app部分报错不兼容的问题
+	4. 可配合云存储上传富文本中插入的图片 本质上是基于官方内置富文本editor组件改版封装，所以官方有的功能都有，官方能兼容的也都兼容
+
diff --git a/uni_modules/sp-editor/components/sp-editor/color-picker.vue b/uni_modules/sp-editor/components/sp-editor/color-picker.vue
new file mode 100644
index 0000000..8961742
--- /dev/null
+++ b/uni_modules/sp-editor/components/sp-editor/color-picker.vue
@@ -0,0 +1,784 @@
+<template>
+	<view v-if="show" class="t-wrapper" @touchmove.stop.prevent="moveHandle">
+		<view class="t-mask" :class="{active:active}" @click.stop="close"></view>
+		<view class="t-box" :class="{active:active}">
+			<view class="t-header">
+				<view class="t-header-button" @click="close">取消</view>
+				<view class="t-header-button" @click="confirm">确认</view>
+			</view>
+			<view class="t-color__box" :style="{ background: 'rgb(' + bgcolor.r + ',' + bgcolor.g + ',' + bgcolor.b + ')'}">
+				<view class="t-background boxs" @touchstart="touchstart($event, 0)" @touchmove="touchmove($event, 0)" @touchend="touchend($event, 0)">
+					<view class="t-color-mask"></view>
+					<view class="t-pointer" :style="{ top: site[0].top - 8 + 'px', left: site[0].left - 8 + 'px' }"></view>
+				</view>
+			</view>
+			<view class="t-control__box">
+				<view class="t-control__color">
+					<view class="t-control__color-content" :style="{ background: 'rgba(' + rgba.r + ',' + rgba.g + ',' + rgba.b + ',' + rgba.a + ')' }"></view>
+				</view>
+				<view class="t-control-box__item">
+					<view class="t-controller boxs" @touchstart="touchstart($event, 1)" @touchmove="touchmove($event, 1)" @touchend="touchend($event, 1)">
+						<view class="t-hue">
+							<view class="t-circle" :style="{ left: site[1].left - 12 + 'px' }"></view>
+						</view>
+					</view>
+					<view class="t-controller boxs" @touchstart="touchstart($event, 2)" @touchmove="touchmove($event, 2)" @touchend="touchend($event, 2)">
+						<view class="t-transparency">
+							<view class="t-circle" :style="{ left: site[2].left - 12 + 'px' }"></view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="t-result__box">
+				<view v-if="mode" class="t-result__item">
+					<view class="t-result__box-input">{{hex}}</view>
+					<view class="t-result__box-text">HEX</view>
+				</view>
+				<template v-else>
+					<view class="t-result__item">
+						<view class="t-result__box-input">{{rgba.r}}</view>
+						<view class="t-result__box-text">R</view>
+					</view>
+					<view class="t-result__item">
+						<view class="t-result__box-input">{{rgba.g}}</view>
+						<view class="t-result__box-text">G</view>
+					</view>
+					<view class="t-result__item">
+						<view class="t-result__box-input">{{rgba.b}}</view>
+						<view class="t-result__box-text">B</view>
+					</view>
+					<view class="t-result__item">
+						<view class="t-result__box-input">{{rgba.a}}</view>
+						<view class="t-result__box-text">A</view>
+					</view>
+				</template>
+
+				<view class="t-result__item t-select" @click="select">
+					<view class="t-result__box-input">
+						<view>切换</view>
+						<view>模式</view>
+					</view>
+				</view>
+			</view>
+			<view class="t-alternative">
+				<view class="t-alternative__item" v-for="(item,index) in colorList" :key="index">
+					<view class="t-alternative__item-content" :style="{ background: 'rgba(' + item.r + ',' + item.g + ',' + item.b + ',' + item.a + ')' }"
+					 @click="selectColor(item)">
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			color: {
+				type: Object,
+				default () {
+					return {
+						r: 0,
+						g: 0,
+						b: 0,
+						a: 0
+					}
+				}
+			},
+			spareColor: {
+				type: Array,
+				default () {
+					return []
+				}
+			}
+		},
+		data() {
+			return {
+				show: false,
+				active: false,
+				// rgba 颜色
+				rgba: {
+					r: 0,
+					g: 0,
+					b: 0,
+					a: 1
+				},
+				// hsb 颜色
+				hsb: {
+					h: 0,
+					s: 0,
+					b: 0
+				},
+				site: [{
+					top: 0,
+					left: 0
+				}, {
+					left: 0
+				}, {
+					left: 0
+				}],
+				index: 0,
+				bgcolor: {
+					r: 255,
+					g: 0,
+					b: 0,
+					a: 1
+				},
+				hex: '#000000',
+				mode: true,
+				colorList: [{
+					r: 244,
+					g: 67,
+					b: 54,
+					a: 1
+				}, {
+					r: 233,
+					g: 30,
+					b: 99,
+					a: 1
+				}, {
+					r: 156,
+					g: 39,
+					b: 176,
+					a: 1
+				}, {
+					r: 103,
+					g: 58,
+					b: 183,
+					a: 1
+				}, {
+					r: 63,
+					g: 81,
+					b: 181,
+					a: 1
+				}, {
+					r: 33,
+					g: 150,
+					b: 243,
+					a: 1
+				}, {
+					r: 3,
+					g: 169,
+					b: 244,
+					a: 1
+				}, {
+					r: 0,
+					g: 188,
+					b: 212,
+					a: 1
+				}, {
+					r: 0,
+					g: 150,
+					b: 136,
+					a: 1
+				}, {
+					r: 76,
+					g: 175,
+					b: 80,
+					a: 1
+				}, {
+					r: 139,
+					g: 195,
+					b: 74,
+					a: 1
+				}, {
+					r: 205,
+					g: 220,
+					b: 57,
+					a: 1
+				}, {
+					r: 255,
+					g: 235,
+					b: 59,
+					a: 1
+				}, {
+					r: 255,
+					g: 193,
+					b: 7,
+					a: 1
+				}, {
+					r: 255,
+					g: 152,
+					b: 0,
+					a: 1
+				}, {
+					r: 255,
+					g: 87,
+					b: 34,
+					a: 1
+				}, {
+					r: 121,
+					g: 85,
+					b: 72,
+					a: 1
+				}, {
+					r: 158,
+					g: 158,
+					b: 158,
+					a: 1
+				}, {
+					r: 0,
+					g: 0,
+					b: 0,
+					a: 0.5
+				}, {
+					r: 0,
+					g: 0,
+					b: 0,
+					a: 0
+				}, ]
+			};
+		},
+		created() {
+			this.rgba = this.color;
+			if (this.spareColor.length !== 0) {
+				this.colorList = this.spareColor;
+			}
+		},
+		methods: {
+			/**
+			 * 初始化
+			 */
+			init() {
+				// hsb 颜色
+				this.hsb = this.rgbToHex(this.rgba);
+				// this.setColor();
+				this.setValue(this.rgba);
+			},
+			moveHandle() {},
+			open() {
+				this.show = true;
+				this.$nextTick(() => {
+					this.init();
+					setTimeout(() => {
+						this.active = true;
+						setTimeout(() => {
+							this.getSelectorQuery();
+						}, 350)
+					}, 50)
+				})
+
+			},
+			close() {
+				this.active = false;
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.show = false;
+					}, 500)
+				})
+			},
+			confirm() {
+				this.close();
+				this.$emit('confirm', {
+					rgba: this.rgba,
+					hex: this.hex
+				})
+			},
+			// 选择模式
+			select() {
+				this.mode = !this.mode
+			},
+			// 常用颜色选择
+			selectColor(item) {
+				this.setColorBySelect(item)
+			},
+			touchstart(e, index) {
+				const {
+					pageX,
+					pageY
+				} = e.touches[0];
+				this.pageX = pageX;
+				this.pageY = pageY;
+				this.setPosition(pageX, pageY, index);
+			},
+			touchmove(e, index) {
+				const {
+					pageX,
+					pageY
+				} = e.touches[0];
+				this.moveX = pageX;
+				this.moveY = pageY;
+				this.setPosition(pageX, pageY, index);
+			},
+			touchend(e, index) {},
+			/**
+			 * 设置位置
+			 */
+			setPosition(x, y, index) {
+				this.index = index;
+				const {
+					top,
+					left,
+					width,
+					height
+				} = this.position[index];
+				// 设置最大最小值
+
+				this.site[index].left = Math.max(0, Math.min(parseInt(x - left), width));
+				if (index === 0) {
+					this.site[index].top = Math.max(0, Math.min(parseInt(y - top), height));
+					// 设置颜色
+					this.hsb.s = parseInt((100 * this.site[index].left) / width);
+					this.hsb.b = parseInt(100 - (100 * this.site[index].top) / height);
+					this.setColor();
+					this.setValue(this.rgba);
+				} else {
+					this.setControl(index, this.site[index].left);
+				}
+			},
+			/**
+			 * 设置 rgb 颜色
+			 */
+			setColor() {
+				const rgb = this.HSBToRGB(this.hsb);
+				this.rgba.r = rgb.r;
+				this.rgba.g = rgb.g;
+				this.rgba.b = rgb.b;
+			},
+			/**
+			 * 设置二进制颜色
+			 * @param {Object} rgb
+			 */
+			setValue(rgb) {
+				this.hex = '#' + this.rgbToHex(rgb);
+			},
+			setControl(index, x) {
+				const {
+					top,
+					left,
+					width,
+					height
+				} = this.position[index];
+
+				if (index === 1) {
+					this.hsb.h = parseInt((360 * x) / width);
+					this.bgcolor = this.HSBToRGB({
+						h: this.hsb.h,
+						s: 100,
+						b: 100
+					});
+					this.setColor()
+				} else {
+					this.rgba.a = (x / width).toFixed(1);
+				}
+				this.setValue(this.rgba);
+			},
+			/**
+			 * rgb 转 二进制 hex
+			 * @param {Object} rgb
+			 */
+			rgbToHex(rgb) {
+				let hex = [rgb.r.toString(16), rgb.g.toString(16), rgb.b.toString(16)];
+				hex.map(function(str, i) {
+					if (str.length == 1) {
+						hex[i] = '0' + str;
+					}
+				});
+				return hex.join('');
+			},
+			setColorBySelect(getrgb) {
+				const {
+					r,
+					g,
+					b,
+					a
+				} = getrgb;
+				let rgb = {}
+				rgb = {
+					r: r ? parseInt(r) : 0,
+					g: g ? parseInt(g) : 0,
+					b: b ? parseInt(b) : 0,
+					a: a ? a : 0,
+				};
+				this.rgba = rgb;
+				this.hsb = this.rgbToHsb(rgb);
+				this.changeViewByHsb();
+			},
+			changeViewByHsb() {
+				const [a, b, c] = this.position;
+				this.site[0].left = parseInt(this.hsb.s * a.width / 100);
+				this.site[0].top = parseInt((100 - this.hsb.b) * a.height / 100);
+				this.setColor(this.hsb.h);
+				this.setValue(this.rgba);
+				this.bgcolor = this.HSBToRGB({
+					h: this.hsb.h,
+					s: 100,
+					b: 100
+				});
+
+				this.site[1].left = this.hsb.h / 360 * b.width;
+				this.site[2].left = this.rgba.a * c.width;
+
+			},
+			/**
+			 * hsb 转 rgb
+			 * @param {Object} 颜色模式  H(hues)表示色相，S(saturation)表示饱和度，B（brightness）表示亮度
+			 */
+			HSBToRGB(hsb) {
+				let rgb = {};
+				let h = Math.round(hsb.h);
+				let s = Math.round((hsb.s * 255) / 100);
+				let v = Math.round((hsb.b * 255) / 100);
+				if (s == 0) {
+					rgb.r = rgb.g = rgb.b = v;
+				} else {
+					let t1 = v;
+					let t2 = ((255 - s) * v) / 255;
+					let t3 = ((t1 - t2) * (h % 60)) / 60;
+					if (h == 360) h = 0;
+					if (h < 60) {
+						rgb.r = t1;
+						rgb.b = t2;
+						rgb.g = t2 + t3;
+					} else if (h < 120) {
+						rgb.g = t1;
+						rgb.b = t2;
+						rgb.r = t1 - t3;
+					} else if (h < 180) {
+						rgb.g = t1;
+						rgb.r = t2;
+						rgb.b = t2 + t3;
+					} else if (h < 240) {
+						rgb.b = t1;
+						rgb.r = t2;
+						rgb.g = t1 - t3;
+					} else if (h < 300) {
+						rgb.b = t1;
+						rgb.g = t2;
+						rgb.r = t2 + t3;
+					} else if (h < 360) {
+						rgb.r = t1;
+						rgb.g = t2;
+						rgb.b = t1 - t3;
+					} else {
+						rgb.r = 0;
+						rgb.g = 0;
+						rgb.b = 0;
+					}
+				}
+				return {
+					r: Math.round(rgb.r),
+					g: Math.round(rgb.g),
+					b: Math.round(rgb.b)
+				};
+			},
+			rgbToHsb(rgb) {
+				let hsb = {
+					h: 0,
+					s: 0,
+					b: 0
+				};
+				let min = Math.min(rgb.r, rgb.g, rgb.b);
+				let max = Math.max(rgb.r, rgb.g, rgb.b);
+				let delta = max - min;
+				hsb.b = max;
+				hsb.s = max != 0 ? 255 * delta / max : 0;
+				if (hsb.s != 0) {
+					if (rgb.r == max) hsb.h = (rgb.g - rgb.b) / delta;
+					else if (rgb.g == max) hsb.h = 2 + (rgb.b - rgb.r) / delta;
+					else hsb.h = 4 + (rgb.r - rgb.g) / delta;
+				} else hsb.h = -1;
+				hsb.h *= 60;
+				if (hsb.h < 0) hsb.h = 0;
+				hsb.s *= 100 / 255;
+				hsb.b *= 100 / 255;
+				return hsb;
+			},
+			getSelectorQuery() {
+				const views = uni.createSelectorQuery().in(this);
+				views
+					.selectAll('.boxs')
+					.boundingClientRect(data => {
+						if (!data || data.length === 0) {
+							setTimeout(() => this.getSelectorQuery(), 20)
+							return
+						}
+						this.position = data;
+						// this.site[0].top = data[0].height;
+						// this.site[0].left = 0;
+						// this.site[1].left = data[1].width;
+						// this.site[2].left = data[2].width;
+						this.setColorBySelect(this.rgba);
+					})
+					.exec();
+			}
+		},
+		watch: {
+			spareColor(newVal) {
+				this.colorList = newVal;
+			}
+		}
+	};
+</script>
+
+<style>
+	.t-wrapper {
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		box-sizing: border-box;
+		z-index: 9999;
+	}
+
+	.t-box {
+		width: 100%;
+		position: absolute;
+		bottom: 0;
+		padding: 30upx 0;
+		padding-top: 0;
+		background: #fff;
+		transition: all 0.3s;
+		transform: translateY(100%);
+	}
+
+	.t-box.active {
+		transform: translateY(0%);
+	}
+
+	.t-header {
+		display: flex;
+		justify-content: space-between;
+		width: 100%;
+		height: 100upx;
+		border-bottom: 1px #eee solid;
+		box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1);
+		background: #fff;
+	}
+
+	.t-header-button {
+		display: flex;
+		align-items: center;
+		width: 150upx;
+		height: 100upx;
+		font-size: 30upx;
+		color: #666;
+		padding-left: 20upx;
+	}
+
+	.t-header-button:last-child {
+		justify-content: flex-end;
+		padding-right: 20upx;
+	}
+
+	.t-mask {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: rgba(0, 0, 0, 0.6);
+		z-index: -1;
+		transition: all 0.3s;
+		opacity: 0;
+	}
+
+	.t-mask.active {
+		opacity: 1;
+	}
+
+	.t-color__box {
+		position: relative;
+		height: 400upx;
+		background: rgb(255, 0, 0);
+		overflow: hidden;
+		box-sizing: border-box;
+		margin: 0 20upx;
+		margin-top: 20upx;
+		box-sizing: border-box;
+	}
+
+	.t-background {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: linear-gradient(to right, #fff, rgba(255, 255, 255, 0));
+	}
+
+	.t-color-mask {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		width: 100%;
+		height: 400upx;
+		background: linear-gradient(to top, #000, rgba(0, 0, 0, 0));
+	}
+
+	.t-pointer {
+		position: absolute;
+		bottom: -8px;
+		left: -8px;
+		z-index: 2;
+		width: 15px;
+		height: 15px;
+		border: 1px #fff solid;
+		border-radius: 50%;
+	}
+
+	.t-show-color {
+		width: 100upx;
+		height: 50upx;
+	}
+
+	.t-control__box {
+		margin-top: 50upx;
+		width: 100%;
+		display: flex;
+		padding-left: 20upx;
+		box-sizing: border-box;
+	}
+
+	.t-control__color {
+		flex-shrink: 0;
+		width: 100upx;
+		height: 100upx;
+		border-radius: 50%;
+		background-color: #fff;
+		background-image: linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee),
+			linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee);
+		background-size: 36upx 36upx;
+		background-position: 0 0, 18upx 18upx;
+		border: 1px #eee solid;
+		overflow: hidden;
+	}
+
+	.t-control__color-content {
+		width: 100%;
+		height: 100%;
+	}
+
+	.t-control-box__item {
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		width: 100%;
+		padding: 0 30upx;
+	}
+
+	.t-controller {
+		position: relative;
+		width: 100%;
+		height: 16px;
+		background-color: #fff;
+		background-image: linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee),
+			linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee);
+		background-size: 32upx 32upx;
+		background-position: 0 0, 16upx 16upx;
+	}
+
+	.t-hue {
+		width: 100%;
+		height: 100%;
+		background: linear-gradient(to right, #f00 0%, #ff0 17%, #0f0 33%, #0ff 50%, #00f 67%, #f0f 83%, #f00 100%);
+	}
+
+	.t-transparency {
+		width: 100%;
+		height: 100%;
+		background: linear-gradient(to right, rgba(0, 0, 0, 0) 0%, rgb(0, 0, 0));
+	}
+
+	.t-circle {
+		position: absolute;
+		/* right: -10px; */
+		top: -2px;
+		width: 20px;
+		height: 20px;
+		box-sizing: border-box;
+		border-radius: 50%;
+		background: #fff;
+		box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
+	}
+
+	.t-result__box {
+		margin-top: 20upx;
+		padding: 10upx;
+		width: 100%;
+		display: flex;
+		box-sizing: border-box;
+	}
+
+	.t-result__item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 10upx;
+		width: 100%;
+		box-sizing: border-box;
+	}
+
+	.t-result__box-input {
+		padding: 10upx 0;
+		width: 100%;
+		font-size: 28upx;
+		box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.1);
+		color: #999;
+		text-align: center;
+		background: #fff;
+	}
+
+	.t-result__box-text {
+		margin-top: 10upx;
+		font-size: 28upx;
+		line-height: 2;
+	}
+
+	.t-select {
+		flex-shrink: 0;
+		width: 150upx;
+		padding: 0 30upx;
+	}
+
+	.t-select .t-result__box-input {
+		border-radius: 10upx;
+		border: none;
+		color: #999;
+		box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.1);
+		background: #fff;
+	}
+
+	.t-select .t-result__box-input:active {
+		box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.1);
+	}
+
+	.t-alternative {
+		display: flex;
+		flex-wrap: wrap;
+		/* justify-content: space-between; */
+		width: 100%;
+		padding-right: 10upx;
+		box-sizing: border-box;
+	}
+
+	.t-alternative__item {
+		margin-left: 12upx;
+		margin-top: 10upx;
+		width: 50upx;
+		height: 50upx;
+		border-radius: 10upx;
+		background-color: #fff;
+		background-image: linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee),
+			linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee);
+		background-size: 36upx 36upx;
+		background-position: 0 0, 18upx 18upx;
+		border: 1px #eee solid;
+		overflow: hidden;
+	}
+
+	.t-alternative__item-content {
+		width: 50upx;
+		height: 50upx;
+		background: rgba(255, 0, 0, 0.5);
+	}
+
+	.t-alternative__item:active {
+		transition: all 0.3s;
+		transform: scale(1.1);
+	}
+</style>
diff --git a/uni_modules/sp-editor/components/sp-editor/editor-icon.css b/uni_modules/sp-editor/components/sp-editor/editor-icon.css
new file mode 100644
index 0000000..e8f0345
--- /dev/null
+++ b/uni_modules/sp-editor/components/sp-editor/editor-icon.css
@@ -0,0 +1,238 @@
+@font-face {
+    font-family: 'iconfont';
+    src: url('data:font/truetype;charset=utf-8;base64,AAEAAAANAIAAAwBQRkZUTYZt980AACuYAAAAHEdERUYAKQBBAAAreAAAAB5PUy8yPJdOmAAAAVgAAABWY21hcLyvuFAAAAJMAAACGmdhc3D//wADAAArcAAAAAhnbHlm1+PZcgAABOAAACD0aGVhZBRVFL8AAADcAAAANmhoZWEISgQAAAABFAAAACRobXR4TS8LYAAAAbAAAACcbG9jYQhHD/wAAARoAAAAeG1heHABTgChAAABOAAAACBuYW1lKeYRVQAAJdQAAAKIcG9zdLoCe30AAChcAAADEgABAAAAAQAAUo9exF8PPPUACwQAAAAAANhk6GIAAAAA2GToYgAA/34EbAOAAAAACAACAAAAAAAAAAEAAAOA/4AAXARsAAAAAARsAAEAAAAAAAAAAAAAAAAAAAATAAEAAAA7AJUACQAAAAAAAgAAAAoACgAAAP8AAAAAAAAAAQQBAZAABQAAAokCzAAAAI8CiQLMAAAB6wAyAQgAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZABA5ifspQOA/4AAXAOAAIIAAAABAAAAAAAABAAAAAAAAAABVQAABAAALwQAAJ0EAAAeBAAAQARsAAAEAAACBAAANwQAADcEAACVBAAAmgQAAJoEAAA+BAAAQAQAACUEAQAABAAAQAAnAIAAgABgAIAAgACAAIAAeAAAAFAAMABgAEAAYAAgAEAAOQAgAGAAYACAAD8AYAAgAEAA1wBeACEAwACAAOAAogBgABoAIQBgADIAiwBAAAAAAwAAAAMAAAAcAAEAAAAAARQAAwABAAAAHAAEAPgAAAA6ACAABAAa5ifmK+Yx5jPmPuZN5mDmZOZu5njmfuaE5ujm/ecs513n+Ohg6GXpZOso7AnsE+x87JTsnuyg7KX//wAA5ifmK+Yx5jPmPuZN5l/mZOZt5njmfuaE5ujm/ecs51zn+Ohg6GPpZOso7AnsE+x67H/snuyg7KX//xncGdkZ1BnTGckZuxmqGacZnxmWGZEZjBkpGRUY5xi4GB4Xtxe1FrcU9BQUFAsTpROjE5oTmROVAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBgAAAQAAAAAAAAABAgAAAAIAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGgB8ANIA7AGaAiwCugNGBCAEgATiBRgFfgXyBl4GfAbGBwAHOAeWB7wH5ggoCGgI5AlSCaIKIgqmCxILPAtKC64L+gw8DIQMpgzKDQYNKA1GDaAN4g4MDlIObA6gDs4O6g8MD2APpA/GD+gQHhB6AAEAL/+AA8ADgAAJAAABNQkBNQQCFyYSAkABgP6A/r1YYdeEAoj4/oD+gP4G/rCo+QIEAAACAJ0ACANqAtQAKwA9AAAlIS4BJxE+ATchHgEXFQ4BIiY9AS4BJyEOAQcRHgEzITI2NzU0NjIWFxUOASUiLwEmNDYyHwEBNjIWFAcBBgL2/hsxQQICQTEB6y4+AgESGxIBGhP+FRYdAQEdFgHlFh0BEhsSAQJB/qoNCqMKFBkKjQFgChkUCv6KCggBQTEB5jBCAQE+Lx4NEhINHhQZAQEdFf4aFh0dFvkOEhIO+TFBnwqjChoTCY0BYAoUGQr+iQkAAAAABAAeAEoD4gJoAA8AGwAnADAAAAEGBAcmJC8BNzYkNxYEHwElDgEHHgEXPgE3LgEDLgEnPgE3HgEXDgEnDgEUFjI2NCYD0Ar+/sTE/v4LERELAQLExAECChL+Ho3WKirWjY3WKirWjTpNAQFNOjpNAQFNOh8qKj4qKgFEFtUPD9UWFRUX1Q4O1RcVzgeVMjKUCAiUMjKV/qwCTzw8UAEBUDw8T9cBK0ArK0ArAAEAQP+AA9EDgAAJAAAFNgIlFQkBFQQSAvphWP69/oABgAGNhICoAVAG/gGAAYD4C/38AAAIAAD/gARsA4AAHwArAEAATABVAGIAaAB1AAAFIikBLgEnET4BNzMVIyIGHQEhNS4BKwE1Mx4BFxEOARMiKQERFBYzITI2NwEwDwEGDwEjNzEuASc+ATceARcUBycOARQWMj8BNjcuAQUGDwE1NzMRIwEuASc1PgEyFh0BFAYlMjMhFSEHLgE9ATQ2MhYdARQGBAA5/m/+Ni49AQE9LlFRFx8EAAEeF1FRLj0BAT0IQP5A/gAfFwOUFx4B/uUCAgUGhTpiM0UBAUUzNEQBDmscJiY5FAkJAQEm/q0FIylTNDYCAAsPAQEPFw8P/aMi7AEN/eU1DA8PFw8PgAE9LgLXLj0BNh8Xa2sXHzYBPS79KS49AqH9yhcfHxcBIAMDCQjSoAJMOTlMAgJMOSIcjwEuRC4YEBIWIi4VBCAkQ1D+UgKGAQ8LogsQEAuiCw+GNlEBDwuiCxAQC6ILDwADAAL/fgPvA3AAKwBNAGcAAAEjNS4BJyMOAQcVIw4BBxUUFhcDHgE3ITUzFjI3MxYyNzMWNjcRPgE9AS4BAyM1NCYiBh0BIzU0JiIGBxUjNS4BIgYdASMiJicRIREUBhMUBiMhIiYnNT4BMyE1PgE3Mx4BFxUhMhYVA3/fAS8kpyQvAeAvPwEeGgEKYAYBMxUEBwO2AwcEhQZgCRoeAT+DVBAYEIwQGA8BiwEPGBBUJC8BAw4vZyAY/PIXIAEBIBcBGAEvIzgkLwEBFxggAnSoIzABATAjqAE/MDcgMg/+hlEjBAEBAQEBBCNQAXoPMiA3MD/9SN4MEBAM3t4MEBAM398MEBAM3ywoAU/+sScsAhIYICAYNxggqCMwAQEwI6ggGAAABQA3/8ED2gNPABEAIAAzAEQAXwAAASIjISYnJj4BMyEyFxYOASMGAzI7AR4BBwYHIS4BNzYzBSIjJSInJjY3NjMlIR4BFAYHIxUyOwEWFxYGBwYjBS4BNDYzATQmIg8BNTQmIgYdAScmIgYUFzEXFjI/ATE2ApxL0v7jHQgEBxgOAwQhCAQGGBBnZzlQiRcWBwke/LkXFwYIIAIjRs3+7RwJBAYKDQ8BcAFvFBYWFLwuJVQcCQQGCgwP/TcTFhYSAjQVHwotFB8ULQogFAlrCiEKawkB0AEZDBcOGgwXDgEBgAEeFBgBARwUG+YBGQwWBwkBARUiFAHoARgMFwcIAQEUIhX+2g8UCzKpDxQUD6kyCxQdCnYMDHYKAAAFADf/wQPaA00AEQAgADMARABeAAAlIiMhJicmPgE3ITIXFg4BIwYDMjsBHgEHBiMhIiY3NjcFIiMhJicmNjc2NykBMhYUBisBFTIzFxYXFgYHBgchIiY0NjMBMScmIg8BMQYUFjI/ARUUFjI2PQEXFjI2NAKcS9L+4x0IBAcYDgMEIQgEBhgQZ2c5UIkXFgcJHvy5FxcGCCACI0bN/u0cCQQGCg0PAXABbxQWFhS8LiVUHAkEBgoMD/03ExYWEgIrawohCmsJFCAKLRQfFC0KHxVbARkNFw0BGg0WDgEBgAEeFRgdFBoB5gEYDBcHCAEVIhXoAQEYCxcHCAEVIRUCv3cLC3cKHRQMMagPFBQPqDEMFB0AAAAACQCV/4EDawN+AB8ALwA9AE4AWgBrAHcAiACUAAABIzUuAScjLgEiBgcjDgEHFSMiBhURFBYXIT4BNRE0JiUzMjY3PgEyFhceATsBFSEBIREzFR4BMyEyNjc1MwUHJyYiBhQfARYyPwE2NCYiFyIGFBYzITI2NCYjBQcnJiIGFB8BFjI/ATY0JiIFIQ4BFBYzITI2NCYFBycmIgYUHwEWMj8BNjQmIgUhIgYUFhchPgE0JgNZVQEKB4IJPVQ9CYIHCgFVCAoKCAKyCAoK/b9/BwoBAyxALAMBCgd//kACJ/1yQwEKBwHkBwoBQ/4zSiEFDwoFLQYOBlYFCw5WBwoKBwEpBwoKB/58SiEFDwoFLQYOBlYFCw4Bf/7XBwoKBwEpBwoK/nVKIQUPCgUtBg4GVgULDgF//tcHCgoHASkHCgoC4TEHCgEoMjIoAQoHMQoI/MQHCgEBCgcDPAgKHwkIICkpIAgJbf0SAxg8CAoKCDzCSiEFCg8FLgUFVwUOCysKDwsLDwqlSSEFCw4GLQUFVgYOCysBCg8KCg8KpEohBgsPBS4FBVcFDgsrCg8KAQEKDwoAAAMAmv+AAzMDTQAXADQAPQAAJScmIgYUHwEhDgEUFhchBwYUFjI/ATY0ESEOAQceARczFRQWMjY1ETMRHgEyNjcRMzI2NCYBIy4BJz4BNzMDEmYIFBAIOv4kCg8PCgHcOggPFQhmCP5MV3MCAnNXNA4WD5kBDhYOAYAKDw/+djRBVwEBV0E0EmcHEBQIOgEOFg4BOggVDwhmCBQDQwJ0V1d0AuYLDw8LAk39swsPDwsCTQ4WD/6ZAldBQVcCAAAAAAMAmv+AAzMDTQAcACUAPQAAASEOAQceARczFRQWMjY1ETMRHgEyNjcRMzI2NCYBIy4BJz4BNzMBITc2LgEiDwEGFB8BFjI2NC8BIT4BNCYDGv5MV3MCAnNXNA4WD5kBDhYOAYAKDw/+djRBVwEBV0E0AUz+JToIAQ8UCGYICGYIFQ8IOgHbCw8PA00CdFdXdALmCw4OCwJN/bMLDg4LAk0OFg/+mQJXQUFXAv0AOggUEAdnCBQIZggPFQg6AQ4WDgAAAAADAD7/vgPCA0IADwAXABsAAAEhDgEHER4BFyE+ATcRLgEDJyMHIxMzEwEDMwMDUv1cL0ABAUAvAqQvQAEBQM82+DZn4m7i/uZevl0DQgFAL/1cL0ABAUAvAqQvQPzuqKgCav2WAfr+5wEZAAADAEAAAAPAAsAAFgAjAD8AAAEzPgE0JichDgEUFhczBwMGHgE2NxM2AT4BNyEeARQGByEuASUnJiIGFB8BBwYUFjI/ARcWMjY0LwE3NjQmIgcBtMwbJCQb/gAbJCQbuQEtBB02KgUtAv6IASQbAYAbJCQb/oAbJAK/VxMxJRJXVxIlMRNXVxMxJRJXVxIlMRMCQAEkNiQBASQ2JAEH/tgfMQsiHwEoEf4QGyQBASQ2JAEBJPJXEiUxE1dXEzElEldXEiUxE1dXEzElEgACACX/yQPbAzcABwBLAAABAxcWMzI3JgE3PgQ3GwEzFhcTHgEXHgEXFhceARcWHQEiJiMiBiM0PwI2PwE+ATU0Ji8BJQ4BFB4CHwEWFRQHIiYjIgYjBgHDYU47IAsWMv4rAQ0mGx0WB4egSQUCdRNTFwkxEQsJC04JAySRJSufFgJbCAYDBgQCIxcY/v4OOhAiFRYXAQEhhSIEFQIuAkH+/gEBAZH9+i0EBwULFhIBYAGeCAT+7i3NNhR+IRoHCBEDFgsPCQgYFBQCAgIFAgcFCVw3OgEhnhoSCgYCAgsWBQsMBQgAAAAABQAAABIEAAM3AA0AHQAtAD0ATQAAExEUBiIvASY0PwE2MhYBFRQGIyEiJj0BNDYzITIWNRUUBiMhIiY9ATQ2MyEyFjUVFAYjISImPQE0NjMhMhY1FRQGIyEiJj0BNDYzITIW2woQBaUFBaUFEAoDJQsH/CQHCwsHA9wHCwsH/ZIHCwsHAm4HCwsH/ZIHCwsHAm4HCwsH/CQHCwsHA9wHCwJJ/rcHCwWkBhAFpAUK/kFtCAsLCG0ICwvUbgcLCwduBwsL1G4HCwsHbggKCtRuCAoKCG4HCwsAAgBA/4ADwAMAAAcADwAAEyEVIxEjESMBIxEjESM1IUABgICAgAOA/Ij8AoABgID+gAGAAYD9AAMAgAAAAwAn/88D2QMxABgAHAAsAAA3MzI2PwEhFx4BOwE+AScDJicjIgYHAwYWATMXIwEhIgYHFR4BMyEyNjc1LgHNUQkPAz8BCEUDDwlRCwsE7AcTjAkPA9kECwEqElWyAhj8igwRAQERDAN2DBEBARG7DQmvrwkNAQ8KAkkSAQoJ/bcKDwH/xf5PEQ07DBERDDsNEQAAAAIAgACAA4AC1QALACQAABMzETMRMxEjESMRIykBIiY0PwE2NCYiBhUjPgE3HgEXFAYPASGAVatVVatVAwD/ACMyF88ZMkYyVQFhSElgAhsXzgEAAtX/AAEA/asBAP8AMkYX4BhHMjIjSGEBAWFIJD0Y3QAAAgCAAIADgALVAAsAJwAAEzMRMxEzESMRIxEjATMyFhURFAYrASImPQEzFTM1IzUzNSMVIzU0NoBVq1VVq1UCAKsjMjIjqyMyVaurq6tVMgLV/wABAP2rAQD/AAJVMiP+VSMyMiMrK6tVqysrIzIAAAIAYAAgA6EC4AAjAD0AAAEhBgcVFhczNjc1MxEjBgcVFhchNjc1JicjETMVFhczNjc1JgEjETMyNi8BJg8BBhY7AREjIgYfARY/ATYmAoj94AcBAQc4BwGoXAcBAQcBCAcBAQdcqAEHOAcBAQEKQUEEBAJlBgZkAwQEQUEEBANkBgZkAwQC4AEHgAcBAQdA/dABBzgHAQEHOAcBAjBABwEBB4AH/d8BhAgEfwYGfwQI/nwIBH8GBn8ECAAAAgCAAIADVQLVAAsAFgAAEzMRMxEzESMRIxEjITUzEQc1NzMRMxWAVatVVatVAdVWa2tVVQLV/wABAP2rAQD/AFUBnj5jPf4AVQAAAAMAgACAA4AC1QALABYAGQAAEzMRMxEzESMRIxEjITUjNRMzETMVIxUDNQeAVatVVatVAoDV1VUrK1VtAtX/AAEA/asBAP8A1VYBKv7WVtUBK5iYAAIAgACAA4AC1QALACsAABMzETMRMxEjESMRIwEzFSMVMx4BFw4BByMuASc1MxUzPgE0JicjLgEnNT4BgFWrVVWrVQIA1dVVSWACAmBJVSQwAVVVJDExJFUkMAEBMALV/wABAP2rAQD/AAJVVasBYUhJYAIBMCQrKwExSDABATAkqyQwAAMAgACAA4AC1QALACQAKAAAEzMRMxEzESMRIxEjATMeARcVIzUjFTMeARcVDgEHIy4BJxE+ARMVMzWAVatVVatVAgCrJDABVaurJDABATAkqyQwAQEwJKsC1f8AAQD9qwEA/wACVQEwJCsrqwEwJKskMAEBMCQBqyQw/qyrqwAAAgB4/6IDiQNeAC8AVgAAJSY1Ji8BJiIGFB8BITc2NCYiDwEOAR0BFBYfARYyPgEvASEHBhQWMj8CPgE1NyYBPgE9ASERIyIGFBY7ATI2NCYrAREhFRQWMjY9ATQmIyEiBh0BFBYDiAEBA2YFDgoFSf1jSQUKDgVmAgICAmYFDQoBBUkCnUkFCg4FZwEBAgEB/UUHCgERMwgJCQiICAkJCDMBEQoOCgoH/ZoHCgoeAQEDA2YFCg4FSUkFDgoFZwIFAwMCBQJoBAoNBUpKBQ4KBWYCAgQDAgIC2wEJCDP9MwoOCgoOCgLNMwgJCQhEBwoKB0QICQAAAAAFAAAAEgQAAzcADgAeAC4APgBOAAATFA8BBiImNRE0NjIfARYBFRQGIyEiJj0BNDYzITIWNRUUBiMhIiY9ATQ2MyEyFjUVFAYjISImPQE0NjMhMhY1FRQGIyEiJj0BNDYzITIWyQWlBQ8LCw8FpQUDNwsH/CQHCwsHA9wHCwsH/ZIHCwsHAm4HCwsH/ZIHCwsHAm4HCwsH/CQHCwsHA9wHCwGlCAakBQsHAUkICgWkBf7lbQgLCwhtCAsL1G4HCwsHbgcLC9RuBwsLB24ICgrUbggKCghuBwsLAAAABABQ/9ADsAMwABEAFQAZADIAAAkBJiMhDgEHER4BFyE+ATcRNCUzFSMBITUhFyM1NCYjISIGHQEjETMVFBYzITI2PQEzAQOd/v4TGv4iGyQBASQbAuAbJAH9cMDAAcD+QAHAkFASDv4ADhJQUBIOAQAOEk4BAgIbAQITASQb/SAbJAEBJBsB3hrocP2QkJCwDhISDrAC4JAOEhIOkP7+AAYAMP+wA9ADUAAQACEAMgBEAFQAWAAAASMiBh0BFBYyNj0BMzI2NCYhIyIGFBY7ARUUFjI2PQE0JgEjNTQmIgYdARQWOwEyNjQmJSIGHQEjIgYUFjsBMjY9ATQmEyEOAQcRHgEXIT4BNxEuAQERIREBcZEOEhIcEnENExMBk5EOEhIOcRIbExP+U3ESHBISDpENExMBkw4ScQ4SEg6RDRMTcvzgGyQBASQbAyAbJAEBJPzFAyACwBIOig0TEw1qEhwSEhwSag0TEw2KDhL9tmoOEhIOig4SEhwSihIOahIcEhIOig4SAlABJBv84BskAQEkGwMgGyT8oQMg/OAAAAAGAGD/wAOgA0AADwAfADMAPwBLAFcAAAEhDgEHER4BFyE+ATcRLgEDFAYjISImNRE0NjMhMhYVNyEiBhQWMyEyFhURFBYyNjURLgEBISIGFBYzITI2NCYHISIGFBYzITI2NCYHIyIGFBYXMz4BNCYC0P3gIi0BAS0iAiAiLQEBLRIJB/3gBwkJBwIgBwlw/eAOEhIOAiAHCRIcEgEt/u7+wA4SEg4BQA4SEg7+wA4SEg4BQA4SEo7ADhISDsAOEhICwAEtIv2gIi0BAS0iAmAiLf1RBwkJBwJgBwkJB9ASHBIJB/2gDhISDgJgIi3+2RIcEhIcEqASHBISHBKfEhsSAQESGxIAAAAFAED/oAPAA2AAHwAjAC0AOgBHAAABIzU0JiMhIgYdASMiBhQWOwETHgEXIT4BNxMzMjY0JiUhFSEBDgEjISImJwMhAzI2NRE0JiIGFREUFiMyNjURNCYiBhURFBYDoMASDv6ADhLADhISDiJOBDUmAaImNQROIg4SEv2yAUD+wAGRAhEN/l4NEQJNAnzeDhISHBISog4SEhwSEgLwUA4SEg5QEhwS/UUlLwEBLyUCuxIcEjAw/QwMEBAMArT9mxIOAdYNExMN/ioOEhIOAdYNExMN/ioOEgADAGD/wAOmAzcABAAPABMAAAEnAQc3AScjLgEPARc3NjQBIRUhAwib/jQnvwJpgwEEDQWDm4EF/LoDQPzAAfet/lm8DQJMlwUBBXitdwQN/WtAAAABACABQAPgAbAAAwAAEyEVISADwPxAAbBwAAAAAwBA/9UDwgMyAB4AJwA/AAABITY1LgEHDgEdAQ4BByMiBhURHgEzITI2NxM2LgIBETQ7AREjIiYBAw4BIyERPgE3NTY3NhYXFAcGFjMhMhYDWf73EwJUNi4sAUo5dhsoASYcAo0lOAdKBAseKf0QA01NAQIC/0kDFQ7+AE1fAQEiFiwBHAUSEQE0EhcCJ0I0PlcFB0QzOzpTBycc/nsdJi4lAYUXLCQT/fEBhQP+dQIBov57DhEBjhBzTjs5BgExIThUDxscAAADADn/uwPXAycAEwAlACkAAAEuAQ8BFzc2FhcWBg8BFzc+AiYBBiYnJjY/AScHDgEXHgE/AScTFwEnA45U82dlM2RNsz47E0lsMmwwOQ0i/k9Msz86E0lvMm9jGk9V82dpMzcz/qkzAqpjGk9SPlI6E0lMsz9XPlcnanp0/c06E0lMsz9aPlpU82djGk9VPwGBPv7iPQAAAAUAIAAAA+ADAAASABMAHAAgACQAAAE0LwEmDwEGIi8BLgEPAQYVESEDIx4BMjY0JiIGJREhEQMhESEDgAisDAlNBQ0E/QUMBbwFAwBgQAEkNiQkNiT9PwPAQPzAA0ABDQkFaQYJXgUF/AQBBaoFB/73AeAbJCQ2JCSl/QADAP1AAoAAAAkAYAARA6AC7wADAAcACwAMABUAFgAfACAAKQAAASEVIRUhFSEVIRUhAyMeATI2NCYiBhMjHgEyNjQmIgYTIx4BMjY0JiIGASACgP2AAoD9gAKA/YCAQAEkNiQkNiQ/QAEkNiQkNiQ/QAEkNiQkNiQC4GDQYNBgApAbJCQ2JCT+tRskJDYkJP61GyQkNiQkAAQAYAAAA6ADAAADAAcACwAPAAATIRUhESEVIRMhFSERIRUhYANA/MADQPzAgAJA/cACQP3AAwBg/qBgAUBg/qBgAAAABACAAFIDdQLAAAMABwALAA8AABMhESEREzMDKQERIRETMwOAAVX+q5BukAEyAVX+q5BukAGn/qsBVQEZ/uf+qwFVARn+5wAABgA//+ADoAMpAAUADwAbAB8AIwAnAAATMzUjFTMDMwcVMzUjNzUjETMVIxUzFSMVMzUjEyEVIRUhFSEVIRUhYzdbJCNAQIBAQIBJKipJgIDgAoD9gAKA/YACgP2AAmDJN/7AWzc3Wzf+iRI3EjfJAjdg0GDQYAAABABgAAADoAMAAAMABwALAA8AABMhFSERIRUhASEVIREhFSFgA0D8wANA/MABAAJA/cACQP3AAwBg/qBgAUBg/qBgAAACACAARAPUAqAABQALAAAJAjcnNyUHFwcXAQEs/vQBDEjU1AFUSNTUSAEMAqD+0v7SQO7uQEDu7kABLgAHAED/wAPAA0AACwAXABgAIQAiACsAMgAAAQ4BBx4BFz4BNy4BAy4BJz4BNx4BFw4BASMeATI2NCYiBgUjHgEyNjQmIgYFHgEXPgE3AgC+/QUF/b6+/QUF/b6j2QQE2aOj2QQE2f6dQAEkNiQkNiQBv0ABJDYkJDYk/l8Do3p6owMDQAX9vr79BQX9vr79/MUE2aOj2QQE2aOj2QH8GyQkNiQkGxskJDYkJJt6owMDo3oAAAADANf/7QMgAwYAEwAdACYAAAEmJzU+ATc2JzQmJyERITI3Njc0ATMWFxYUBwYrAQEGByM1Mx4BFAMBIUEiLw0YAXZ1/q4BbV0/PwH+OMNCHyAgH0LDATEfQ8/PQz4BQTMRAhAoFS0xX3QB/Oc+PGc+AY8BHyFgICL+yyMC7wFFYQAAAAADAF7/4AOdAyAACwATABcAAAEhIgYUFhchPgE0JiUzNSE1IRUhETMRIwN9/QANEhINAwAOEhL+NXABIP1QASBwcAGKEhsSAQESGxI28HBw/lD+4AAEACEAAAPgA2AABwALAA4AJwAACQEzNyEXMwEDEzMTBQchAw4BFSE1IzY3PgE1NCYjIgcXNjMyFhUUBgE7/uZ8PAEmPHv+56JwAnABc5ABINorOwEgnwkqOylHPXQaXwkhEBUhAwf8+a2tAwf+DgFT/q014AKHIlsxUBAhLzomNkFnDyYVERYqAAAAAAEAwP/AA0ADIAALAAABESERIxEzESERMxEC4P5AYGABwGADIP6AAYD8oAGg/mADYAAAAAACAID/ygOAAyYAEQAdAAAlPgE3ESMRDgEHLgEnESMRHgEFISIGFBYXIT4BNCYCAIWwA3ACcVVVcQJwA7AB5f1ADhISDgLADhISVQOwhQGZ/mdVcQICcVUBmf5nhbBOEhsSAQESGxIAAAEA4P/qAyADKgAbAAABISIGFBYXMwMjIgYUFhchPgE0JisBEzM+ATQmAwD+4A4SEg5g5loOEhIOASAOEhIOXudXDhISAyoSGxIB/UASGxIBARIbEgLAARIbEgAAAgCi/+YDgAMSAAcACgAABTcBIwEzNyElGwEDGWf+vVr+v2ZDAYr+nJ+fGgIDKvzWqGABjv5yAAAEAGAAAAOgAwAAAwAHAAsADwAAEyEVIREhFSERIRUhESEVIWADQPzAA0D8wAJA/cACQP3AAwBg/qBgAUBg/qBgAAAAAAQAGgAvA+4CvwALABcAIwAvAAABAiADDgEXFiA3NiYHBiAnJjQ3NiAXHgEBDgEHHgEXPgE3LgEHIi4BND4BMx4BFAYD0uP+K+QbARvPAgDPGwFLvv5AvgsM0gGW0wsB/lJffwICf19ffwICf58RHhERHhEbJCQBugEF/vsgUCH6+iFQSOTkDiIO8fEOIgEAAn9fX38CAn9fX3/eER4iHhEBJDYkAAAAAAQAIf+5A+ADJwACAAoADgAmAAABIRclATM3IRczAQMTMxMBNjc+ATU0JiMiBxc2MzIWFRQOAhUhNQPA/uCQ/gv+5nw8ASY8e/7nonACcAFkCSo7KUc9dBpfCSEQFSFYOwEgAyDg5/z5ra0DB/4OAVP+rf7UECEvOiY2QWcPJhURFipFWzFQAAAEAGAAAAOgAwAAAwAHAAsADwAAEyEVIREhFSERIRUhESEVIWADQPzAA0D8wANA/MADQPzAAwBg/qBgAUBg/qBgAAAAAAEAMgBGA+ICrwAPAAABNjIWFAcBDgEnASY+ARcBA6sKGhMJ/eYJGQr+rQ4HIg8BPAKlChMaCv3YCQEIASQMJAwM/vEAAQCLABsDZQL1ABoAAAkBNjQmIgcJASYiBhQXCQEGHgE3CQEWMjY0JwInATQKExoK/sz+ywoZFAoBNP7MDQojDQE1ATQKGhMKAYoBNAoaEwn+ywE1CRMaCv7M/ssOIwkMATX+ywkTGgoAAAAAAwBAABgDwALNABEAJgA5AAABNzYWFxEOAS8BIyImNRE0NjMBBiImNDc+ATU0JicmPgEXHgEVFAYXBi4BNz4BNCYnJj4BMhceARQGAQTNDyQBASQP0p8OEhIOAj8KGRMJHyEcHAwLJA0jJStwDSQJDDo9OzcJARMaCUBERwIbpAwRFP2eFBEMqBIOAQgOEv6VCRMaCh5PLChKHg4jCA4nYDQ5ZrMNCSMOO5ellDoKGhIKRKq/rQAAAAAAEgDeAAEAAAAAAAAAFQAsAAEAAAAAAAEACABUAAEAAAAAAAIABwBtAAEAAAAAAAMACACHAAEAAAAAAAQACACiAAEAAAAAAAUACwDDAAEAAAAAAAYACADhAAEAAAAAAAoAKwFCAAEAAAAAAAsAEwGWAAMAAQQJAAAAKgAAAAMAAQQJAAEAEABCAAMAAQQJAAIADgBdAAMAAQQJAAMAEAB1AAMAAQQJAAQAEACQAAMAAQQJAAUAFgCrAAMAAQQJAAYAEADPAAMAAQQJAAoAVgDqAAMAAQQJAAsAJgFuAAoAQwByAGUAYQB0AGUAZAAgAGIAeQAgAGkAYwBvAG4AZgBvAG4AdAAKAAAKQ3JlYXRlZCBieSBpY29uZm9udAoAAGkAYwBvAG4AZgBvAG4AdAAAaWNvbmZvbnQAAFIAZQBnAHUAbABhAHIAAFJlZ3VsYXIAAGkAYwBvAG4AZgBvAG4AdAAAaWNvbmZvbnQAAGkAYwBvAG4AZgBvAG4AdAAAaWNvbmZvbnQAAFYAZQByAHMAaQBvAG4AIAAxAC4AMAAAVmVyc2lvbiAxLjAAAGkAYwBvAG4AZgBvAG4AdAAAaWNvbmZvbnQAAEcAZQBuAGUAcgBhAHQAZQBkACAAYgB5ACAAcwB2AGcAMgB0AHQAZgAgAGYAcgBvAG0AIABGAG8AbgB0AGUAbABsAG8AIABwAHIAbwBqAGUAYwB0AC4AAEdlbmVyYXRlZCBieSBzdmcydHRmIGZyb20gRm9udGVsbG8gcHJvamVjdC4AAGgAdAB0AHAAOgAvAC8AZgBvAG4AdABlAGwAbABvAC4AYwBvAG0AAGh0dHA6Ly9mb250ZWxsby5jb20AAAIAAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOwAAAAEAAgECAQMBBAEFAQYBBwEIAQkBCgELAQwBDQEOAQ8BEAERARIBEwEUARUBFgEXARgBGQEaARsBHAEdAR4BHwEgASEBIgEjASQBJQEmAScBKAEpASoBKwEsAS0BLgEvATABMQEyATMBNAE1ATYBNwE4ATkEcmVkbwlzZWxlY3RhbGwHcHJldmlldwR1bmRvBGRhdGUHY2xlYXJ1cBU3MjNiaWFuamlxaV9kdWFuaG91anUWNzIyYmlhbmppcWlfZHVhbnFpYW5qdQotY2hlY2tsaXN0DWRpcmVjdGlvbi1sdHINZGlyZWN0aW9uLXJ0bAtmb250Ymdjb2xvcg1jbGVhcmVkZm9ybWF0BGZvbnQHb3V0ZGVudAhmb250c2l6ZQp0ZXh0X2NvbG9yD2Zvcm1hdC1oZWFkZXItMg9mb3JtYXQtaGVhZGVyLTMLbGluZS1oZWlnaHQPZm9ybWF0LWhlYWRlci0xD2Zvcm1hdC1oZWFkZXItNA9mb3JtYXQtaGVhZGVyLTUPZm9ybWF0LWhlYWRlci02EUNoYXJhY3Rlci1TcGFjaW5nBmluZGVudAZiYW9jdW4IcXVhbnBpbmcFZnV6aGkHc2hhbmNodQxiaWFuamlzZWt1YWkJZmVuZ2V4aWFuB2RpYW56YW4MY2hhcnVsaWFuamllC2NoYXJ1dHVwaWFuCnd1eHVwYWlsaWUManV6aG9uZ2R1aXFpB3lpbnlvbmcLeW91eHVwYWlsaWUIeW91ZHVpcWkJeml0aWRhaW1hCHhpYW9saWFuCXppdGlqaWFjdQ96aXRpc2hhbmNodXhpYW4Neml0aXNoYW5nYmlhbwp6aXRpYmlhb3RpDnppdGl4aWFodWF4aWFuCXppdGl4aWV0aQl6aXRpeWFuc2UIenVvZHVpcWkJeml0aXl1bGFuC3ppdGl4aWFiaWFvC3p1b3lvdWR1aXFpB2R1aWdvdXgGZ3VhbmJpDnNoZW5neWluX3NoaXRpAAAAAAAB//8AAgABAAAADAAAABYAAAACAAEAAwA6AAEABAAAAAIAAAAAAAAAAQAAAADVpCcIAAAAANhk6GIAAAAA2GToYg==') format('truetype');
+    font-weight: normal;
+    font-style: normal;
+    font-display: swap;
+}
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-redo:before {
+  content: "\e627";
+}
+
+.icon-undo:before {
+  content: "\e633";
+}
+
+.icon-indent:before {
+  content: "\eb28";
+}
+
+.icon-outdent:before {
+  content: "\e6e8";
+}
+
+.icon-fontsize:before {
+  content: "\e6fd";
+}
+
+.icon-format-header-1:before {
+  content: "\e860";
+}
+
+.icon-format-header-4:before {
+  content: "\e863";
+}
+
+.icon-format-header-5:before {
+  content: "\e864";
+}
+
+.icon-format-header-6:before {
+  content: "\e865";
+}
+
+.icon-clearup:before {
+  content: "\e64d";
+}
+
+.icon-preview:before {
+  content: "\e631";
+}
+
+.icon-date:before {
+  content: "\e63e";
+}
+
+.icon-fontbgcolor:before {
+  content: "\e678";
+}
+
+.icon-clearedformat:before {
+  content: "\e67e";
+}
+
+.icon-font:before {
+  content: "\e684";
+}
+
+.icon-723bianjiqi_duanhouju:before {
+  content: "\e65f";
+}
+
+.icon-722bianjiqi_duanqianju:before {
+  content: "\e660";
+}
+
+.icon-text_color:before {
+  content: "\e72c";
+}
+
+.icon-format-header-2:before {
+  content: "\e75c";
+}
+
+.icon-format-header-3:before {
+  content: "\e75d";
+}
+
+.icon--checklist:before {
+  content: "\e664";
+}
+
+.icon-baocun:before {
+  content: "\ec09";
+}
+
+.icon-line-height:before {
+  content: "\e7f8";
+}
+
+.icon-quanping:before {
+  content: "\ec13";
+}
+
+.icon-direction-rtl:before {
+  content: "\e66e";
+}
+
+.icon-direction-ltr:before {
+  content: "\e66d";
+}
+
+.icon-selectall:before {
+  content: "\e62b";
+}
+
+.icon-fuzhi:before {
+  content: "\ec7a";
+}
+
+.icon-shanchu:before {
+  content: "\ec7b";
+}
+
+.icon-bianjisekuai:before {
+  content: "\ec7c";
+}
+
+.icon-fengexian:before {
+  content: "\ec7f";
+}
+
+.icon-dianzan:before {
+  content: "\ec80";
+}
+
+.icon-charulianjie:before {
+  content: "\ec81";
+}
+
+.icon-charutupian:before {
+  content: "\ec82";
+}
+
+.icon-wuxupailie:before {
+  content: "\ec83";
+}
+
+.icon-juzhongduiqi:before {
+  content: "\ec84";
+}
+
+.icon-yinyong:before {
+  content: "\ec85";
+}
+
+.icon-youxupailie:before {
+  content: "\ec86";
+}
+
+.icon-youduiqi:before {
+  content: "\ec87";
+}
+
+.icon-zitidaima:before {
+  content: "\ec88";
+}
+
+.icon-xiaolian:before {
+  content: "\ec89";
+}
+
+.icon-zitijiacu:before {
+  content: "\ec8a";
+}
+
+.icon-zitishanchuxian:before {
+  content: "\ec8b";
+}
+
+.icon-zitishangbiao:before {
+  content: "\ec8c";
+}
+
+.icon-zitibiaoti:before {
+  content: "\ec8d";
+}
+
+.icon-zitixiahuaxian:before {
+  content: "\ec8e";
+}
+
+.icon-zitixieti:before {
+  content: "\ec8f";
+}
+
+.icon-zitiyanse:before {
+  content: "\ec90";
+}
+
+.icon-zuoduiqi:before {
+  content: "\ec91";
+}
+
+.icon-zitiyulan:before {
+  content: "\ec92";
+}
+
+.icon-zitixiabiao:before {
+  content: "\ec93";
+}
+
+.icon-zuoyouduiqi:before {
+  content: "\ec94";
+}
+
+.icon-duigoux:before {
+  content: "\ec9e";
+}
+
+.icon-guanbi:before {
+  content: "\eca0";
+}
+
+.icon-shengyin_shiti:before {
+  content: "\eca5";
+}
+
+.icon-Character-Spacing:before {
+  content: "\e964";
+}
diff --git a/uni_modules/sp-editor/components/sp-editor/iconfont.ttf b/uni_modules/sp-editor/components/sp-editor/iconfont.ttf
new file mode 100644
index 0000000..8ade3a4
Binary files /dev/null and b/uni_modules/sp-editor/components/sp-editor/iconfont.ttf differ
diff --git a/uni_modules/sp-editor/components/sp-editor/sp-editor.vue b/uni_modules/sp-editor/components/sp-editor/sp-editor.vue
new file mode 100644
index 0000000..2c47ccb
--- /dev/null
+++ b/uni_modules/sp-editor/components/sp-editor/sp-editor.vue
@@ -0,0 +1,273 @@
+<template>
+    <view class="wrapper">
+        <view class="editor-wrapper" :class="tools.length > 8 ? 'two-row' : 'one-row'">
+            <editor id="editor" class="ql-container" show-img-size show-img-toolbar show-img-resize :placeholder="placeholder" :read-only="readOnly" @statuschange="onStatusChange" @ready="onEditorReady" @input="onEditorInput"></editor>
+        </view>
+        <PickerColor ref="colorPicker" :color="{ r: 0, g: 0, b: 0, a: 1 }" @confirm="confirmColor"></PickerColor>
+        <view class="toolbar" @tap="format">
+            <!-- 字体加粗 -->
+            <view v-if="tools.indexOf('bold') !== -1" :class="formats.bold ? 'ql-active' : ''" class="iconfont icon-zitijiacu" data-name="bold"></view>
+            <!-- 斜体 -->
+            <view v-if="tools.indexOf('italic') !== -1" :class="formats.italic ? 'ql-active' : ''" class="iconfont icon-zitixieti" data-name="italic"></view>
+            <!-- 下划线 -->
+            <view v-if="tools.indexOf('underline') !== -1" :class="formats.underline ? 'ql-active' : ''" class="iconfont icon-zitixiahuaxian" data-name="underline"></view>
+            <!-- 字体删除线 -->
+            <view v-if="tools.indexOf('strike') !== -1" :class="formats.strike ? 'ql-active' : ''" class="iconfont icon-zitishanchuxian" data-name="strike"></view>
+            <!-- #ifndef MP-BAIDU -->
+            <!-- 左对齐 -->
+            <view v-if="tools.indexOf('left') !== -1" :class="formats.align === 'left' ? 'ql-active' : ''" class="iconfont icon-zuoduiqi" data-name="align" data-value="left"></view>
+            <!-- #endif -->
+            <!-- 居中对齐 -->
+            <view v-if="tools.indexOf('center') !== -1" :class="formats.align === 'center' ? 'ql-active' : ''" class="iconfont icon-juzhongduiqi" data-name="align" data-value="center"></view>
+            <!-- 右对齐 -->
+            <view v-if="tools.indexOf('right') !== -1" :class="formats.align === 'right' ? 'ql-active' : ''" class="iconfont icon-youduiqi" data-name="align" data-value="right"></view>
+            <!-- #ifndef MP-BAIDU -->
+            <view v-if="tools.indexOf('fontSize') !== -1" :class="formats.fontSize === '24px' ? 'ql-active' : ''" class="iconfont icon-fontsize" data-name="fontSize" data-value="24px"></view>
+            <!-- #endif -->
+            <view v-if="tools.indexOf('color') !== -1" :style="{ color: textColor }" class="iconfont icon-text_color" data-name="color" :data-value="textColor"></view>
+            <view v-if="tools.indexOf('fontbgcolor') !== -1" :style="{ color: backgroundColor }" class="iconfont icon-fontbgcolor" data-name="background-color" :data-value="backgroundColor"></view>
+            <view v-if="tools.indexOf('ordered') !== -1" :class="formats.list === 'ordered' ? 'ql-active' : ''" class="iconfont icon-youxupailie" data-name="list" data-value="ordered"></view>
+            <view v-if="tools.indexOf('bullet') !== -1" :class="formats.list === 'bullet' ? 'ql-active' : ''" class="iconfont icon-wuxupailie" data-name="list" data-value="bullet"></view>
+
+            <view v-if="tools.indexOf('images') !== -1" class="iconfont icon-charutupian" @tap="insertImage"></view>
+            <view v-if="tools.indexOf('undo') !== -1" class="iconfont icon-undo" @tap="undo"></view>
+            <view v-if="tools.indexOf('redo') !== -1" class="iconfont icon-redo" @tap="redo"></view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import PickerColor from './color-picker';
+    export default {
+        components: {
+            PickerColor,
+        },
+        props: {
+            placeholder: {
+                type: String,
+                default: '写点什么吧 ~',
+            },
+            // 是否只读
+            readOnly: {
+                type: Boolean,
+                default: false,
+            },
+            // 最大字数限制，-1不限
+            maxlength: {
+                type: Number,
+                default: -1,
+            },
+            // 初始模板
+            templates: {
+                type: String,
+                default: '',
+            },
+            tools: {
+                type: Array,
+                default: () => {
+                    return ['bold', 'color', 'underline', 'left', 'center', 'right', 'fontSize', 'images'];
+                },
+            },
+        },
+        data() {
+            return {
+                formats: {},
+                textColor: '',
+                backgroundColor: '',
+                curColor: 'text',
+            };
+        },
+        onLoad() {
+            // #ifndef MP-BAIDU
+            uni.loadFontFace({
+                family: 'Pacifico',
+                source: 'url("https://sungd.github.io/Pacifico.ttf")',
+            });
+            // #endif
+        },
+        methods: {
+            onEditorReady() {
+                // #ifdef MP-BAIDU
+                this.editorCtx = requireDynamicLib('editorLib').createEditorContext('editor');
+                // #endif
+
+                // #ifdef APP-PLUS || MP-WEIXIN || H5
+                uni.createSelectorQuery()
+                    .in(this)
+                    .select('#editor')
+                    .context((res) => {
+                        this.editorCtx = res.context;
+                        this.$emit('init', this.editorCtx);
+                        // 启用preRender方法时会预先渲染templates内容，但是在小程序中会导致页面自动聚焦至富文本的区域
+                        if (this.templates) {
+                            this.preRender();
+                        }
+                    })
+                    .exec((result) => {});
+                // #endif
+            },
+            preRender() {
+                // 初始化富文本时自带的文字模板
+                this.editorCtx.setContents({
+                    html: this.templates,
+                });
+            },
+            undo() {
+                this.editorCtx.undo();
+            },
+            redo() {
+                this.editorCtx.redo();
+            },
+            format(e) {
+                let { name, value } = e.target.dataset;
+                if (!name) return;
+                // console.log('==== name :', name);
+                switch (name) {
+                    case 'color':
+                    case 'background-color':
+                        this.curColor = name;
+                        this.showPicker();
+                        break;
+                    default:
+                        this.editorCtx.format(name, value);
+                        break;
+                }
+            },
+            showPicker() {
+                this.$refs.colorPicker.open();
+            },
+            confirmColor(e) {
+                switch (this.curColor) {
+                    case 'color':
+                        this.textColor = e.hex;
+                        this.editorCtx.format('color', e.hex);
+                        break;
+                    case 'background-color':
+                        this.backgroundColor = e.hex;
+                        this.editorCtx.format('background-color', e.hex);
+                        break;
+                }
+                // 建议在更改颜色时，插入一个空以重置颜色区块，否则可能会导致颜色切换失效
+                this.editorCtx.insertText({ text: '' });
+            },
+            onStatusChange(e) {
+                this.formats = e.detail;
+                // console.log('==== e :', e, this.textColor)
+            },
+            insertImage() {
+                // #ifdef APP-PLUS || H5
+                uni.chooseImage({
+                    // count: 1, // 默认9
+                    success: (res) => {
+                        const { tempFiles } = res;
+                        // 将文件和编辑器示例抛出，由开发者自行上传和插入图片
+                        this.$emit('upinImage', tempFiles, this.editorCtx);
+                    },
+                    fail() {
+                        uni.showToast({
+                            title: '未授权访问相册权限，请授权后使用',
+                            icon: 'none',
+                        });
+                    },
+                });
+                // #endif
+
+                // #ifdef MP-WEIXIN
+                // 微信小程序从基础库 2.21.0 开始， wx.chooseImage 停止维护，请使用 uni.chooseMedia 代替。
+                uni.chooseMedia({
+                    // count: 1, // 默认9
+                    mediaType: ['image', 'video'],
+                    sourceType: ['album', 'camera'],
+                    success: (res) => {
+                        // 同上chooseImage处理
+                        const { tempFiles } = res;
+                        this.$emit('upinImage', tempFiles, this.editorCtx);
+                    },
+                    fail() {
+                        uni.showToast({
+                            title: '未授权访问相册权限，请授权后使用',
+                            icon: 'none',
+                        });
+                    },
+                });
+                // #endif
+            },
+            onEditorInput(e) {
+                let maxlength = parseInt(this.maxlength);
+
+                this.editorCtx.getContents({
+                    success: (res) => {
+                        let { html, text } = res;
+                        let textStr = text.replace(/\s/g, '');
+
+                        if (textStr.length > maxlength && maxlength != -1) {
+                            uni.showModal({
+                                content: `超过${maxlength}字数啦~`,
+                                confirmText: '确定',
+                                showCancel: false,
+                                success: () => {
+                                    this.$emit('overMax', { html, text });
+                                },
+                            });
+                        } else {
+                            this.$emit('input', { html, text });
+                        }
+                    },
+                });
+            },
+        },
+    };
+</script>
+
+<style scoped>
+    @import './editor-icon.css';
+
+    .wrapper {
+        height: 100%;
+    }
+
+    .iconfont {
+        display: inline-block;
+        padding: 16rpx 0;
+        width: 12.5%;
+        cursor: pointer;
+        font-size: 20px;
+        text-align: center;
+    }
+
+    .toolbar {
+        box-sizing: border-box;
+        border-top: 1px solid #e4e4e4;
+        font-family: 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
+    }
+
+    .editor-wrapper {
+        overflow: auto;
+    }
+
+    .editor-wrapper.one-row {
+        height: calc(100% - 80rpx);
+    }
+
+    .editor-wrapper.two-row {
+        height: calc(100% - 160rpx);
+    }
+
+    .ql-container {
+        padding: 8rpx 16rpx;
+        box-sizing: border-box;
+        width: 100%;
+        height: 100%;
+        line-height: 1.5;
+        overflow-y: auto !important;
+    }
+
+    ::v-deep .ql-editor.ql-blank::before {
+        font-style: normal;
+        color: #cccccc;
+    }
+
+    .ql-active {
+        color: #66ccff;
+    }
+</style>
diff --git a/uni_modules/sp-editor/package.json b/uni_modules/sp-editor/package.json
new file mode 100644
index 0000000..7db20c6
--- /dev/null
+++ b/uni_modules/sp-editor/package.json
@@ -0,0 +1,83 @@
+{
+	"id": "sp-editor",
+	"displayName": "sp-editor",
+	"version": "1.0.3",
+	"description": "官方内置富文本editor组件改版",
+	"keywords": [
+        "富文本",
+        "editor",
+        "编辑器"
+    ],
+	"repository": "",
+    "engines": {
+        "HBuilderX": "^3.5.1"
+	},
+	"dcloudext": {
+		"type": "component-vue",
+		"sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "插件不采集任何数据",
+			"permissions": "无"
+		},
+		"npmurl": ""
+	},
+	"uni_modules": {
+		"dependencies": [],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				},
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "u"
+				},
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "y",
+					"Safari": "y"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "y",
+					"百度": "y",
+					"字节跳动": "u",
+					"QQ": "y",
+					"钉钉": "u",
+					"快手": "u",
+					"飞书": "u",
+					"京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/sp-editor/readme.md b/uni_modules/sp-editor/readme.md
new file mode 100644
index 0000000..de0720c
--- /dev/null
+++ b/uni_modules/sp-editor/readme.md
@@ -0,0 +1,70 @@
+# sp-editor
+
+## props参数
+
+```
+props: {
+	placeholder: {
+		type: String,
+		default: '写点什么吧 ~'
+	},
+	// 是否只读
+	readOnly: {
+		type: Boolean,
+		default: false
+	},
+	// 最大字数限制，-1不限
+	maxlength: {
+		type: Number,
+		default: -1
+	},
+	// 初始模板
+	templates: {
+		type: String,
+		default: ''
+	}
+}
+```
+
+## emit方法
+
+```
+<template>
+	<sp-editor @input="input" @upinImage="upinImage"></sp-editor>
+</template>
+
+<script setup>
+function input(e) {
+	console.log('==== input :', e)
+}
+
+function upinImage(tempFiles, editorCtx) {
+	// 使用 uniCloud.uploadFile 上传图片的示例方法（可适用多选上传）
+	tempFiles.forEach(async (item) => {
+		uni.showLoading({
+			title: '上传中请稍后',
+			mask: true
+		})
+		let upfile = await uniCloud.uploadFile({
+			filePath: item.path,
+			// 同名会导致报错 policy_does_not_allow_file_overwrite
+			// cloudPath可由 想要存储的文件夹/文件名 拼接，若不拼文件夹名则默认存储在cloudstorage文件夹中
+			cloudPath: `cloudstorage/${item.name}`,
+			cloudPathAsRealPath: true
+		})
+		editorCtx.insertImage({
+			src: upfile.fileID,
+			width: '80%',
+			success: function () {
+				uni.hideLoading()
+			}
+		})
+	})
+}
+</script>
+
+```
+
+## 注意事项
+	1. 该组件在使用过程中推荐在外层套上个父盒子，并给父盒子高度，组件在封装时进行了高度计算，会自动撑满父盒子
+	2. 如遇到在内置浏览器中发生无法拖动调节颜色板的问题，只需调出开发者调试面板，点击重置左上角选择dom的箭头后，便能调出模拟器手势光标，便可正常拖动了
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/changelog.md b/uni_modules/uni-datetime-picker/changelog.md
new file mode 100644
index 0000000..1e82f46
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/changelog.md
@@ -0,0 +1,140 @@
+## 2.2.24（2023-06-02）
+- 修复 部分情况修改时间，开始、结束时间显示异常的Bug [详情](https://ask.dcloud.net.cn/question/171146)
+- 优化 当前月可以选择上月、下月的日期
+## 2.2.23（2023-05-02）
+- 修复 部分情况修改时间，开始时间未更新 [详情](https://github.com/dcloudio/uni-ui/issues/737)
+- 修复 部分平台及设备第一次点击无法显示弹框
+- 修复 ios 日期格式未补零显示及使用异常 [详情](https://ask.dcloud.net.cn/question/162979)
+## 2.2.22（2023-03-30）
+- 修复 日历 picker 修改年月后，自动选中当月1日 [详情](https://ask.dcloud.net.cn/question/165937)
+- 修复 小程序端 低版本 ios NaN [详情](https://ask.dcloud.net.cn/question/162979)
+## 2.2.21（2023-02-20）
+- 修复 firefox 浏览器显示区域点击无法拉起日历弹框的Bug [详情](https://ask.dcloud.net.cn/question/163362)
+## 2.2.20（2023-02-17）
+- 优化 值为空依然选中当天问题
+- 优化 提供 default-value 属性支持配置选择器打开时默认显示的时间
+- 优化 非范围选择未选择日期时间，点击确认按钮选中当前日期时间
+- 优化 字节小程序日期时间范围选择，底部日期换行问题
+## 2.2.19（2023-02-09）
+- 修复 2.2.18 引起范围选择配置 end 选择无效的Bug [详情](https://github.com/dcloudio/uni-ui/issues/686)
+## 2.2.18（2023-02-08）
+- 修复 移动端范围选择change事件触发异常的Bug [详情](https://github.com/dcloudio/uni-ui/issues/684)
+- 优化 PC端输入日期格式错误时返回当前日期时间
+- 优化 PC端输入日期时间超出 start、end 限制的Bug
+- 优化 移动端日期时间范围用法时间展示不完整问题
+## 2.2.17（2023-02-04）
+- 修复 小程序端绑定 Date 类型报错的Bug [详情](https://github.com/dcloudio/uni-ui/issues/679)
+- 修复 vue3 time-picker 无法显示绑定时分秒的Bug
+## 2.2.16（2023-02-02）
+- 修复 字节小程序报错的Bug
+## 2.2.15（2023-02-02）
+- 修复 某些情况切换月份错误的Bug
+## 2.2.14（2023-01-30）
+- 修复 某些情况切换月份错误的Bug [详情](https://ask.dcloud.net.cn/question/162033)
+## 2.2.13（2023-01-10）
+- 修复 多次加载组件造成内存占用的Bug
+## 2.2.12（2022-12-01）
+- 修复 vue3 下 i18n 国际化初始值不正确的Bug
+## 2.2.11（2022-09-19）
+- 修复 支付宝小程序样式错乱的Bug [详情](https://github.com/dcloudio/uni-app/issues/3861)
+## 2.2.10（2022-09-19）
+- 修复 反向选择日期范围，日期显示异常的Bug [详情](https://ask.dcloud.net.cn/question/153401?item_id=212892&rf=false)
+## 2.2.9（2022-09-16）
+- 可以使用 uni-scss 控制主题色
+## 2.2.8（2022-09-08）
+- 修复 close事件无效的Bug
+## 2.2.7（2022-09-05）
+- 修复 移动端 maskClick 无效的Bug [详情](https://ask.dcloud.net.cn/question/140824)
+## 2.2.6（2022-06-30）
+- 优化 组件样式，调整了组件图标大小、高度、颜色等，与uni-ui风格保持一致
+## 2.2.5（2022-06-24）
+- 修复 日历顶部年月及底部确认未国际化的Bug
+## 2.2.4（2022-03-31）
+- 修复 Vue3 下动态赋值,单选类型未响应的Bug
+## 2.2.3（2022-03-28）
+- 修复 Vue3 下动态赋值未响应的Bug
+## 2.2.2（2021-12-10）
+- 修复 clear-icon 属性在小程序平台不生效的Bug
+## 2.2.1（2021-12-10）
+- 修复 日期范围选在小程序平台，必须多点击一次才能取消选中状态的Bug
+## 2.2.0（2021-11-19）
+- 优化 组件UI，并提供设计资源 [详情](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移 [https://uniapp.dcloud.io/component/uniui/uni-datetime-picker](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+## 2.1.5（2021-11-09）
+- 新增 提供组件设计资源，组件样式调整
+## 2.1.4（2021-09-10）
+- 修复 hide-second 在移动端的Bug
+- 修复 单选赋默认值时，赋值日期未高亮的Bug
+- 修复 赋默认值时，移动端未正确显示时间的Bug
+## 2.1.3（2021-09-09）
+- 新增 hide-second 属性，支持只使用时分，隐藏秒
+## 2.1.2（2021-09-03）
+- 优化 取消选中时（范围选）直接开始下一次选择, 避免多点一次
+- 优化 移动端支持清除按钮，同时支持通过 ref 调用组件的 clear 方法
+- 优化 调整字号大小，美化日历界面
+- 修复 因国际化导致的 placeholder 失效的Bug
+## 2.1.1（2021-08-24）
+- 新增 支持国际化
+- 优化 范围选择器在 pc 端过宽的问题
+## 2.1.0（2021-08-09）
+- 新增 适配 vue3
+## 2.0.19（2021-08-09）
+- 新增 支持作为 uni-forms 子组件相关功能
+- 修复 在 uni-forms 中使用时，选择时间报 NAN 错误的Bug
+## 2.0.18（2021-08-05）
+- 修复 type 属性动态赋值无效的Bug
+- 修复 ‘确认’按钮被 tabbar 遮盖 bug
+- 修复 组件未赋值时范围选左、右日历相同的Bug
+## 2.0.17（2021-08-04）
+- 修复 范围选未正确显示当前值的Bug
+- 修复 h5 平台（移动端）报错 'cale' of undefined 的Bug
+## 2.0.16（2021-07-21）
+- 新增 return-type 属性支持返回 date 日期对象
+## 2.0.15（2021-07-14）
+- 修复 单选日期类型，初始赋值后不在当前日历的Bug
+- 新增 clearIcon 属性，显示框的清空按钮可配置显示隐藏（仅 pc 有效）
+- 优化 移动端移除显示框的清空按钮，无实际用途
+## 2.0.14（2021-07-14）
+- 修复 组件赋值为空，界面未更新的Bug
+- 修复 start 和 end 不能动态赋值的Bug
+- 修复 范围选类型，用户选择后再次选择右侧日历（结束日期）显示不正确的Bug
+## 2.0.13（2021-07-08）
+- 修复 范围选择不能动态赋值的Bug
+## 2.0.12（2021-07-08）
+- 修复 范围选择的初始时间在一个月内时，造成无法选择的bug
+## 2.0.11（2021-07-08）
+- 优化 弹出层在超出视窗边缘定位不准确的问题
+## 2.0.10（2021-07-08）
+- 修复 范围起始点样式的背景色与今日样式的字体前景色融合，导致日期字体看不清的Bug
+- 优化 弹出层在超出视窗边缘被遮盖的问题
+## 2.0.9（2021-07-07）
+- 新增 maskClick 事件
+- 修复 特殊情况日历 rpx 布局错误的Bug，rpx -> px
+- 修复 范围选择时清空返回值不合理的bug，['', ''] -> []
+## 2.0.8（2021-07-07）
+- 新增 日期时间显示框支持插槽
+## 2.0.7（2021-07-01）
+- 优化 添加 uni-icons 依赖
+## 2.0.6（2021-05-22）
+- 修复 图标在小程序上不显示的Bug
+- 优化 重命名引用组件，避免潜在组件命名冲突
+## 2.0.5（2021-05-20）
+- 优化 代码目录扁平化
+## 2.0.4（2021-05-12）
+- 新增 组件示例地址
+## 2.0.3（2021-05-10）
+- 修复 ios 下不识别 '-' 日期格式的Bug
+- 优化 pc 下弹出层添加边框和阴影
+## 2.0.2（2021-05-08）
+- 修复 在 admin 中获取弹出层定位错误的bug
+## 2.0.1（2021-05-08）
+- 修复 type 属性向下兼容，默认值从 date 变更为 datetime
+## 2.0.0（2021-04-30）
+- 支持日历形式的日期+时间的范围选择
+ > 注意：此版本不向后兼容，不再支持单独时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）
+## 1.0.6（2021-03-18）
+- 新增 hide-second 属性，时间支持仅选择时、分
+- 修复 选择跟显示的日期不一样的Bug
+- 修复 chang事件触发2次的Bug
+- 修复 分、秒 end 范围错误的Bug
+- 优化 更好的 nvue 适配
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
new file mode 100644
index 0000000..2522f9e
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
@@ -0,0 +1,177 @@
+<template>
+	<view class="uni-calendar-item__weeks-box" :class="{
+		'uni-calendar-item--disable':weeks.disable,
+		'uni-calendar-item--before-checked-x':weeks.beforeMultiple,
+		'uni-calendar-item--multiple': weeks.multiple,
+		'uni-calendar-item--after-checked-x':weeks.afterMultiple,
+		}" @tap="choiceDate(weeks)" @mouseenter="handleMousemove(weeks)">
+		<view class="uni-calendar-item__weeks-box-item" :class="{
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && (calendar.userChecked || !checkHover),
+				'uni-calendar-item--checked-range-text': checkHover,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">
+			<text v-if="selected && weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
+			<text class="uni-calendar-item__weeks-box-text uni-calendar-item__weeks-box-text-disable uni-calendar-item--checked-text">{{weeks.date}}</text>
+		</view>
+		<view :class="{'uni-calendar-item--today': weeks.isToday}"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			weeks: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			calendar: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			checkHover: {
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			choiceDate(weeks) {
+				this.$emit('change', weeks)
+			},
+			handleMousemove(weeks) {
+				this.$emit('handleMouse', weeks)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	$uni-primary: #007aff !default;
+
+	.uni-calendar-item__weeks-box {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		margin: 1px 0;
+		position: relative;
+	}
+
+	.uni-calendar-item__weeks-box-text {
+		font-size: 14px;
+		// font-family: Lato-Bold, Lato;
+		font-weight: bold;
+		color: darken($color: $uni-primary, $amount: 40%);
+	}
+
+	.uni-calendar-item__weeks-box-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 40px;
+		height: 40px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-calendar-item__weeks-box-circle {
+		position: absolute;
+		top: 5px;
+		right: 5px;
+		width: 8px;
+		height: 8px;
+		border-radius: 8px;
+		background-color: #dd524d;
+
+	}
+
+	.uni-calendar-item__weeks-box .uni-calendar-item--disable {
+		cursor: default;
+	}
+
+	.uni-calendar-item--disable .uni-calendar-item__weeks-box-text-disable {
+		color: #D1D1D1;
+	}
+
+	.uni-calendar-item--today {
+		position: absolute;
+		top: 10px;
+		right: 17%;
+		background-color: #dd524d;
+		width:6px;
+		height: 6px;
+		border-radius: 50%;
+	}
+
+	.uni-calendar-item--extra {
+		color: #dd524d;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item__weeks-box .uni-calendar-item--checked {
+		background-color: $uni-primary;
+		border-radius: 50%;
+		box-sizing: border-box;
+		border: 3px solid #fff;
+	}
+
+	.uni-calendar-item--checked .uni-calendar-item--checked-text {
+		color: #fff;
+	}
+
+	.uni-calendar-item--multiple .uni-calendar-item--checked-range-text {
+		color: #333;
+	}
+
+	.uni-calendar-item--multiple {
+		background-color:  #F6F7FC;
+		// color: #fff;
+	}
+
+	.uni-calendar-item--multiple .uni-calendar-item--before-checked,
+	.uni-calendar-item--multiple .uni-calendar-item--after-checked {
+		background-color: $uni-primary;
+		border-radius: 50%;
+		box-sizing: border-box;
+		border: 3px solid #F6F7FC;
+	}
+
+	.uni-calendar-item--before-checked .uni-calendar-item--checked-text,
+	.uni-calendar-item--after-checked .uni-calendar-item--checked-text {
+		color: #fff;
+	}
+
+	.uni-calendar-item--before-checked-x {
+		border-top-left-radius: 50px;
+		border-bottom-left-radius: 50px;
+		box-sizing: border-box;
+		background-color: #F6F7FC;
+	}
+
+	.uni-calendar-item--after-checked-x {
+		border-top-right-radius: 50px;
+		border-bottom-right-radius: 50px;
+		background-color: #F6F7FC;
+	}
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
new file mode 100644
index 0000000..b6536f4
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
@@ -0,0 +1,929 @@
+<template>
+	<view class="uni-calendar" @mouseleave="leaveCale">
+
+		<view v-if="!insert && show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}"
+			@tap="maskClick"></view>
+
+		<view v-if="insert || show" class="uni-calendar__content"
+			:class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow, 'uni-calendar__content-mobile': aniMaskShow}">
+			<view class="uni-calendar__header" :class="{'uni-calendar__header-mobile' :!insert}">
+
+				<view class="uni-calendar__header-btn-box" @click.stop="changeMonth('pre')">
+					<view class="uni-calendar__header-btn uni-calendar--left"></view>
+				</view>
+
+				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
+					<text
+						class="uni-calendar__header-text">{{ (nowDate.year||'') + yearText + ( nowDate.month||'') + monthText}}</text>
+				</picker>
+
+				<view class="uni-calendar__header-btn-box" @click.stop="changeMonth('next')">
+					<view class="uni-calendar__header-btn uni-calendar--right"></view>
+				</view>
+
+				<view v-if="!insert" class="dialog-close" @tap="close">
+					<view class="dialog-close-plus" data-id="close"></view>
+					<view class="dialog-close-plus dialog-close-rotate" data-id="close"></view>
+				</view>
+			</view>
+			<view class="uni-calendar__box">
+
+				<view v-if="showMonth" class="uni-calendar__box-bg">
+					<text class="uni-calendar__box-bg-text">{{nowDate.month}}</text>
+				</view>
+
+				<view class="uni-calendar__weeks" style="padding-bottom: 7px;">
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SUNText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{MONText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{TUEText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{WEDText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{THUText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{FRIText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SATText}}</text>
+					</view>
+				</view>
+
+				<view class="uni-calendar__weeks" v-for="(item,weekIndex) in weeks" :key="weekIndex">
+					<view class="uni-calendar__weeks-item" v-for="(weeks,weeksIndex) in item" :key="weeksIndex">
+						<calendar-item class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar"
+							:selected="selected" :checkHover="range" @change="choiceDate"
+							@handleMouse="handleMouse">
+						</calendar-item>
+					</view>
+				</view>
+			</view>
+
+			<view v-if="!insert && !range && hasTime" class="uni-date-changed uni-calendar--fixed-top"
+				style="padding: 0 80px;">
+				<view class="uni-date-changed--time-date">{{tempSingleDate ? tempSingleDate : selectDateText}}</view>
+				<time-picker type="time" :start="timepickerStartTime" :end="timepickerEndTime" v-model="time"
+					:disabled="!tempSingleDate" :border="false" :hide-second="hideSecond" class="time-picker-style">
+				</time-picker>
+			</view>
+
+			<view v-if="!insert && range && hasTime" class="uni-date-changed uni-calendar--fixed-top">
+				<view class="uni-date-changed--time-start">
+					<view class="uni-date-changed--time-date">{{tempRange.before ? tempRange.before : startDateText}}
+					</view>
+					<time-picker type="time" :start="timepickerStartTime" v-model="timeRange.startTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.before" class="time-picker-style">
+					</time-picker>
+				</view>
+				<view style="line-height: 50px;">
+					<uni-icons type="arrowthinright" color="#999"></uni-icons>
+				</view>
+				<view class="uni-date-changed--time-end">
+					<view class="uni-date-changed--time-date">{{tempRange.after ? tempRange.after : endDateText}}</view>
+					<time-picker type="time" :end="timepickerEndTime" v-model="timeRange.endTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.after" class="time-picker-style">
+					</time-picker>
+				</view>
+			</view>
+
+			<view v-if="!insert" class="uni-date-changed uni-date-btn--ok">
+				<view class="uni-datetime-picker--btn" @tap="confirm">{{confirmText}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { Calendar, getDate, getTime } from './util.js';
+	import calendarItem from './calendar-item.vue'
+	import timePicker from './time-picker.vue'
+
+	import { initVueI18n } from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	const { t } = initVueI18n(i18nMessages)
+
+	/**
+	 * Calendar 日历
+	 * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+	 * @property {String} date 自定义当前时间，默认为今天
+	 * @property {String} startDate 日期选择范围-开始日期
+	 * @property {String} endDate 日期选择范围-结束日期
+	 * @property {Boolean} range 范围选择
+	 * @property {Boolean} insert = [true|false] 插入模式,默认为false
+	 * 	@value true 弹窗模式
+	 * 	@value false 插入模式
+	 * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+	 * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+	 * @property {Boolean} showMonth 是否选择月份为背景
+	 * @property {[String} defaultValue 选择器打开时默认显示的时间
+	 * @event {Function} change 日期改变，`insert :ture` 时生效
+	 * @event {Function} confirm 确认选择`insert :false` 时生效
+	 * @event {Function} monthSwitch 切换月份时触发
+	 * @example <uni-calendar :insert="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
+	 */
+	export default {
+		components: {
+			calendarItem,
+			timePicker
+		},
+		props: {
+			date: {
+				type: String,
+				default: ''
+			},
+			defTime: {
+				type: [String, Object],
+				default: ''
+			},
+			selectableTimes: {
+				type: [Object],
+				default () {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			startDate: {
+				type: String,
+				default: ''
+			},
+			endDate: {
+				type: String,
+				default: ''
+			},
+      startPlaceholder: {
+        type: String,
+				default: ''
+			},
+			endPlaceholder: {
+				type: String,
+				default: ''
+			},
+			range: {
+				type: Boolean,
+				default: false
+			},
+			hasTime: {
+				type: Boolean,
+				default: false
+			},
+			insert: {
+				type: Boolean,
+				default: true
+			},
+			showMonth: {
+				type: Boolean,
+				default: true
+			},
+			clearDate: {
+				type: Boolean,
+				default: true
+			},
+			checkHover: {
+				type: Boolean,
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
+			},
+			pleStatus: {
+				type: Object,
+				default () {
+					return {
+						before: '',
+						after: '',
+						data: [],
+						fulldate: ''
+					}
+				}
+			},
+      defaultValue: {
+        type: [String, Object, Array],
+        default: ''
+      }
+		},
+		data() {
+			return {
+				show: false,
+				weeks: [],
+				calendar: {},
+				nowDate: {},
+				aniMaskShow: false,
+				firstEnter: true,
+				time: '',
+				timeRange: {
+					startTime: '',
+					endTime: ''
+				},
+				tempSingleDate: '',
+				tempRange: {
+					before: '',
+					after: ''
+				}
+			}
+		},
+		watch: {
+			date: {
+				immediate: true,
+				handler(newVal) {
+					if (!this.range) {
+						this.tempSingleDate = newVal
+						setTimeout(() => {
+							this.init(newVal)
+						}, 100)
+					}
+				}
+			},
+			defTime: {
+				immediate: true,
+				handler(newVal) {
+					if (!this.range) {
+						this.time = newVal
+					} else {
+						this.timeRange.startTime = newVal.start
+						this.timeRange.endTime = newVal.end
+					}
+				}
+			},
+			startDate(val) {
+				// 字节小程序 watch 早于 created
+				if(!this.cale){
+					return
+				}
+				this.cale.setStartDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			endDate(val) {
+				// 字节小程序 watch 早于 created
+				if(!this.cale){
+					return
+				}
+				this.cale.setEndDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			selected(newVal) {
+				// 字节小程序 watch 早于 created
+				if(!this.cale){
+					return
+				}
+				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
+				this.weeks = this.cale.weeks
+			},
+			pleStatus: {
+				immediate: true,
+				handler(newVal) {
+					const {
+						before,
+						after,
+						fulldate,
+						which
+					} = newVal
+					this.tempRange.before = before
+					this.tempRange.after = after
+					setTimeout(() => {
+						if (fulldate) {
+							this.cale.setHoverMultiple(fulldate)
+							if (before && after) {
+								this.cale.lastHover = true
+								if (this.rangeWithinMonth(after, before)) return
+								this.setDate(before)
+							} else {
+								this.cale.setMultiple(fulldate)
+								this.setDate(this.nowDate.fullDate)
+								this.calendar.fullDate = ''
+								this.cale.lastHover = false
+							}
+						} else {
+              // 字节小程序 watch 早于 created
+              if(!this.cale){
+                return
+              }
+
+							this.cale.setDefaultMultiple(before, after)
+							if (which === 'left' && before) {
+								this.setDate(before)
+								this.weeks = this.cale.weeks
+							} else if(after) {
+								this.setDate(after)
+								this.weeks = this.cale.weeks
+							}
+							this.cale.lastHover = true
+						}
+					}, 16)
+				}
+			}
+		},
+		computed: {
+			timepickerStartTime() {
+				const activeDate = this.range ? this.tempRange.before : this.calendar.fullDate
+				return activeDate === this.startDate ? this.selectableTimes.start : ''
+			},
+			timepickerEndTime() {
+				const activeDate = this.range ? this.tempRange.after : this.calendar.fullDate
+				return activeDate === this.endDate ? this.selectableTimes.end : ''
+			},
+			/**
+			 * for i18n
+			 */
+			selectDateText() {
+				return t("uni-datetime-picker.selectDate")
+			},
+			startDateText() {
+				return this.startPlaceholder || t("uni-datetime-picker.startDate")
+			},
+			endDateText() {
+				return this.endPlaceholder || t("uni-datetime-picker.endDate")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			yearText() {
+				return t("uni-datetime-picker.year")
+			},
+			monthText() {
+				return t("uni-datetime-picker.month")
+			},
+			MONText() {
+				return t("uni-calender.MON")
+			},
+			TUEText() {
+				return t("uni-calender.TUE")
+			},
+			WEDText() {
+				return t("uni-calender.WED")
+			},
+			THUText() {
+				return t("uni-calender.THU")
+			},
+			FRIText() {
+				return t("uni-calender.FRI")
+			},
+			SATText() {
+				return t("uni-calender.SAT")
+			},
+			SUNText() {
+				return t("uni-calender.SUN")
+			},
+			confirmText() {
+				return t("uni-calender.confirm")
+			},
+		},
+		created() {
+			// 获取日历方法实例
+			this.cale = new Calendar({
+				selected: this.selected,
+				startDate: this.startDate,
+				endDate: this.endDate,
+				range: this.range,
+			})
+			// 选中某一天
+			this.init(this.date)
+		},
+		methods: {
+			leaveCale() {
+				this.firstEnter = true
+			},
+			handleMouse(weeks) {
+				if (weeks.disable) return
+				if (this.cale.lastHover) return
+				let {
+					before,
+					after
+				} = this.cale.multipleStatus
+				if (!before) return
+				this.calendar = weeks
+				// 设置范围选
+				this.cale.setHoverMultiple(this.calendar.fullDate)
+				this.weeks = this.cale.weeks
+				// hover时，进入一个日历，更新另一个
+				if (this.firstEnter) {
+					this.$emit('firstEnterCale', this.cale.multipleStatus)
+					this.firstEnter = false
+				}
+			},
+			rangeWithinMonth(A, B) {
+				const [yearA, monthA] = A.split('-')
+				const [yearB, monthB] = B.split('-')
+				return yearA === yearB && monthA === monthB
+			},
+			// 蒙版点击事件
+			maskClick() {
+        this.close()
+				this.$emit('maskClose')
+			},
+
+			clearCalender() {
+				if (this.range) {
+					this.timeRange.startTime = ''
+					this.timeRange.endTime = ''
+					this.tempRange.before = ''
+					this.tempRange.after = ''
+					this.cale.multipleStatus.before = ''
+					this.cale.multipleStatus.after = ''
+					this.cale.multipleStatus.data = []
+					this.cale.lastHover = false
+				} else {
+					this.time = ''
+					this.tempSingleDate = ''
+				}
+				this.calendar.fullDate = ''
+				this.setDate(new Date())
+			},
+
+			bindDateChange(e) {
+				const value = e.detail.value + '-1'
+				this.setDate(value)
+			},
+			/**
+			 * 初始化日期显示
+			 * @param {Object} date
+			 */
+			init(date) {
+        // 字节小程序 watch 早于 created
+				if(!this.cale){
+					return
+				}
+				this.cale.setDate(date || new Date())
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+        this.calendar = {...this.nowDate}
+        if(!date){
+          // 优化date为空默认不选中今天
+          this.calendar.fullDate = ''
+          if(this.defaultValue && !this.range){
+            // 暂时只支持移动端非范围选择
+            const defaultDate = new Date(this.defaultValue)
+            const fullDate = getDate(defaultDate)
+            const year = defaultDate.getFullYear()
+            const month = defaultDate.getMonth()+1
+            const date = defaultDate.getDate()
+            const day = defaultDate.getDay()
+            this.calendar = {
+              fullDate,
+              year,
+              month,
+              date,
+              day
+            },
+            this.tempSingleDate = fullDate
+            this.time = getTime(defaultDate, this.hideSecond)
+          }
+        }
+			},
+			/**
+			 * 打开日历弹窗
+			 */
+			open() {
+				// 弹窗模式并且清理数据
+				if (this.clearDate && !this.insert) {
+					this.cale.cleanMultipleStatus()
+					this.init(this.date)
+				}
+				this.show = true
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.aniMaskShow = true
+					}, 50)
+				})
+			},
+			/**
+			 * 关闭日历弹窗
+			 */
+			close() {
+				this.aniMaskShow = false
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.show = false
+						this.$emit('close')
+					}, 300)
+				})
+			},
+			/**
+			 * 确认按钮
+			 */
+			confirm() {
+				this.setEmit('confirm')
+				this.close()
+			},
+			/**
+			 * 变化触发
+			 */
+			change() {
+				if (!this.insert) return
+				this.setEmit('change')
+			},
+			/**
+			 * 选择月份触发
+			 */
+			monthSwitch() {
+				let {
+					year,
+					month
+				} = this.nowDate
+				this.$emit('monthSwitch', {
+					year,
+					month: Number(month)
+				})
+			},
+			/**
+			 * 派发事件
+			 * @param {Object} name
+			 */
+			setEmit(name) {
+        if(!this.range){
+					if(!this.calendar.fullDate){
+					  this.calendar = this.cale.getInfo(new Date())
+					  this.tempSingleDate = this.calendar.fullDate
+					}
+					if(this.hasTime && !this.time) {
+					  this.time = getTime(new Date(), this.hideSecond)
+					}
+				}
+				let {
+					year,
+					month,
+					date,
+					fullDate,
+					extraInfo
+				} = this.calendar
+				this.$emit(name, {
+					range: this.cale.multipleStatus,
+					year,
+					month,
+					date,
+					time: this.time,
+					timeRange: this.timeRange,
+					fulldate: fullDate,
+					extraInfo: extraInfo || {}
+				})
+			},
+			/**
+			 * 选择天触发
+			 * @param {Object} weeks
+			 */
+			choiceDate(weeks) {
+				if (weeks.disable) return
+				this.calendar = weeks
+				this.calendar.userChecked = true
+				// 设置多选
+				this.cale.setMultiple(this.calendar.fullDate, true)
+				this.weeks = this.cale.weeks
+				this.tempSingleDate = this.calendar.fullDate
+				const beforeDate = new Date(this.cale.multipleStatus.before).getTime()
+				const afterDate = new Date(this.cale.multipleStatus.after).getTime()
+        // 如果先选择结束日期，后选择开始日期，需要交换
+				if (beforeDate > afterDate && afterDate) {
+					this.tempRange.before = this.cale.multipleStatus.after
+					this.tempRange.after = this.cale.multipleStatus.before
+				} else {
+					this.tempRange.before = this.cale.multipleStatus.before
+					this.tempRange.after = this.cale.multipleStatus.after
+				}
+				this.change()
+			},
+      changeMonth(type) {
+        let newDate
+        if(type === 'pre') {
+          newDate = this.cale.getPreMonthObj(this.nowDate.fullDate).fullDate
+        } else if(type === 'next') {
+          newDate = this.cale.getNextMonthObj(this.nowDate.fullDate).fullDate
+        }
+
+        this.setDate(newDate)
+				this.monthSwitch()
+      },
+			/**
+			 * 设置日期
+			 * @param {Object} date
+			 */
+			setDate(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	$uni-primary: #007aff !default;
+
+	.uni-calendar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-calendar__mask {
+		position: fixed;
+		bottom: 0;
+		top: 0;
+		left: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-property: opacity;
+		transition-duration: 0.3s;
+		opacity: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--mask-show {
+		opacity: 1
+	}
+
+	.uni-calendar--fixed {
+		position: fixed;
+		bottom: calc(var(--window-bottom));
+		left: 0;
+		right: 0;
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transform: translateY(460px);
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--ani-show {
+		transform: translateY(0);
+	}
+
+	.uni-calendar__content {
+		background-color: #fff;
+	}
+
+	.uni-calendar__content-mobile {
+		border-top-left-radius: 10px;
+		border-top-right-radius: 10px;
+		box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.1);
+	}
+
+	.uni-calendar__header {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 50px;
+	}
+
+	.uni-calendar__header-mobile {
+		padding: 10px;
+		padding-bottom: 0;
+	}
+
+	.uni-calendar--fixed-top {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		border-top-color: rgba(0, 0, 0, 0.4);
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--fixed-width {
+		width: 50px;
+	}
+
+	.uni-calendar__backtoday {
+		position: absolute;
+		right: 0;
+		top: 25rpx;
+		padding: 0 5px;
+		padding-left: 10px;
+		height: 25px;
+		line-height: 25px;
+		font-size: 12px;
+		border-top-left-radius: 25px;
+		border-bottom-left-radius: 25px;
+		color: #fff;
+		background-color: #f1f1f1;
+	}
+
+	.uni-calendar__header-text {
+		text-align: center;
+		width: 100px;
+		font-size: 15px;
+		color: #666;
+	}
+
+	.uni-calendar__button-text {
+		text-align: center;
+		width: 100px;
+		font-size: 14px;
+		color: $uni-primary;
+		/* #ifndef APP-NVUE */
+		letter-spacing: 3px;
+		/* #endif */
+	}
+
+	.uni-calendar__header-btn-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		width: 50px;
+		height: 50px;
+	}
+
+	.uni-calendar__header-btn {
+		width: 9px;
+		height: 9px;
+		border-left-color: #808080;
+		border-left-style: solid;
+		border-left-width: 1px;
+		border-top-color: #555555;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--left {
+		transform: rotate(-45deg);
+	}
+
+	.uni-calendar--right {
+		transform: rotate(135deg);
+	}
+
+
+	.uni-calendar__weeks {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-calendar__weeks-item {
+		flex: 1;
+	}
+
+	.uni-calendar__weeks-day {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 40px;
+		border-bottom-color: #F5F5F5;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar__weeks-day-text {
+		font-size: 12px;
+		color: #B2B2B2;
+	}
+
+	.uni-calendar__box {
+		position: relative;
+		// padding: 0 10px;
+		padding-bottom: 7px;
+	}
+
+	.uni-calendar__box-bg {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.uni-calendar__box-bg-text {
+		font-size: 200px;
+		font-weight: bold;
+		color: #999;
+		opacity: 0.1;
+		text-align: center;
+		/* #ifndef APP-NVUE */
+		line-height: 1;
+		/* #endif */
+	}
+
+	.uni-date-changed {
+		padding: 0 10px;
+		// line-height: 50px;
+		text-align: center;
+		color: #333;
+		border-top-color: #DCDCDC;
+		;
+		border-top-style: solid;
+		border-top-width: 1px;
+		flex: 1;
+	}
+
+	.uni-date-btn--ok {
+		padding: 20px 15px;
+	}
+
+	.uni-date-changed--time-start {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+	}
+
+	.uni-date-changed--time-end {
+		/* #ifndef APP-NVUE */
+    display: flex;
+		/* #endif */
+		align-items: center;
+	}
+
+	.uni-date-changed--time-date {
+    color: #999;
+		line-height: 50px;
+    /* #ifdef MP-TOUTIAO */
+    font-size: 16px;
+    /* #endif */
+		margin-right: 5px;
+		// opacity: 0.6;
+	}
+
+	.time-picker-style {
+		// width: 62px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center
+	}
+
+	.mr-10 {
+		margin-right: 10px;
+	}
+
+	.dialog-close {
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding: 0 25px;
+		margin-top: 10px;
+	}
+
+	.dialog-close-plus {
+		width: 16px;
+		height: 2px;
+		background-color: #737987;
+		border-radius: 2px;
+		transform: rotate(45deg);
+	}
+
+	.dialog-close-rotate {
+		position: absolute;
+		transform: rotate(-45deg);
+	}
+
+	.uni-datetime-picker--btn {
+		border-radius: 100px;
+		height: 40px;
+		line-height: 40px;
+		background-color: $uni-primary;
+		color: #fff;
+		font-size: 16px;
+		letter-spacing: 2px;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-datetime-picker--btn:active {
+		opacity: 0.7;
+	}
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
new file mode 100644
index 0000000..024f22f
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
@@ -0,0 +1,22 @@
+{
+	"uni-datetime-picker.selectDate": "select date",
+	"uni-datetime-picker.selectTime": "select time",
+	"uni-datetime-picker.selectDateTime": "select date and time",
+	"uni-datetime-picker.startDate": "start date",
+	"uni-datetime-picker.endDate": "end date",
+	"uni-datetime-picker.startTime": "start time",
+	"uni-datetime-picker.endTime": "end time",
+	"uni-datetime-picker.ok": "ok",
+	"uni-datetime-picker.clear": "clear",
+	"uni-datetime-picker.cancel": "cancel",
+	"uni-datetime-picker.year": "-",
+	"uni-datetime-picker.month": "",
+	"uni-calender.MON": "MON",
+	"uni-calender.TUE": "TUE",
+	"uni-calender.WED": "WED",
+	"uni-calender.THU": "THU",
+	"uni-calender.FRI": "FRI",
+	"uni-calender.SAT": "SAT",
+	"uni-calender.SUN": "SUN",
+	"uni-calender.confirm": "confirm"
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
new file mode 100644
index 0000000..d2df5e7
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
@@ -0,0 +1,22 @@
+{
+	"uni-datetime-picker.selectDate": "选择日期",
+	"uni-datetime-picker.selectTime": "选择时间",
+	"uni-datetime-picker.selectDateTime": "选择日期时间",
+	"uni-datetime-picker.startDate": "开始日期",
+	"uni-datetime-picker.endDate": "结束日期",
+	"uni-datetime-picker.startTime": "开始时间",
+	"uni-datetime-picker.endTime": "结束时间",
+	"uni-datetime-picker.ok": "确定",
+	"uni-datetime-picker.clear": "清除",
+	"uni-datetime-picker.cancel": "取消",
+	"uni-datetime-picker.year": "年",
+	"uni-datetime-picker.month": "月",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六",
+	"uni-calender.confirm": "确认"
+}
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
new file mode 100644
index 0000000..d23fa3c
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
@@ -0,0 +1,22 @@
+{
+  "uni-datetime-picker.selectDate": "選擇日期",
+  "uni-datetime-picker.selectTime": "選擇時間",
+  "uni-datetime-picker.selectDateTime": "選擇日期時間",
+  "uni-datetime-picker.startDate": "開始日期",
+  "uni-datetime-picker.endDate": "結束日期",
+  "uni-datetime-picker.startTime": "開始时间",
+  "uni-datetime-picker.endTime": "結束时间",
+  "uni-datetime-picker.ok": "確定",
+  "uni-datetime-picker.clear": "清除",
+  "uni-datetime-picker.cancel": "取消",
+  "uni-datetime-picker.year": "年",
+  "uni-datetime-picker.month": "月",
+  "uni-calender.SUN": "日",
+  "uni-calender.MON": "一",
+  "uni-calender.TUE": "二",
+  "uni-calender.WED": "三",
+  "uni-calender.THU": "四",
+  "uni-calender.FRI": "五",
+  "uni-calender.SAT": "六",
+  "uni-calender.confirm": "確認"
+}
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
new file mode 100644
index 0000000..866201b
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
@@ -0,0 +1,934 @@
+<template>
+	<view class="uni-datetime-picker">
+		<view @tap="initTimePicker">
+			<slot>
+				<view class="uni-datetime-picker-timebox-pointer"
+					:class="{'uni-datetime-picker-disabled': disabled, 'uni-datetime-picker-timebox': border}">
+					<text class="uni-datetime-picker-text">{{time}}</text>
+					<view v-if="!time" class="uni-datetime-picker-time">
+						<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+					</view>
+				</view>
+			</slot>
+		</view>
+		<view v-if="visible" id="mask" class="uni-datetime-picker-mask" @tap="tiggerTimePicker"></view>
+		<view v-if="visible" class="uni-datetime-picker-popup" :class="[dateShow && timeShow ? '' : 'fix-nvue-height']"
+			:style="fixNvueBug">
+			<view class="uni-title">
+				<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+			</view>
+			<view v-if="dateShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :indicator-style="indicatorStyle" :value="ymd"
+					@change="bindDateChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in years" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in months" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in days" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign sign-left">-</text>
+				<text class="uni-datetime-picker-sign sign-right">-</text>
+			</view>
+			<view v-if="timeShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :class="[hideSecond ? 'time-hide-second' : '']"
+					:indicator-style="indicatorStyle" :value="hms" @change="bindTimeChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in hours" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in minutes" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!hideSecond">
+						<view class="uni-datetime-picker-item" v-for="(item,index) in seconds" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign" :class="[hideSecond ? 'sign-center' : 'sign-left']">:</text>
+				<text v-if="!hideSecond" class="uni-datetime-picker-sign sign-right">:</text>
+			</view>
+			<view class="uni-datetime-picker-btn">
+				<view @tap="clearTime">
+					<text class="uni-datetime-picker-btn-text">{{clearText}}</text>
+				</view>
+				<view class="uni-datetime-picker-btn-group">
+					<view class="uni-datetime-picker-cancel" @tap="tiggerTimePicker">
+						<text class="uni-datetime-picker-btn-text">{{cancelText}}</text>
+					</view>
+					<view @tap="setTime">
+						<text class="uni-datetime-picker-btn-text">{{okText}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { initVueI18n } from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	const {	t	} = initVueI18n(i18nMessages)
+  import { fixIosDateFormat } from './util'
+
+	/**
+	 * DatetimePicker 时间选择器
+	 * @description 可以同时选择日期和时间的选择器
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
+	 * @property {String} type = [datetime | date | time] 显示模式
+	 * @property {Boolean} multiple = [true|false] 是否多选
+	 * @property {String|Number} value 默认值
+	 * @property {String|Number} start 起始日期或时间
+	 * @property {String|Number} end 起始日期或时间
+	 * @property {String} return-type = [timestamp | string]
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: 'UniDatetimePicker',
+		data() {
+			return {
+				indicatorStyle: `height: 50px;`,
+				visible: false,
+				fixNvueBug: {},
+				dateShow: true,
+				timeShow: true,
+				title: '日期和时间',
+				// 输入框当前时间
+				time: '',
+				// 当前的年月日时分秒
+				year: 1920,
+				month: 0,
+				day: 0,
+				hour: 0,
+				minute: 0,
+				second: 0,
+				// 起始时间
+				startYear: 1920,
+				startMonth: 1,
+				startDay: 1,
+				startHour: 0,
+				startMinute: 0,
+				startSecond: 0,
+				// 结束时间
+				endYear: 2120,
+				endMonth: 12,
+				endDay: 31,
+				endHour: 23,
+				endMinute: 59,
+				endSecond: 59,
+			}
+		},
+		props: {
+			type: {
+				type: String,
+				default: 'datetime'
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			start: {
+				type: [Number, String],
+				default: ''
+			},
+			end: {
+				type: [Number, String],
+				default: ''
+			},
+			returnType: {
+				type: String,
+				default: 'string'
+			},
+			disabled: {
+				type: [Boolean, String],
+				default: false
+			},
+			border: {
+				type: [Boolean, String],
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean, String],
+				default: false
+			}
+		},
+		watch: {
+			// #ifndef VUE3
+			value: {
+				handler(newVal) {
+          if (newVal) {
+            this.parseValue(fixIosDateFormat(newVal))
+						this.initTime(false)
+					} else {
+            this.time = ''
+						this.parseValue(Date.now())
+					}
+				},
+				immediate: true
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+        handler(newVal) {
+          if (newVal) {
+						this.parseValue(fixIosDateFormat(newVal))
+						this.initTime(false)
+					} else {
+						this.time = ''
+						this.parseValue(Date.now())
+					}
+				},
+				immediate: true
+			},
+			// #endif
+			type: {
+				handler(newValue) {
+					if (newValue === 'date') {
+						this.dateShow = true
+						this.timeShow = false
+						this.title = '日期'
+					} else if (newValue === 'time') {
+						this.dateShow = false
+						this.timeShow = true
+						this.title = '时间'
+					} else {
+						this.dateShow = true
+						this.timeShow = true
+						this.title = '日期和时间'
+					}
+				},
+				immediate: true
+			},
+			start: {
+				handler(newVal) {
+					this.parseDatetimeRange(fixIosDateFormat(newVal), 'start')
+				},
+				immediate: true
+			},
+			end: {
+				handler(newVal) {
+					this.parseDatetimeRange(fixIosDateFormat(newVal), 'end')
+				},
+				immediate: true
+			},
+
+			// 月、日、时、分、秒可选范围变化后，检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			months(newVal) {
+				this.checkValue('month', this.month, newVal)
+			},
+			days(newVal) {
+				this.checkValue('day', this.day, newVal)
+			},
+			hours(newVal) {
+				this.checkValue('hour', this.hour, newVal)
+			},
+			minutes(newVal) {
+				this.checkValue('minute', this.minute, newVal)
+			},
+			seconds(newVal) {
+				this.checkValue('second', this.second, newVal)
+			}
+		},
+		computed: {
+			// 当前年、月、日、时、分、秒选择范围
+			years() {
+				return this.getCurrentRange('year')
+			},
+
+			months() {
+				return this.getCurrentRange('month')
+			},
+
+			days() {
+				return this.getCurrentRange('day')
+			},
+
+			hours() {
+				return this.getCurrentRange('hour')
+			},
+
+			minutes() {
+				return this.getCurrentRange('minute')
+			},
+
+			seconds() {
+				return this.getCurrentRange('second')
+			},
+
+			// picker 当前值数组
+			ymd() {
+				return [this.year - this.minYear, this.month - this.minMonth, this.day - this.minDay]
+			},
+			hms() {
+				return [this.hour - this.minHour, this.minute - this.minMinute, this.second - this.minSecond]
+			},
+
+			// 当前 date 是 start
+			currentDateIsStart() {
+				return this.year === this.startYear && this.month === this.startMonth && this.day === this.startDay
+			},
+
+			// 当前 date 是 end
+			currentDateIsEnd() {
+				return this.year === this.endYear && this.month === this.endMonth && this.day === this.endDay
+			},
+
+			// 当前年、月、日、时、分、秒的最小值和最大值
+			minYear() {
+				return this.startYear
+			},
+			maxYear() {
+				return this.endYear
+			},
+			minMonth() {
+				if (this.year === this.startYear) {
+					return this.startMonth
+				} else {
+					return 1
+				}
+			},
+			maxMonth() {
+				if (this.year === this.endYear) {
+					return this.endMonth
+				} else {
+					return 12
+				}
+			},
+			minDay() {
+				if (this.year === this.startYear && this.month === this.startMonth) {
+					return this.startDay
+				} else {
+					return 1
+				}
+			},
+			maxDay() {
+				if (this.year === this.endYear && this.month === this.endMonth) {
+					return this.endDay
+				} else {
+					return this.daysInMonth(this.year, this.month)
+				}
+			},
+			minHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart) {
+						return this.startHour
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					return this.startHour
+				}
+			},
+			maxHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd) {
+						return this.endHour
+					} else {
+						return 23
+					}
+				}
+				if (this.type === 'time') {
+					return this.endHour
+				}
+			},
+			minMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+			},
+			maxMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+			},
+			minSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+			},
+			maxSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+			},
+
+			/**
+			 * for i18n
+			 */
+			selectTimeText() {
+				return t("uni-datetime-picker.selectTime")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return t("uni-datetime-picker.clear")
+			},
+			cancelText() {
+				return t("uni-datetime-picker.cancel")
+			}
+		},
+
+		mounted() {
+			// #ifdef APP-NVUE
+			const res = uni.getSystemInfoSync();
+			this.fixNvueBug = {
+				top: res.windowHeight / 2,
+				left: res.windowWidth / 2
+			}
+			// #endif
+		},
+
+		methods: {
+			/**
+			 * @param {Object} item
+			 * 小于 10 在前面加个 0
+			 */
+
+			lessThanTen(item) {
+				return item < 10 ? '0' + item : item
+			},
+
+			/**
+			 * 解析时分秒字符串，例如：00:00:00
+			 * @param {String} timeString
+			 */
+			parseTimeType(timeString) {
+				if (timeString) {
+					let timeArr = timeString.split(':')
+					this.hour = Number(timeArr[0])
+					this.minute = Number(timeArr[1])
+					this.second = Number(timeArr[2])
+				}
+			},
+
+			/**
+			 * 解析选择器初始值，类型可以是字符串、时间戳，例如：2000-10-02、'08:30:00'、 1610695109000
+			 * @param {String | Number} datetime
+			 */
+			initPickerValue(datetime) {
+				let defaultValue = null
+				if (datetime) {
+					defaultValue = this.compareValueWithStartAndEnd(datetime, this.start, this.end)
+				} else {
+					defaultValue = Date.now()
+					defaultValue = this.compareValueWithStartAndEnd(defaultValue, this.start, this.end)
+				}
+				this.parseValue(defaultValue)
+			},
+
+			/**
+			 * 初始值规则：
+			 * - 用户设置初始值 value
+			 * 	- 设置了起始时间 start、终止时间 end，并 start < value < end，初始值为 value， 否则初始值为 start
+			 * 	- 只设置了起始时间 start，并 start < value，初始值为 value，否则初始值为 start
+			 * 	- 只设置了终止时间 end，并 value < end，初始值为 value，否则初始值为 end
+			 * 	- 无起始终止时间，则初始值为 value
+			 * - 无初始值 value，则初始值为当前本地时间 Date.now()
+			 * @param {Object} value
+			 * @param {Object} dateBase
+			 */
+			compareValueWithStartAndEnd(value, start, end) {
+				let winner = null
+				value = this.superTimeStamp(value)
+				start = this.superTimeStamp(start)
+				end = this.superTimeStamp(end)
+
+				if (start && end) {
+					if (value < start) {
+						winner = new Date(start)
+					} else if (value > end) {
+						winner = new Date(end)
+					} else {
+						winner = new Date(value)
+					}
+				} else if (start && !end) {
+					winner = start <= value ? new Date(value) : new Date(start)
+				} else if (!start && end) {
+					winner = value <= end ? new Date(value) : new Date(end)
+				} else {
+					winner = new Date(value)
+				}
+
+				return winner
+			},
+
+			/**
+			 * 转换为可比较的时间戳，接受日期、时分秒、时间戳
+			 * @param {Object} value
+			 */
+			superTimeStamp(value) {
+				let dateBase = ''
+				if (this.type === 'time' && value && typeof value === 'string') {
+					const now = new Date()
+					const year = now.getFullYear()
+					const month = now.getMonth() + 1
+					const day = now.getDate()
+					dateBase = year + '/' + month + '/' + day + ' '
+				}
+				if (Number(value)) {
+					value = parseInt(value)
+					dateBase = 0
+				}
+				return this.createTimeStamp(dateBase + value)
+			},
+
+			/**
+			 * 解析默认值 value，字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseValue(value) {
+				if (!value) {
+					return
+				}
+				if (this.type === 'time' && typeof value === "string") {
+					this.parseTimeType(value)
+				} else {
+					let defaultDate = null
+					defaultDate = new Date(value)
+					if (this.type !== 'time') {
+						this.year = defaultDate.getFullYear()
+						this.month = defaultDate.getMonth() + 1
+						this.day = defaultDate.getDate()
+					}
+					if (this.type !== 'date') {
+						this.hour = defaultDate.getHours()
+						this.minute = defaultDate.getMinutes()
+						this.second = defaultDate.getSeconds()
+					}
+				}
+				if (this.hideSecond) {
+					this.second = 0
+				}
+			},
+
+			/**
+			 * 解析可选择时间范围 start、end，年月日字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseDatetimeRange(point, pointType) {
+				// 时间为空，则重置为初始值
+				if (!point) {
+					if (pointType === 'start') {
+						this.startYear = 1920
+						this.startMonth = 1
+						this.startDay = 1
+						this.startHour = 0
+						this.startMinute = 0
+						this.startSecond = 0
+					}
+					if (pointType === 'end') {
+						this.endYear = 2120
+						this.endMonth = 12
+						this.endDay = 31
+						this.endHour = 23
+						this.endMinute = 59
+						this.endSecond = 59
+					}
+					return
+				}
+				if (this.type === 'time') {
+					const pointArr = point.split(':')
+					this[pointType + 'Hour'] = Number(pointArr[0])
+					this[pointType + 'Minute'] = Number(pointArr[1])
+					this[pointType + 'Second'] = Number(pointArr[2])
+				} else {
+					if (!point) {
+						pointType === 'start' ? this.startYear = this.year - 60 : this.endYear = this.year + 60
+						return
+					}
+					if (Number(point)) {
+						point = parseInt(point)
+					}
+					// datetime 的 end 没有时分秒, 则不限制
+					const hasTime = /[0-9]:[0-9]/
+					if (this.type === 'datetime' && pointType === 'end' && typeof point === 'string' && !hasTime.test(
+							point)) {
+						point = point + ' 23:59:59'
+					}
+					const pointDate = new Date(point)
+					this[pointType + 'Year'] = pointDate.getFullYear()
+					this[pointType + 'Month'] = pointDate.getMonth() + 1
+					this[pointType + 'Day'] = pointDate.getDate()
+					if (this.type === 'datetime') {
+						this[pointType + 'Hour'] = pointDate.getHours()
+						this[pointType + 'Minute'] = pointDate.getMinutes()
+						this[pointType + 'Second'] = pointDate.getSeconds()
+					}
+				}
+			},
+
+			// 获取 年、月、日、时、分、秒 当前可选范围
+			getCurrentRange(value) {
+				const range = []
+				for (let i = this['min' + this.capitalize(value)]; i <= this['max' + this.capitalize(value)]; i++) {
+					range.push(i)
+				}
+				return range
+			},
+
+			// 字符串首字母大写
+			capitalize(str) {
+				return str.charAt(0).toUpperCase() + str.slice(1)
+			},
+
+			// 检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			checkValue(name, value, values) {
+				if (values.indexOf(value) === -1) {
+					this[name] = values[0]
+				}
+			},
+
+			// 每个月的实际天数
+			daysInMonth(year, month) { // Use 1 for January, 2 for February, etc.
+				return new Date(year, month, 0).getDate();
+			},
+
+			//兼容 iOS、safari 日期格式
+			fixIosDateFormat(value) {
+				if (typeof value === 'string') {
+					value = value.replace(/-/g, '/')
+				}
+				return value
+			},
+
+			/**
+			 * 生成时间戳
+			 * @param {Object} time
+			 */
+			createTimeStamp(time) {
+				if (!time) return
+				if (typeof time === "number") {
+					return time
+				} else {
+					time = time.replace(/-/g, '/')
+					if (this.type === 'date') {
+						time = time + ' ' + '00:00:00'
+					}
+					return Date.parse(time)
+				}
+			},
+
+			/**
+			 * 生成日期或时间的字符串
+			 */
+			createDomSting() {
+				const yymmdd = this.year +
+					'-' +
+					this.lessThanTen(this.month) +
+					'-' +
+					this.lessThanTen(this.day)
+
+				let hhmmss = this.lessThanTen(this.hour) +
+					':' +
+					this.lessThanTen(this.minute)
+
+				if (!this.hideSecond) {
+					hhmmss = hhmmss + ':' + this.lessThanTen(this.second)
+				}
+
+				if (this.type === 'date') {
+					return yymmdd
+				} else if (this.type === 'time') {
+					return hhmmss
+				} else {
+					return yymmdd + ' ' + hhmmss
+				}
+			},
+
+			/**
+			 * 初始化返回值，并抛出 change 事件
+			 */
+			initTime(emit = true) {
+				this.time = this.createDomSting()
+				if (!emit) return
+				if (this.returnType === 'timestamp' && this.type !== 'time') {
+					this.$emit('change', this.createTimeStamp(this.time))
+					this.$emit('input', this.createTimeStamp(this.time))
+					this.$emit('update:modelValue', this.createTimeStamp(this.time))
+				} else {
+					this.$emit('change', this.time)
+					this.$emit('input', this.time)
+					this.$emit('update:modelValue', this.time)
+				}
+			},
+
+			/**
+			 * 用户选择日期或时间更新 data
+			 * @param {Object} e
+			 */
+			bindDateChange(e) {
+				const val = e.detail.value
+				this.year = this.years[val[0]]
+				this.month = this.months[val[1]]
+				this.day = this.days[val[2]]
+			},
+			bindTimeChange(e) {
+				const val = e.detail.value
+				this.hour = this.hours[val[0]]
+				this.minute = this.minutes[val[1]]
+				this.second = this.seconds[val[2]]
+			},
+
+			/**
+			 * 初始化弹出层
+			 */
+			initTimePicker() {
+				if (this.disabled) return
+				const value = fixIosDateFormat(this.time)
+				this.initPickerValue(value)
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 触发或关闭弹框
+			 */
+			tiggerTimePicker(e) {
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 用户点击“清空”按钮，清空当前值
+			 */
+			clearTime() {
+				this.time = ''
+				this.$emit('change', this.time)
+				this.$emit('input', this.time)
+				this.$emit('update:modelValue', this.time)
+				this.tiggerTimePicker()
+			},
+
+			/**
+			 * 用户点击“确定”按钮
+			 */
+			setTime() {
+				this.initTime()
+				this.tiggerTimePicker()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-primary: #007aff !default;
+
+	.uni-datetime-picker {
+		/* #ifndef APP-NVUE */
+		/* width: 100%; */
+		/* #endif */
+	}
+
+	.uni-datetime-picker-view {
+		height: 130px;
+		width: 270px;
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-item {
+		height: 50px;
+		line-height: 50px;
+		text-align: center;
+		font-size: 14px;
+	}
+
+	.uni-datetime-picker-btn {
+		margin-top: 60px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.uni-datetime-picker-btn-text {
+		font-size: 14px;
+		color: $uni-primary;
+	}
+
+	.uni-datetime-picker-btn-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-datetime-picker-cancel {
+		margin-right: 30px;
+	}
+
+	.uni-datetime-picker-mask {
+		position: fixed;
+		bottom: 0px;
+		top: 0px;
+		left: 0px;
+		right: 0px;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-duration: 0.3s;
+		z-index: 998;
+	}
+
+	.uni-datetime-picker-popup {
+		border-radius: 8px;
+		padding: 30px;
+		width: 270px;
+		/* #ifdef APP-NVUE */
+		height: 500px;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 330px;
+		/* #endif */
+		background-color: #fff;
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		transition-duration: 0.3s;
+		z-index: 999;
+	}
+
+	.fix-nvue-height {
+		/* #ifdef APP-NVUE */
+		height: 330px;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-time {
+		color: grey;
+	}
+
+	.uni-datetime-picker-column {
+		height: 50px;
+	}
+
+	.uni-datetime-picker-timebox {
+
+		border: 1px solid #E5E5E5;
+		border-radius: 5px;
+		padding: 7px 10px;
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-timebox-pointer {
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-datetime-picker-disabled {
+		opacity: 0.4;
+		/* #ifdef H5 */
+		cursor: not-allowed !important;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-text {
+		font-size: 14px;
+		line-height: 50px
+	}
+
+	.uni-datetime-picker-sign {
+		position: absolute;
+		top: 53px;
+		/* 减掉 10px 的元素高度，兼容nvue */
+		color: #999;
+		/* #ifdef APP-NVUE */
+		font-size: 16px;
+		/* #endif */
+	}
+
+	.sign-left {
+		left: 86px;
+	}
+
+	.sign-right {
+		right: 86px;
+	}
+
+	.sign-center {
+		left: 135px;
+	}
+
+	.uni-datetime-picker__container-box {
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 40px;
+	}
+
+	.time-hide-second {
+		width: 180px;
+	}
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
new file mode 100644
index 0000000..67700f8
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
@@ -0,0 +1,1034 @@
+<template>
+	<view class="uni-date">
+		<view class="uni-date-editor" @tap="show">
+			<slot>
+				<view class="uni-date-editor--x" :class="{'uni-date-editor--x__disabled': disabled,'uni-date-x--border': border}">
+					<view v-if="!isRange" class="uni-date-x uni-date-single">
+						<uni-icons v-if="showFirstIcon" class="icon-calendar" type="calendar" color="#c0c4cc" size="32rpx"></uni-icons>
+						<view :class="'uni-date__x-input '+((displayValue || null) == null ? placeholderClass : '')">{{ displayValue || singlePlaceholderText }}</view>
+					</view>
+					<view v-else class="uni-date-x uni-date-range">
+                        <uni-icons v-if="showFirstIcon" class="icon-calendar" type="calendar" color="#c0c4cc" size="32rpx"></uni-icons>
+                        <view :class="'uni-date__x-input text-center '+((displayRangeValue.startDate || null) == null ? placeholderClass : '')">{{ displayRangeValue.startDate || startPlaceholderText }}</view>
+                        <view class="range-separator">{{rangeSeparator}}</view>
+                        <view :class="'uni-date__x-input text-center '+((displayRangeValue.endDate || null) == null ? placeholderClass : '')">{{ displayRangeValue.endDate || endPlaceholderText }}</view>
+					</view>
+					<view v-if="showClearIcon" class="uni-date__icon-clear" @click.stop="clear">
+						<uni-icons type="clear" color="#c0c4cc" size="32rpx"></uni-icons>
+					</view>
+				</view>
+			</slot>
+		</view>
+
+		<view v-show="pickerVisible" class="uni-date-mask--pc" @tap="close"></view>
+
+		<view v-if="!isPhone" v-show="pickerVisible" ref="datePicker" class="uni-date-picker__container">
+			<view v-if="!isRange" class="uni-date-single--x" :style="pickerPositionStyle">
+				<view class="uni-popper__arrow"></view>
+
+				<view v-if="hasTime" class="uni-date-changed popup-x-header">
+					<input class="uni-date__input text-center" type="text" v-model="inputDate"
+						:placeholder="selectDateText" />
+
+					<time-picker type="time" v-model="pickerTime" :border="false" :disabled="!inputDate"
+						:start="timepickerStartTime" :end="timepickerEndTime" :hideSecond="hideSecond" style="width: 100%;">
+						<input class="uni-date__input text-center" type="text" v-model="pickerTime" :placeholder="selectTimeText"
+							:disabled="!inputDate" />
+					</time-picker>
+				</view>
+
+				<Calendar ref="pcSingle" :showMonth="false" :start-date="calendarRange.startDate"
+					:end-date="calendarRange.endDate" :date="calendarDate" @change="singleChange"
+          :default-value="defaultValue"
+					style="padding: 0 8px;" />
+
+				<view v-if="hasTime" class="popup-x-footer">
+					<text class="confirm-text" @tap="confirmSingleChange">{{okText}}</text>
+				</view>
+			</view>
+
+			<view v-else class="uni-date-range--x" :style="pickerPositionStyle">
+				<view class="uni-popper__arrow"></view>
+				<view v-if="hasTime" class="popup-x-header uni-date-changed">
+					<view class="popup-x-header--datetime">
+            <input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.startDate"
+            :placeholder="startDateText" />
+
+						<time-picker type="time" v-model="tempRange.startTime" :start="timepickerStartTime" :border="false"
+            :disabled="!tempRange.startDate" :hideSecond="hideSecond">
+            <input class="uni-date__input uni-date-range__input" type="text"
+            v-model="tempRange.startTime" :placeholder="startTimeText"
+            :disabled="!tempRange.startDate" />
+          </time-picker>
+        </view>
+
+        <uni-icons type="arrowthinright" color="#999" style="line-height: 40px;"></uni-icons>
+
+					<view class="popup-x-header--datetime">
+						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endDate"
+							:placeholder="endDateText" />
+
+						<time-picker type="time" v-model="tempRange.endTime" :end="timepickerEndTime" :border="false"
+							:disabled="!tempRange.endDate" :hideSecond="hideSecond">
+							<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endTime"
+								:placeholder="endTimeText" :disabled="!tempRange.endDate" />
+						</time-picker>
+					</view>
+				</view>
+
+				<view class="popup-x-body">
+					<Calendar ref="left" :showMonth="false" :start-date="calendarRange.startDate"
+            :end-date="calendarRange.endDate" :range="true" :pleStatus="endMultipleStatus"
+            @change="leftChange" @firstEnterCale="updateRightCale" style="padding: 0 8px;" />
+					<Calendar ref="right" :showMonth="false" :start-date="calendarRange.startDate"
+						:end-date="calendarRange.endDate" :range="true" @change="rightChange"
+						:pleStatus="startMultipleStatus" @firstEnterCale="updateLeftCale"
+						style="padding: 0 8px;border-left: 1px solid #F1F1F1;" />
+				</view>
+
+				<view v-if="hasTime" class="popup-x-footer">
+					<text @tap="clear">{{clearText}}</text>
+					<text class="confirm-text" @tap="confirmRangeChange">{{okText}}</text>
+				</view>
+			</view>
+		</view>
+
+		<Calendar v-if="isPhone" ref="mobile" :clearDate="false" :date="calendarDate" :defTime="mobileCalendarTime"
+			:start-date="calendarRange.startDate" :end-date="calendarRange.endDate" :selectableTimes="mobSelectableTime"
+      :startPlaceholder="startPlaceholder" :endPlaceholder="endPlaceholder"
+      :default-value="defaultValue"
+			:pleStatus="endMultipleStatus" :showMonth="false" :range="isRange" :hasTime="hasTime" :insert="false"
+			:hideSecond="hideSecond" @confirm="mobileChange" @maskClose="close" />
+	</view>
+</template>
+<script>
+	/**
+	 * DatetimePicker 时间选择器
+	 * @description 同时支持 PC 和移动端使用日历选择日期和日期范围
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3962
+	 * @property {String} type 选择器类型
+	 * @property {String|Number|Array|Date} value 绑定值
+	 * @property {String} placeholder 单选择时的占位内容
+	 * @property {String} start 起始时间
+	 * @property {String} end 终止时间
+	 * @property {String} start-placeholder 范围选择时开始日期的占位内容
+	 * @property {String} end-placeholder 范围选择时结束日期的占位内容
+	 * @property {String} range-separator 选择范围时的分隔符
+	 * @property {Boolean} border = [true|false] 是否有边框
+	 * @property {Boolean} disabled = [true|false] 是否禁用
+	 * @property {Boolean} clearIcon = [true|false] 是否显示清除按钮（仅PC端适用）
+	 * @property {[String} defaultValue 选择器打开时默认显示的时间
+	 * @event {Function} change 确定日期时触发的事件
+	 * @event {Function} maskClick 点击遮罩层触发的事件
+	 * @event {Function} show 打开弹出层
+	 * @event {Function} close 关闭弹出层
+	 * @event {Function} clear 清除上次选中的状态和值
+	 **/
+	import Calendar from './calendar.vue'
+	import TimePicker from './time-picker.vue'
+	import { initVueI18n } from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+  import { getDateTime, getDate, getTime, getDefaultSecond, dateCompare, checkDate, fixIosDateFormat } from './util'
+
+	export default {
+		name: 'UniDatetimePicker',
+		options: {
+			virtualHost: true
+		},
+		components: {
+			Calendar,
+			TimePicker
+		},
+		data() {
+			return {
+				isRange: false,
+				hasTime: false,
+				displayValue: '',
+				inputDate: '',
+				calendarDate: '',
+				pickerTime: '',
+				calendarRange: {
+					startDate: '',
+					startTime: '',
+					endDate: '',
+					endTime: ''
+				},
+				displayRangeValue: {
+					startDate: '',
+					endDate: '',
+				},
+				tempRange: {
+					startDate: '',
+					startTime: '',
+					endDate: '',
+					endTime: ''
+				},
+				// 左右日历同步数据
+				startMultipleStatus: {
+					before: '',
+					after: '',
+					data: [],
+					fulldate: ''
+				},
+				endMultipleStatus: {
+					before: '',
+					after: '',
+					data: [],
+					fulldate: ''
+				},
+				pickerVisible: false,
+				pickerPositionStyle: null,
+				isEmitValue: false,
+				isPhone: false,
+				isFirstShow: true,
+        i18nT: () => {}
+			}
+		},
+		props: {
+			type: {
+				type: String,
+				default: 'datetime'
+			},
+			value: {
+				type: [String, Number, Array, Date],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number, Array, Date],
+				default: ''
+			},
+			start: {
+				type: [Number, String],
+				default: ''
+			},
+			end: {
+				type: [Number, String],
+				default: ''
+			},
+			returnType: {
+				type: String,
+				default: 'string'
+			},
+			placeholder: {
+				type: String,
+				default: ''
+			},
+			startPlaceholder: {
+        type: String,
+				default: ''
+			},
+			endPlaceholder: {
+				type: String,
+				default: ''
+			},
+			rangeSeparator: {
+				type: String,
+				default: '-'
+			},
+			border: {
+				type: [Boolean],
+				default: true
+			},
+			disabled: {
+				type: [Boolean],
+				default: false
+			},
+			clearIcon: {
+				type: [Boolean],
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
+			},
+            showFirstIcon: {
+            	type: [Boolean],
+            	default: true
+            },
+            placeholderClass: {
+            	type: String,
+            	default: ''
+            },
+      defaultValue: {
+        type: [String, Object, Array],
+        default: ''
+      }
+		},
+		watch: {
+			type: {
+				immediate: true,
+				handler(newVal) {
+          this.hasTime = newVal.indexOf('time') !== -1
+					this.isRange = newVal.indexOf('range') !== -1
+				}
+			},
+			// #ifndef VUE3
+			value: {
+				immediate: true,
+				handler(newVal) {
+					if (this.isEmitValue) {
+						this.isEmitValue = false
+						return
+					}
+					this.initPicker(newVal)
+				}
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				immediate: true,
+				handler(newVal) {
+					if (this.isEmitValue) {
+						this.isEmitValue = false
+						return
+					}
+					this.initPicker(newVal)
+				}
+			},
+			// #endif
+			start: {
+				immediate: true,
+				handler(newVal) {
+					if (!newVal) return
+					this.calendarRange.startDate = getDate(newVal)
+					if (this.hasTime) {
+						this.calendarRange.startTime = getTime(newVal)
+					}
+				}
+			},
+			end: {
+				immediate: true,
+				handler(newVal) {
+					if (!newVal) return
+					this.calendarRange.endDate = getDate(newVal)
+					if (this.hasTime) {
+						this.calendarRange.endTime = getTime(newVal, this.hideSecond)
+					}
+				}
+			},
+		},
+		computed: {
+			timepickerStartTime() {
+				const activeDate = this.isRange ? this.tempRange.startDate : this.inputDate
+				return activeDate === this.calendarRange.startDate ? this.calendarRange.startTime : ''
+			},
+			timepickerEndTime() {
+				const activeDate = this.isRange ? this.tempRange.endDate : this.inputDate
+				return activeDate === this.calendarRange.endDate ? this.calendarRange.endTime : ''
+			},
+			mobileCalendarTime() {
+				const timeRange = {
+					start: this.tempRange.startTime,
+					end: this.tempRange.endTime
+				}
+				return this.isRange ? timeRange : this.pickerTime
+			},
+			mobSelectableTime() {
+				return {
+					start: this.calendarRange.startTime,
+					end: this.calendarRange.endTime
+				}
+			},
+			datePopupWidth() {
+				// todo
+				return this.isRange ? 653 : 301
+			},
+
+			/**
+			 * for i18n
+			 */
+			singlePlaceholderText() {
+				return this.placeholder || (this.type === 'date' ? this.selectDateText : this.selectDateTimeText)
+			},
+			startPlaceholderText() {
+				return this.startPlaceholder || this.startDateText
+			},
+			endPlaceholderText() {
+				return this.endPlaceholder || this.endDateText
+			},
+			selectDateText() {
+				return this.i18nT("uni-datetime-picker.selectDate")
+			},
+      selectDateTimeText() {
+        return this.i18nT("uni-datetime-picker.selectDateTime")
+      },
+			selectTimeText() {
+				return this.i18nT("uni-datetime-picker.selectTime")
+			},
+			startDateText() {
+				return this.startPlaceholder || this.i18nT("uni-datetime-picker.startDate")
+			},
+			startTimeText() {
+				return this.i18nT("uni-datetime-picker.startTime")
+			},
+			endDateText() {
+				return this.endPlaceholder || this.i18nT("uni-datetime-picker.endDate")
+			},
+			endTimeText() {
+				return this.i18nT("uni-datetime-picker.endTime")
+			},
+			okText() {
+				return this.i18nT("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return this.i18nT("uni-datetime-picker.clear")
+			},
+			showClearIcon() {
+				return this.clearIcon && !this.disabled && (this.displayValue || (this.displayRangeValue.startDate && this.displayRangeValue.endDate))
+			}
+		},
+		created() {
+			this.initI18nT()
+      this.platform()
+		},
+		methods: {
+      initI18nT() {
+        const vueI18n = initVueI18n(i18nMessages)
+        this.i18nT = vueI18n.t
+      },
+			initPicker(newVal) {
+				if ((!newVal && !this.defaultValue) || Array.isArray(newVal) && !newVal.length) {
+					this.$nextTick(() => {
+						this.clear(false)
+					})
+					return
+				}
+
+				if (!Array.isArray(newVal) && !this.isRange) {
+          if(newVal){
+            this.displayValue = this.inputDate = this.calendarDate = getDate(newVal)
+            if (this.hasTime) {
+              this.pickerTime = getTime(newVal, this.hideSecond)
+              this.displayValue = `${this.displayValue} ${this.pickerTime}`
+            }
+          }else if(this.defaultValue){
+            this.inputDate = this.calendarDate = getDate(this.defaultValue)
+            if(this.hasTime){
+              this.pickerTime = getTime(this.defaultValue, this.hideSecond)
+            }
+          }
+				} else {
+					const [before, after] = newVal
+					if (!before && !after) return
+          const beforeDate = getDate(before)
+          const beforeTime = getTime(before, this.hideSecond)
+
+          const afterDate = getDate(after)
+          const afterTime = getTime(after, this.hideSecond)
+					const startDate = beforeDate
+					const endDate = afterDate
+					this.displayRangeValue.startDate = this.tempRange.startDate = startDate
+					this.displayRangeValue.endDate = this.tempRange.endDate = endDate
+
+					if (this.hasTime) {
+						this.displayRangeValue.startDate = `${beforeDate} ${beforeTime}`
+						this.displayRangeValue.endDate = `${afterDate} ${afterTime}`
+						this.tempRange.startTime = beforeTime
+						this.tempRange.endTime = afterTime
+					}
+					const defaultRange = {
+						before: beforeDate,
+						after: afterDate
+					}
+					this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, defaultRange, {
+						which: 'right'
+					})
+					this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, defaultRange, {
+						which: 'left'
+					})
+				}
+			},
+			updateLeftCale(e) {
+				const left = this.$refs.left
+				// 设置范围选
+				left.cale.setHoverMultiple(e.after)
+				left.setDate(this.$refs.left.nowDate.fullDate)
+			},
+			updateRightCale(e) {
+				const right = this.$refs.right
+				// 设置范围选
+				right.cale.setHoverMultiple(e.after)
+				right.setDate(this.$refs.right.nowDate.fullDate)
+			},
+			platform() {
+        if(typeof navigator !== "undefined"){
+          this.isPhone = navigator.userAgent.toLowerCase().indexOf('mobile') !== -1
+          return
+        }
+				const { windowWidth } = uni.getSystemInfoSync()
+				this.isPhone = windowWidth <= 500
+				this.windowWidth = windowWidth
+			},
+			show() {
+				if (this.disabled) {
+					return
+				}
+				this.platform()
+				if (this.isPhone) {
+					setTimeout(() => {
+            this.$refs.mobile.open()
+          }, 0);
+					return
+				}
+				this.pickerPositionStyle = {
+					top: '10px'
+				}
+				const dateEditor = uni.createSelectorQuery().in(this).select(".uni-date-editor")
+				dateEditor.boundingClientRect(rect => {
+					if (this.windowWidth - rect.left < this.datePopupWidth) {
+						this.pickerPositionStyle.right = 0
+					}
+				}).exec()
+				setTimeout(() => {
+					this.pickerVisible = !this.pickerVisible
+					if (!this.isPhone && this.isRange && this.isFirstShow) {
+						this.isFirstShow = false
+						const {
+							startDate,
+							endDate
+						} = this.calendarRange
+						if (startDate && endDate) {
+							if (this.diffDate(startDate, endDate) < 30) {
+								this.$refs.right.changeMonth('pre')
+							}
+						} else {
+							this.$refs.right.changeMonth('next')
+							this.$refs.right.cale.lastHover = false
+						}
+					}
+
+				}, 50)
+			},
+			close() {
+				setTimeout(() => {
+					this.pickerVisible = false
+					this.$emit('maskClick', this.value)
+					this.$refs.mobile && this.$refs.mobile.close()
+				}, 20)
+			},
+			setEmit(value) {
+				if (this.returnType === "timestamp" || this.returnType === "date") {
+					if (!Array.isArray(value)) {
+						if (!this.hasTime) {
+							value = value + ' ' + '00:00:00'
+						}
+						value = this.createTimestamp(value)
+						if (this.returnType === "date") {
+							value = new Date(value)
+						}
+					} else {
+						if (!this.hasTime) {
+							value[0] = value[0] + ' ' + '00:00:00'
+							value[1] = value[1] + ' ' + '00:00:00'
+						}
+						value[0] = this.createTimestamp(value[0])
+						value[1] = this.createTimestamp(value[1])
+						if (this.returnType === "date") {
+							value[0] = new Date(value[0])
+							value[1] = new Date(value[1])
+						}
+					}
+				}
+
+				this.$emit('update:modelValue', value)
+				this.$emit('input', value)
+				this.$emit('change', value)
+				this.isEmitValue = true
+			},
+			createTimestamp(date) {
+				date = fixIosDateFormat(date)
+				return Date.parse(new Date(date))
+			},
+			singleChange(e) {
+				this.calendarDate = this.inputDate = e.fulldate
+				if (this.hasTime) return
+				this.confirmSingleChange()
+			},
+			confirmSingleChange() {
+        if(!checkDate(this.inputDate)){
+					const now = new Date()
+          this.calendarDate = this.inputDate = getDate(now)
+					this.pickerTime = getTime(now, this.hideSecond)
+        }
+
+        let startLaterInputDate = false
+        let startDate, startTime
+        if(this.start) {
+          let startString = this.start
+          if(typeof this.start === 'number'){
+            startString = getDateTime(this.start, this.hideSecond)
+          }
+          [startDate, startTime] = startString.split(' ')
+          if(this.start && !dateCompare(startDate, this.inputDate)) {
+            startLaterInputDate = true
+            this.inputDate = startDate
+          }
+        }
+
+        let endEarlierInputDate = false
+        let endDate, endTime
+        if(this.end) {
+          let endString = this.end
+          if(typeof this.end === 'number'){
+            endString = getDateTime(this.end, this.hideSecond)
+          }
+          [endDate, endTime] = endString.split(' ')
+          if(this.end && !dateCompare(this.inputDate, endDate)) {
+            endEarlierInputDate = true
+            this.inputDate = endDate
+          }
+        }
+				if (this.hasTime) {
+          if(startLaterInputDate){
+            this.pickerTime = startTime || getDefaultSecond(this.hideSecond)
+          }
+          if(endEarlierInputDate){
+            this.pickerTime = endTime || getDefaultSecond(this.hideSecond)
+          }
+          if(!this.pickerTime){
+            this.pickerTime = getTime(Date.now(), this.hideSecond)
+          }
+					this.displayValue = `${this.inputDate} ${this.pickerTime}`
+				} else {
+          this.displayValue = this.inputDate
+				}
+				this.setEmit(this.displayValue)
+				this.pickerVisible = false
+			},
+			leftChange(e) {
+				const {
+					before,
+					after
+				} = e.range
+				this.rangeChange(before, after)
+				const obj = {
+					before: e.range.before,
+					after: e.range.after,
+					data: e.range.data,
+					fulldate: e.fulldate
+				}
+				this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, obj)
+			},
+			rightChange(e) {
+				const {
+					before,
+					after
+				} = e.range
+				this.rangeChange(before, after)
+				const obj = {
+					before: e.range.before,
+					after: e.range.after,
+					data: e.range.data,
+					fulldate: e.fulldate
+				}
+				this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, obj)
+			},
+			mobileChange(e) {
+				if (this.isRange) {
+					const {before, after} = e.range
+
+          if(!before || !after){
+            return
+          }
+
+					this.handleStartAndEnd(before, after, true)
+					if (this.hasTime) {
+						const {
+							startTime,
+							endTime
+						} = e.timeRange
+						this.tempRange.startTime = startTime
+						this.tempRange.endTime = endTime
+					}
+					this.confirmRangeChange()
+				} else {
+					if (this.hasTime) {
+						this.displayValue = e.fulldate + ' ' + e.time
+					} else {
+						this.displayValue = e.fulldate
+					}
+					this.setEmit(this.displayValue)
+				}
+				this.$refs.mobile.close()
+			},
+			rangeChange(before, after) {
+				if (!(before && after)) return
+				this.handleStartAndEnd(before, after, true)
+				if (this.hasTime) return
+				this.confirmRangeChange()
+			},
+			confirmRangeChange() {
+				if (!this.tempRange.startDate || !this.tempRange.endDate) {
+					this.pickerVisible = false
+					return
+				}
+        if(!checkDate(this.tempRange.startDate)){
+          this.tempRange.startDate = getDate(Date.now())
+        }
+        if(!checkDate(this.tempRange.endDate)){
+          this.tempRange.endDate = getDate(Date.now())
+        }
+
+				let start, end
+
+        let startDateLaterRangeStartDate = false
+        let startDateLaterRangeEndDate = false
+        let startDate, startTime
+        if(this.start) {
+          let startString = this.start
+          if(typeof this.start === 'number'){
+            startString = getDateTime(this.start, this.hideSecond)
+          }
+          [startDate,startTime] = startString.split(' ')
+          if(this.start && !dateCompare(this.start, this.tempRange.startDate)) {
+            startDateLaterRangeStartDate = true
+            this.tempRange.startDate = startDate
+          }
+          if(this.start && !dateCompare(this.start, this.tempRange.endDate)) {
+            startDateLaterRangeEndDate = true
+            this.tempRange.endDate = startDate
+          }
+        }
+        let endDateEarlierRangeStartDate = false
+        let endDateEarlierRangeEndDate = false
+        let endDate, endTime
+        if(this.end) {
+          let endString = this.end
+          if(typeof this.end === 'number'){
+            endString = getDateTime(this.end, this.hideSecond)
+          }
+          [endDate,endTime] = endString.split(' ')
+
+          if(this.end && !dateCompare(this.tempRange.startDate, this.end)) {
+            endDateEarlierRangeStartDate = true
+            this.tempRange.startDate = endDate
+          }
+          if(this.end && !dateCompare(this.tempRange.endDate, this.end)) {
+            endDateEarlierRangeEndDate = true
+            this.tempRange.endDate = endDate
+          }
+        }
+				if (!this.hasTime) {
+          start = this.displayRangeValue.startDate = this.tempRange.startDate
+					end = this.displayRangeValue.endDate = this.tempRange.endDate
+				} else {
+          if(startDateLaterRangeStartDate){
+            this.tempRange.startTime = startTime || getDefaultSecond(this.hideSecond)
+          }else if(endDateEarlierRangeStartDate){
+            this.tempRange.startTime = endTime || getDefaultSecond(this.hideSecond)
+          }
+          if(!this.tempRange.startTime){
+            this.tempRange.startTime = getTime(Date.now(), this.hideSecond)
+          }
+
+          if(startDateLaterRangeEndDate){
+            this.tempRange.endTime = startTime || getDefaultSecond(this.hideSecond)
+          }else if(endDateEarlierRangeEndDate){
+            this.tempRange.endTime = endTime || getDefaultSecond(this.hideSecond)
+          }
+          if(!this.tempRange.endTime){
+            this.tempRange.endTime = getTime(Date.now(), this.hideSecond)
+          }
+					start = this.displayRangeValue.startDate = `${this.tempRange.startDate} ${this.tempRange.startTime}`
+					end = this.displayRangeValue.endDate = `${this.tempRange.endDate} ${this.tempRange.endTime}`
+				}
+        if(!dateCompare(start,end)){
+          [start, end] = [end, start]
+        }
+				this.displayRangeValue.startDate = start
+				this.displayRangeValue.endDate = end
+				const displayRange = [start, end]
+				this.setEmit(displayRange)
+				this.pickerVisible = false
+			},
+			handleStartAndEnd(before, after, temp = false) {
+				if (!(before && after)) return
+
+				const type = temp ? 'tempRange' : 'range'
+        const isStartEarlierEnd = dateCompare(before, after)
+        this[type].startDate = isStartEarlierEnd ? before : after
+        this[type].endDate = isStartEarlierEnd ? after : before
+    },
+			/**
+			 * 比较时间大小
+			 */
+			dateCompare(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				return startDate <= endDate
+			},
+
+			/**
+			 * 比较时间差
+			 */
+			diffDate(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				const diff = (endDate - startDate) / (24 * 60 * 60 * 1000)
+				return Math.abs(diff)
+			},
+
+			clear(needEmit = true) {
+				if (!this.isRange) {
+					this.displayValue = ''
+					this.inputDate = ''
+					this.pickerTime = ''
+					if (this.isPhone) {
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
+					} else {
+						this.$refs.pcSingle && this.$refs.pcSingle.clearCalender()
+					}
+					if (needEmit) {
+						this.$emit('change', '')
+						this.$emit('input', '')
+						this.$emit('update:modelValue', '')
+					}
+				} else {
+					this.displayRangeValue.startDate = ''
+					this.displayRangeValue.endDate = ''
+					this.tempRange.startDate = ''
+					this.tempRange.startTime = ''
+					this.tempRange.endDate = ''
+					this.tempRange.endTime = ''
+					if (this.isPhone) {
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
+					} else {
+						this.$refs.left && this.$refs.left.clearCalender()
+						this.$refs.right && this.$refs.right.clearCalender()
+						this.$refs.right && this.$refs.right.changeMonth('next')
+					}
+					if (needEmit) {
+						this.$emit('change', [])
+						this.$emit('input', [])
+						this.$emit('update:modelValue', [])
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-primary: #007aff !default;
+
+	.uni-date {
+		width: 100%;
+		flex: 1;
+	}
+	.uni-date-x {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		border-radius: 4px;
+		background-color: #fff;
+		color: #666;
+		font-size: 14px;
+		flex: 1;
+
+    .icon-calendar{
+      padding-left: 3px;
+    }
+    .range-separator{
+      height: 35px;
+      /* #ifndef MP */
+      padding: 0 2px;
+      /* #endif */
+			line-height: 35px;
+    }
+	}
+
+	.uni-date-x--border {
+		box-sizing: border-box;
+		border-radius: 4px;
+		border: 1px solid #e5e5e5;
+	}
+
+	.uni-date-editor--x {
+		display: flex;
+		align-items: center;
+		position: relative;
+	}
+
+	.uni-date-editor--x .uni-date__icon-clear {
+		padding-right: 3px;
+		display: flex;
+		align-items: center;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-date__x-input {
+		width: auto;
+		height: 35px;
+        padding: 0 5px;
+        /* #ifndef MP */
+        padding-left: 5px;
+        /* #endif */
+		position: relative;
+		flex: 1;
+		line-height: 35px;
+		font-size: 14px;
+		overflow: hidden;
+	}
+
+	.text-center {
+		text-align: center;
+	}
+
+	.uni-date__input {
+		height: 40px;
+		width: 100%;
+		line-height: 40px;
+		font-size: 14px;
+	}
+
+	.uni-date-range__input {
+		text-align: center;
+		max-width: 142px;
+	}
+
+	.uni-date-picker__container {
+		position: relative;
+	}
+
+	.uni-date-mask--pc {
+		position: fixed;
+		bottom: 0px;
+		top: 0px;
+		left: 0px;
+		right: 0px;
+		background-color: rgba(0, 0, 0, 0);
+		transition-duration: 0.3s;
+		z-index: 996;
+	}
+
+	.uni-date-single--x {
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		z-index: 999;
+		border: 1px solid #EBEEF5;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		border-radius: 4px;
+	}
+
+	.uni-date-range--x {
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		z-index: 999;
+		border: 1px solid #EBEEF5;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		border-radius: 4px;
+	}
+
+	.uni-date-editor--x__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	.uni-date-editor--logo {
+		width: 16px;
+		height: 16px;
+		vertical-align: middle;
+	}
+
+	/* 添加时间 */
+	.popup-x-header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.popup-x-header--datetime {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex: 1;
+	}
+
+	.popup-x-body {
+		display: flex;
+	}
+
+	.popup-x-footer {
+		padding: 0 15px;
+		border-top-color: #F1F1F1;
+		border-top-style: solid;
+		border-top-width: 1px;
+		line-height: 40px;
+		text-align: right;
+		color: #666;
+	}
+
+	.popup-x-footer text:hover {
+		color: $uni-primary;
+		cursor: pointer;
+		opacity: 0.8;
+	}
+
+	.popup-x-footer .confirm-text {
+		margin-left: 20px;
+		color: $uni-primary;
+	}
+
+	.uni-date-changed {
+		text-align: center;
+		color: #333;
+		border-bottom-color: #F1F1F1;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-date-changed--time text {
+		height: 50px;
+		line-height: 50px;
+	}
+
+	.uni-date-changed .uni-date-changed--time {
+		flex: 1;
+	}
+
+	.uni-date-changed--time-date {
+		color: #333;
+		opacity: 0.6;
+	}
+
+	.mr-50 {
+		margin-right: 50px;
+	}
+
+	/* picker 弹出层通用的指示小三角, todo：扩展至上下左右方向定位 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border: 6px solid transparent;
+		border-top-width: 0;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-bottom-color: #fff;
+	}
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
new file mode 100644
index 0000000..fc98623
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
@@ -0,0 +1,453 @@
+class Calendar {
+	constructor({
+		selected,
+		startDate,
+		endDate,
+		range,
+	} = {}) {
+		// 当前日期
+		this.date = this.getDateObj(new Date()) // 当前初入日期
+		// 打点信息
+		this.selected = selected || [];
+		// 起始时间
+		this.startDate = startDate
+		// 终止时间
+		this.endDate = endDate
+    // 是否范围选择
+		this.range = range
+		// 多选状态
+		this.cleanMultipleStatus()
+		// 每周日期
+		this.weeks = {}
+		this.lastHover = false
+	}
+	/**
+	 * 设置日期
+	 * @param {Object} date
+	 */
+	setDate(date) {
+		const selectDate = this.getDateObj(date)
+		this.getWeeks(selectDate.fullDate)
+	}
+
+	/**
+	 * 清理多选状态
+	 */
+	cleanMultipleStatus() {
+		this.multipleStatus = {
+			before: '',
+			after: '',
+			data: []
+		}
+	}
+
+	setStartDate(startDate) {
+		this.startDate = startDate
+	}
+
+	setEndDate(endDate) {
+		this.endDate = endDate
+	}
+
+  getPreMonthObj(date){
+    date = fixIosDateFormat(date)
+    date = new Date(date)
+
+    const oldMonth = date.getMonth()
+    date.setMonth(oldMonth - 1)
+    const newMonth = date.getMonth()
+    if(oldMonth !== 0 && newMonth - oldMonth === 0){
+      date.setMonth(newMonth - 1)
+    }
+    return this.getDateObj(date)
+  }
+  getNextMonthObj(date){
+    date = fixIosDateFormat(date)
+    date = new Date(date)
+
+    const oldMonth = date.getMonth()
+    date.setMonth(oldMonth + 1)
+    const newMonth = date.getMonth()
+    if(newMonth - oldMonth > 1){
+      date.setMonth(newMonth - 1)
+    }
+    return this.getDateObj(date)
+  }
+
+	/**
+	 * 获取指定格式Date对象
+	 */
+	getDateObj(date) {
+    date = fixIosDateFormat(date)
+    date = new Date(date)
+
+		return {
+			fullDate: getDate(date),
+      year: date.getFullYear(),
+      month: addZero(date.getMonth() + 1),
+      date: addZero(date.getDate()),
+      day: date.getDay()
+		}
+	}
+
+	/**
+	 * 获取上一个月日期集合
+	 */
+	getPreMonthDays(amount, dateObj) {
+		const result = []
+		for (let i = amount - 1; i >= 0; i--) {
+      const month = dateObj.month > 1 ? dateObj.month -1 : 12
+			const year = month === 12 ? dateObj.year - 1 : dateObj.year
+			const date = new Date(year,month,-i).getDate()
+			const fullDate = `${year}-${addZero(month)}-${addZero(date)}`
+			let multiples = this.multipleStatus.data
+			let multiplesStatus = -1
+			if (this.range && multiples) {
+			  multiplesStatus = multiples.findIndex((item) => {
+			    return this.dateEqual(item, fullDate)
+			  })
+			}
+			const checked = multiplesStatus !== -1
+			// 获取打点信息
+			const extraInfo = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(fullDate, item.date)) {
+					return item
+				}
+			})
+			result.push({
+				fullDate,
+				year,
+				month,
+				date,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.isLogicBefore(fullDate, this.multipleStatus.before, this.multipleStatus.after),
+				afterMultiple: this.isLogicAfter(fullDate, this.multipleStatus.before, this.multipleStatus.after),
+				disable: (this.startDate && !dateCompare(this.startDate, fullDate)) || (this.endDate && !dateCompare(fullDate,this.endDate)),
+				isToday: fullDate === this.date.fullDate,
+				userChecked: false,
+				extraInfo
+			})
+		}
+		return result
+	}
+	/**
+	 * 获取本月日期集合
+	 */
+	getCurrentMonthDays(amount, dateObj) {
+		const result = []
+		const fullDate = this.date.fullDate
+		for (let i = 1; i <= amount; i++) {
+			const currentDate = `${dateObj.year}-${dateObj.month}-${addZero(i)}`
+			const isToday = fullDate === currentDate
+			// 获取打点信息
+			const extraInfo = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(currentDate, item.date)) {
+					return item
+				}
+			})
+
+			// 日期禁用
+			let disableBefore = true
+			let disableAfter = true
+			if (this.startDate) {
+				disableBefore = dateCompare(this.startDate, currentDate)
+			}
+
+			if (this.endDate) {
+				disableAfter = dateCompare(currentDate, this.endDate)
+			}
+
+			let multiples = this.multipleStatus.data
+			let multiplesStatus = -1
+			if (this.range && multiples) {
+        multiplesStatus = multiples.findIndex((item) => {
+          return this.dateEqual(item, currentDate)
+        })
+			}
+      const checked = multiplesStatus !== -1
+
+			result.push({
+				fullDate: currentDate,
+				year: dateObj.year,
+				month: dateObj.month,
+				date: i,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.isLogicBefore(currentDate, this.multipleStatus.before, this.multipleStatus.after),
+				afterMultiple: this.isLogicAfter(currentDate, this.multipleStatus.before, this.multipleStatus.after),
+				disable: (this.startDate && !dateCompare(this.startDate, currentDate)) || (this.endDate && !dateCompare(currentDate,this.endDate)),
+				isToday,
+				userChecked: false,
+        extraInfo
+			})
+		}
+		return result
+	}
+	/**
+	 * 获取下一个月日期集合
+	 */
+	_getNextMonthDays(amount, dateObj) {
+		const result = []
+    const month = dateObj.month + 1
+		for (let i = 1; i <= amount; i++) {
+			const month = dateObj.month === 12 ? 1 : dateObj.month*1 + 1
+			const year = month === 1 ? dateObj.year + 1 : dateObj.year
+			const fullDate = `${year}-${addZero(month)}-${addZero(i)}`
+			let multiples = this.multipleStatus.data
+			let multiplesStatus = -1
+			if (this.range && multiples) {
+			  multiplesStatus = multiples.findIndex((item) => {
+			    return this.dateEqual(item, fullDate)
+			  })
+			}
+			const checked = multiplesStatus !== -1
+			// 获取打点信息
+			const extraInfo = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(fullDate, item.date)) {
+					return item
+				}
+			})
+			result.push({
+				fullDate,
+				year,
+				date: i,
+				month,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.isLogicBefore(fullDate, this.multipleStatus.before, this.multipleStatus.after),
+				afterMultiple: this.isLogicAfter(fullDate, this.multipleStatus.before, this.multipleStatus.after),
+				disable: (this.startDate && !dateCompare(this.startDate, fullDate)) || (this.endDate && !dateCompare(fullDate,this.endDate)),
+				isToday: fullDate === this.date.fullDate,
+				userChecked: false,
+				extraInfo
+			})
+		}
+		return result
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+
+		return this.calendar.find(item => item.fullDate === this.getDateObj(date).fullDate)
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	dateEqual(before, after) {
+		before = new Date(fixIosDateFormat(before))
+		after = new Date(fixIosDateFormat(after))
+		return before.valueOf() === after.valueOf()
+	}
+
+	/**
+	 *  比较真实起始日期
+	 */
+
+	isLogicBefore(currentDate, before, after) {
+		let logicBefore = before
+		if (before && after) {
+			logicBefore = dateCompare(before, after) ? before : after
+		}
+		return this.dateEqual(logicBefore, currentDate)
+	}
+
+	isLogicAfter(currentDate, before, after) {
+		let logicAfter = after
+		if (before && after) {
+			logicAfter = dateCompare(before, after) ? after : before
+		}
+		return this.dateEqual(logicAfter, currentDate)
+	}
+
+	/**
+	 * 获取日期范围内所有日期
+	 * @param {Object} begin
+	 * @param {Object} end
+	 */
+	geDateAll(begin, end) {
+		var arr = []
+		var ab = begin.split('-')
+		var ae = end.split('-')
+		var db = new Date()
+		db.setFullYear(ab[0], ab[1] - 1, ab[2])
+		var de = new Date()
+		de.setFullYear(ae[0], ae[1] - 1, ae[2])
+		var unixDb = db.getTime() - 24 * 60 * 60 * 1000
+		var unixDe = de.getTime() - 24 * 60 * 60 * 1000
+		for (var k = unixDb; k <= unixDe;) {
+			k = k + 24 * 60 * 60 * 1000
+			arr.push(this.getDateObj(new Date(parseInt(k))).fullDate)
+		}
+		return arr
+	}
+
+	/**
+	 *  获取多选状态
+	 */
+	setMultiple(fullDate) {
+    if (!this.range) return
+
+		let {
+			before,
+			after
+		} = this.multipleStatus
+		if (before && after) {
+			if (!this.lastHover) {
+				this.lastHover = true
+				return
+			}
+			this.multipleStatus.before = fullDate
+			this.multipleStatus.after = ''
+			this.multipleStatus.data = []
+			this.multipleStatus.fulldate = ''
+			this.lastHover = false
+		} else {
+			if (!before) {
+				this.multipleStatus.before = fullDate
+				this.lastHover = false
+			} else {
+				this.multipleStatus.after = fullDate
+				if (dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus
+						.after);
+				} else {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus
+						.before);
+				}
+				this.lastHover = true
+			}
+		}
+		this.getWeeks(fullDate)
+	}
+
+	/**
+	 *  鼠标 hover 更新多选状态
+	 */
+	setHoverMultiple(fullDate) {
+    if (!this.range || this.lastHover) return
+
+		const { before } = this.multipleStatus
+
+		if (!before) {
+			this.multipleStatus.before = fullDate
+		} else {
+			this.multipleStatus.after = fullDate
+			if (dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+				this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus.after);
+			} else {
+				this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus.before);
+			}
+		}
+		this.getWeeks(fullDate)
+	}
+
+	/**
+	 * 更新默认值多选状态
+	 */
+	setDefaultMultiple(before, after) {
+		this.multipleStatus.before = before
+		this.multipleStatus.after = after
+		if (before && after) {
+			if (dateCompare(before, after)) {
+				this.multipleStatus.data = this.geDateAll(before, after);
+				this.getWeeks(after)
+			} else {
+				this.multipleStatus.data = this.geDateAll(after, before);
+				this.getWeeks(before)
+			}
+		}
+	}
+
+	/**
+	 * 获取每周数据
+	 * @param {Object} dateData
+	 */
+	getWeeks(dateData) {
+		const {
+			year,
+			month,
+		} = this.getDateObj(dateData)
+
+		const preMonthDayAmount = new Date(year, month - 1, 1).getDay()
+    const preMonthDays = this.getPreMonthDays(preMonthDayAmount, this.getDateObj(dateData))
+
+		const currentMonthDayAmount = new Date(year, month, 0).getDate()
+    const currentMonthDays = this.getCurrentMonthDays(currentMonthDayAmount, this.getDateObj(dateData))
+
+    const nextMonthDayAmount = 42 - preMonthDayAmount - currentMonthDayAmount
+    const nextMonthDays = this._getNextMonthDays(nextMonthDayAmount, this.getDateObj(dateData))
+
+		const calendarDays = [...preMonthDays, ...currentMonthDays, ...nextMonthDays]
+
+		const weeks = new Array(6)
+		for (let i = 0; i < calendarDays.length; i++) {
+      const index = Math.floor(i / 7)
+      if(!weeks[index]){
+        weeks[index] = new Array(7)
+      }
+			weeks[index][i % 7] = calendarDays[i]
+		}
+
+		this.calendar = calendarDays
+		this.weeks = weeks
+	}
+}
+
+function getDateTime(date, hideSecond){
+  return `${getDate(date)} ${getTime(date, hideSecond)}`
+}
+
+function getDate(date) {
+  date = fixIosDateFormat(date)
+  date = new Date(date)
+  const year = date.getFullYear()
+  const month = date.getMonth()+1
+  const day = date.getDate()
+  return `${year}-${addZero(month)}-${addZero(day)}`
+}
+
+function getTime(date, hideSecond){
+  date = fixIosDateFormat(date)
+  date = new Date(date)
+  const hour = date.getHours()
+  const minute = date.getMinutes()
+  const second = date.getSeconds()
+  return hideSecond ? `${addZero(hour)}:${addZero(minute)}` : `${addZero(hour)}:${addZero(minute)}:${addZero(second)}`
+}
+
+function addZero(num) {
+  if(num < 10){
+    num = `0${num}`
+  }
+  return num
+}
+
+function getDefaultSecond(hideSecond) {
+  return hideSecond ? '00:00' : '00:00:00'
+}
+
+function dateCompare(startDate, endDate) {
+  startDate = new Date(fixIosDateFormat(startDate))
+  endDate = new Date(fixIosDateFormat(endDate))
+  return startDate <= endDate
+}
+
+function checkDate(date){
+  const dateReg = /((19|20)\d{2})(-|\/)\d{1,2}(-|\/)\d{1,2}/g
+  return date.match(dateReg)
+}
+
+const dateTimeReg = /^\d{4}-(0?[1-9]|1[012])-(0?[1-9]|[12][0-9]|3[01])( [0-5]?[0-9]:[0-5]?[0-9]:[0-5]?[0-9])?$/
+function fixIosDateFormat(value) {
+  if (typeof value === 'string' && dateTimeReg.test(value)) {
+    value = value.replace(/-/g, '/')
+  }
+  return value
+}
+
+export {Calendar, getDateTime, getDate, getTime, addZero, getDefaultSecond, dateCompare, checkDate, fixIosDateFormat}
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/package.json b/uni_modules/uni-datetime-picker/package.json
new file mode 100644
index 0000000..cabb668
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-datetime-picker",
+  "displayName": "uni-datetime-picker 日期选择器",
+  "version": "2.2.24",
+  "description": "uni-datetime-picker 日期时间选择器，支持日历，支持范围选择",
+  "keywords": [
+    "uni-datetime-picker",
+    "uni-ui",
+    "uniui",
+    "日期时间选择器",
+    "日期时间"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-datetime-picker/readme.md b/uni_modules/uni-datetime-picker/readme.md
new file mode 100644
index 0000000..162fbef
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/readme.md
@@ -0,0 +1,21 @@
+
+
+> `重要通知：组件升级更新 2.0.0 后，支持日期+时间范围选择，组件 ui 将使用日历选择日期，ui 变化较大，同时支持 PC 和 移动端。此版本不向后兼容，不再支持单独的时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）。若仍需使用旧版本，可在插件市场下载*非uni_modules版本*，旧版本将不再维护`
+
+## DatetimePicker 时间选择器
+
+> **组件名：uni-datetime-picker**
+> 代码块： `uDatetimePicker`
+
+
+该组件的优势是，支持**时间戳**输入和输出（起始时间、终止时间也支持时间戳），可**同时选择**日期和时间。
+
+若只是需要单独选择日期和时间，不需要时间戳输入和输出，可使用原生的 picker 组件。
+
+**_点击 picker 默认值规则：_**
+
+- 若设置初始值 value, 会显示在 picker 显示框中
+- 若无初始值 value，则初始值 value 为当前本地时间 Date.now()， 但不会显示在 picker 显示框中
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-icons/changelog.md b/uni_modules/uni-icons/changelog.md
new file mode 100644
index 0000000..6449885
--- /dev/null
+++ b/uni_modules/uni-icons/changelog.md
@@ -0,0 +1,22 @@
+## 1.3.5（2022-01-24）
+- 优化 size 属性可以传入不带单位的字符串数值
+## 1.3.4（2022-01-24）
+- 优化 size 支持其他单位
+## 1.3.3（2022-01-17）
+- 修复 nvue 有些图标不显示的bug，兼容老版本图标
+## 1.3.2（2021-12-01）
+- 优化 示例可复制图标名称
+## 1.3.1（2021-11-23）
+- 优化 兼容旧组件 type 值
+## 1.3.0（2021-11-19）
+- 新增 更多图标
+- 优化 自定义图标使用方式
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-icons](https://uniapp.dcloud.io/component/uniui/uni-icons)
+## 1.1.7（2021-11-08）
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.5（2021-05-12）
+- 新增 组件示例地址
+## 1.1.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-icons/components/uni-icons/icons.js b/uni_modules/uni-icons/components/uni-icons/icons.js
new file mode 100644
index 0000000..7889936
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/icons.js
@@ -0,0 +1,1169 @@
+export default {
+  "id": "2852637",
+  "name": "uniui图标库",
+  "font_family": "uniicons",
+  "css_prefix_text": "uniui-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "25027049",
+      "name": "yanse",
+      "font_class": "color",
+      "unicode": "e6cf",
+      "unicode_decimal": 59087
+    },
+    {
+      "icon_id": "25027048",
+      "name": "wallet",
+      "font_class": "wallet",
+      "unicode": "e6b1",
+      "unicode_decimal": 59057
+    },
+    {
+      "icon_id": "25015720",
+      "name": "settings-filled",
+      "font_class": "settings-filled",
+      "unicode": "e6ce",
+      "unicode_decimal": 59086
+    },
+    {
+      "icon_id": "25015434",
+      "name": "shimingrenzheng-filled",
+      "font_class": "auth-filled",
+      "unicode": "e6cc",
+      "unicode_decimal": 59084
+    },
+    {
+      "icon_id": "24934246",
+      "name": "shop-filled",
+      "font_class": "shop-filled",
+      "unicode": "e6cd",
+      "unicode_decimal": 59085
+    },
+    {
+      "icon_id": "24934159",
+      "name": "staff-filled-01",
+      "font_class": "staff-filled",
+      "unicode": "e6cb",
+      "unicode_decimal": 59083
+    },
+    {
+      "icon_id": "24932461",
+      "name": "VIP-filled",
+      "font_class": "vip-filled",
+      "unicode": "e6c6",
+      "unicode_decimal": 59078
+    },
+    {
+      "icon_id": "24932462",
+      "name": "plus_circle_fill",
+      "font_class": "plus-filled",
+      "unicode": "e6c7",
+      "unicode_decimal": 59079
+    },
+    {
+      "icon_id": "24932463",
+      "name": "folder_add-filled",
+      "font_class": "folder-add-filled",
+      "unicode": "e6c8",
+      "unicode_decimal": 59080
+    },
+    {
+      "icon_id": "24932464",
+      "name": "yanse-filled",
+      "font_class": "color-filled",
+      "unicode": "e6c9",
+      "unicode_decimal": 59081
+    },
+    {
+      "icon_id": "24932465",
+      "name": "tune-filled",
+      "font_class": "tune-filled",
+      "unicode": "e6ca",
+      "unicode_decimal": 59082
+    },
+    {
+      "icon_id": "24932455",
+      "name": "a-rilidaka-filled",
+      "font_class": "calendar-filled",
+      "unicode": "e6c0",
+      "unicode_decimal": 59072
+    },
+    {
+      "icon_id": "24932456",
+      "name": "notification-filled",
+      "font_class": "notification-filled",
+      "unicode": "e6c1",
+      "unicode_decimal": 59073
+    },
+    {
+      "icon_id": "24932457",
+      "name": "wallet-filled",
+      "font_class": "wallet-filled",
+      "unicode": "e6c2",
+      "unicode_decimal": 59074
+    },
+    {
+      "icon_id": "24932458",
+      "name": "paihangbang-filled",
+      "font_class": "medal-filled",
+      "unicode": "e6c3",
+      "unicode_decimal": 59075
+    },
+    {
+      "icon_id": "24932459",
+      "name": "gift-filled",
+      "font_class": "gift-filled",
+      "unicode": "e6c4",
+      "unicode_decimal": 59076
+    },
+    {
+      "icon_id": "24932460",
+      "name": "fire-filled",
+      "font_class": "fire-filled",
+      "unicode": "e6c5",
+      "unicode_decimal": 59077
+    },
+    {
+      "icon_id": "24928001",
+      "name": "refreshempty",
+      "font_class": "refreshempty",
+      "unicode": "e6bf",
+      "unicode_decimal": 59071
+    },
+    {
+      "icon_id": "24926853",
+      "name": "location-ellipse",
+      "font_class": "location-filled",
+      "unicode": "e6af",
+      "unicode_decimal": 59055
+    },
+    {
+      "icon_id": "24926735",
+      "name": "person-filled",
+      "font_class": "person-filled",
+      "unicode": "e69d",
+      "unicode_decimal": 59037
+    },
+    {
+      "icon_id": "24926703",
+      "name": "personadd-filled",
+      "font_class": "personadd-filled",
+      "unicode": "e698",
+      "unicode_decimal": 59032
+    },
+    {
+      "icon_id": "24923351",
+      "name": "back",
+      "font_class": "back",
+      "unicode": "e6b9",
+      "unicode_decimal": 59065
+    },
+    {
+      "icon_id": "24923352",
+      "name": "forward",
+      "font_class": "forward",
+      "unicode": "e6ba",
+      "unicode_decimal": 59066
+    },
+    {
+      "icon_id": "24923353",
+      "name": "arrowthinright",
+      "font_class": "arrow-right",
+      "unicode": "e6bb",
+      "unicode_decimal": 59067
+    },
+		{
+		  "icon_id": "24923353",
+		  "name": "arrowthinright",
+		  "font_class": "arrowthinright",
+		  "unicode": "e6bb",
+		  "unicode_decimal": 59067
+		},
+    {
+      "icon_id": "24923354",
+      "name": "arrowthinleft",
+      "font_class": "arrow-left",
+      "unicode": "e6bc",
+      "unicode_decimal": 59068
+    },
+		{
+		  "icon_id": "24923354",
+		  "name": "arrowthinleft",
+		  "font_class": "arrowthinleft",
+		  "unicode": "e6bc",
+		  "unicode_decimal": 59068
+		},
+    {
+      "icon_id": "24923355",
+      "name": "arrowthinup",
+      "font_class": "arrow-up",
+      "unicode": "e6bd",
+      "unicode_decimal": 59069
+    },
+		{
+		  "icon_id": "24923355",
+		  "name": "arrowthinup",
+		  "font_class": "arrowthinup",
+		  "unicode": "e6bd",
+		  "unicode_decimal": 59069
+		},
+    {
+      "icon_id": "24923356",
+      "name": "arrowthindown",
+      "font_class": "arrow-down",
+      "unicode": "e6be",
+      "unicode_decimal": 59070
+    },{
+      "icon_id": "24923356",
+      "name": "arrowthindown",
+      "font_class": "arrowthindown",
+      "unicode": "e6be",
+      "unicode_decimal": 59070
+    },
+    {
+      "icon_id": "24923349",
+      "name": "arrowdown",
+      "font_class": "bottom",
+      "unicode": "e6b8",
+      "unicode_decimal": 59064
+    },{
+      "icon_id": "24923349",
+      "name": "arrowdown",
+      "font_class": "arrowdown",
+      "unicode": "e6b8",
+      "unicode_decimal": 59064
+    },
+    {
+      "icon_id": "24923346",
+      "name": "arrowright",
+      "font_class": "right",
+      "unicode": "e6b5",
+      "unicode_decimal": 59061
+    },
+		{
+		  "icon_id": "24923346",
+		  "name": "arrowright",
+		  "font_class": "arrowright",
+		  "unicode": "e6b5",
+		  "unicode_decimal": 59061
+		},
+    {
+      "icon_id": "24923347",
+      "name": "arrowup",
+      "font_class": "top",
+      "unicode": "e6b6",
+      "unicode_decimal": 59062
+    },
+		{
+		  "icon_id": "24923347",
+		  "name": "arrowup",
+		  "font_class": "arrowup",
+		  "unicode": "e6b6",
+		  "unicode_decimal": 59062
+		},
+    {
+      "icon_id": "24923348",
+      "name": "arrowleft",
+      "font_class": "left",
+      "unicode": "e6b7",
+      "unicode_decimal": 59063
+    },
+		{
+		  "icon_id": "24923348",
+		  "name": "arrowleft",
+		  "font_class": "arrowleft",
+		  "unicode": "e6b7",
+		  "unicode_decimal": 59063
+		},
+    {
+      "icon_id": "24923334",
+      "name": "eye",
+      "font_class": "eye",
+      "unicode": "e651",
+      "unicode_decimal": 58961
+    },
+    {
+      "icon_id": "24923335",
+      "name": "eye-filled",
+      "font_class": "eye-filled",
+      "unicode": "e66a",
+      "unicode_decimal": 58986
+    },
+    {
+      "icon_id": "24923336",
+      "name": "eye-slash",
+      "font_class": "eye-slash",
+      "unicode": "e6b3",
+      "unicode_decimal": 59059
+    },
+    {
+      "icon_id": "24923337",
+      "name": "eye-slash-filled",
+      "font_class": "eye-slash-filled",
+      "unicode": "e6b4",
+      "unicode_decimal": 59060
+    },
+    {
+      "icon_id": "24923305",
+      "name": "info-filled",
+      "font_class": "info-filled",
+      "unicode": "e649",
+      "unicode_decimal": 58953
+    },
+    {
+      "icon_id": "24923299",
+      "name": "reload-01",
+      "font_class": "reload",
+      "unicode": "e6b2",
+      "unicode_decimal": 59058
+    },
+    {
+      "icon_id": "24923195",
+      "name": "mic_slash_fill",
+      "font_class": "micoff-filled",
+      "unicode": "e6b0",
+      "unicode_decimal": 59056
+    },
+    {
+      "icon_id": "24923165",
+      "name": "map-pin-ellipse",
+      "font_class": "map-pin-ellipse",
+      "unicode": "e6ac",
+      "unicode_decimal": 59052
+    },
+    {
+      "icon_id": "24923166",
+      "name": "map-pin",
+      "font_class": "map-pin",
+      "unicode": "e6ad",
+      "unicode_decimal": 59053
+    },
+    {
+      "icon_id": "24923167",
+      "name": "location",
+      "font_class": "location",
+      "unicode": "e6ae",
+      "unicode_decimal": 59054
+    },
+    {
+      "icon_id": "24923064",
+      "name": "starhalf",
+      "font_class": "starhalf",
+      "unicode": "e683",
+      "unicode_decimal": 59011
+    },
+    {
+      "icon_id": "24923065",
+      "name": "star",
+      "font_class": "star",
+      "unicode": "e688",
+      "unicode_decimal": 59016
+    },
+    {
+      "icon_id": "24923066",
+      "name": "star-filled",
+      "font_class": "star-filled",
+      "unicode": "e68f",
+      "unicode_decimal": 59023
+    },
+    {
+      "icon_id": "24899646",
+      "name": "a-rilidaka",
+      "font_class": "calendar",
+      "unicode": "e6a0",
+      "unicode_decimal": 59040
+    },
+    {
+      "icon_id": "24899647",
+      "name": "fire",
+      "font_class": "fire",
+      "unicode": "e6a1",
+      "unicode_decimal": 59041
+    },
+    {
+      "icon_id": "24899648",
+      "name": "paihangbang",
+      "font_class": "medal",
+      "unicode": "e6a2",
+      "unicode_decimal": 59042
+    },
+    {
+      "icon_id": "24899649",
+      "name": "font",
+      "font_class": "font",
+      "unicode": "e6a3",
+      "unicode_decimal": 59043
+    },
+    {
+      "icon_id": "24899650",
+      "name": "gift",
+      "font_class": "gift",
+      "unicode": "e6a4",
+      "unicode_decimal": 59044
+    },
+    {
+      "icon_id": "24899651",
+      "name": "link",
+      "font_class": "link",
+      "unicode": "e6a5",
+      "unicode_decimal": 59045
+    },
+    {
+      "icon_id": "24899652",
+      "name": "notification",
+      "font_class": "notification",
+      "unicode": "e6a6",
+      "unicode_decimal": 59046
+    },
+    {
+      "icon_id": "24899653",
+      "name": "staff",
+      "font_class": "staff",
+      "unicode": "e6a7",
+      "unicode_decimal": 59047
+    },
+    {
+      "icon_id": "24899654",
+      "name": "VIP",
+      "font_class": "vip",
+      "unicode": "e6a8",
+      "unicode_decimal": 59048
+    },
+    {
+      "icon_id": "24899655",
+      "name": "folder_add",
+      "font_class": "folder-add",
+      "unicode": "e6a9",
+      "unicode_decimal": 59049
+    },
+    {
+      "icon_id": "24899656",
+      "name": "tune",
+      "font_class": "tune",
+      "unicode": "e6aa",
+      "unicode_decimal": 59050
+    },
+    {
+      "icon_id": "24899657",
+      "name": "shimingrenzheng",
+      "font_class": "auth",
+      "unicode": "e6ab",
+      "unicode_decimal": 59051
+    },
+    {
+      "icon_id": "24899565",
+      "name": "person",
+      "font_class": "person",
+      "unicode": "e699",
+      "unicode_decimal": 59033
+    },
+    {
+      "icon_id": "24899566",
+      "name": "email-filled",
+      "font_class": "email-filled",
+      "unicode": "e69a",
+      "unicode_decimal": 59034
+    },
+    {
+      "icon_id": "24899567",
+      "name": "phone-filled",
+      "font_class": "phone-filled",
+      "unicode": "e69b",
+      "unicode_decimal": 59035
+    },
+    {
+      "icon_id": "24899568",
+      "name": "phone",
+      "font_class": "phone",
+      "unicode": "e69c",
+      "unicode_decimal": 59036
+    },
+    {
+      "icon_id": "24899570",
+      "name": "email",
+      "font_class": "email",
+      "unicode": "e69e",
+      "unicode_decimal": 59038
+    },
+    {
+      "icon_id": "24899571",
+      "name": "personadd",
+      "font_class": "personadd",
+      "unicode": "e69f",
+      "unicode_decimal": 59039
+    },
+    {
+      "icon_id": "24899558",
+      "name": "chatboxes-filled",
+      "font_class": "chatboxes-filled",
+      "unicode": "e692",
+      "unicode_decimal": 59026
+    },
+    {
+      "icon_id": "24899559",
+      "name": "contact",
+      "font_class": "contact",
+      "unicode": "e693",
+      "unicode_decimal": 59027
+    },
+    {
+      "icon_id": "24899560",
+      "name": "chatbubble-filled",
+      "font_class": "chatbubble-filled",
+      "unicode": "e694",
+      "unicode_decimal": 59028
+    },
+    {
+      "icon_id": "24899561",
+      "name": "contact-filled",
+      "font_class": "contact-filled",
+      "unicode": "e695",
+      "unicode_decimal": 59029
+    },
+    {
+      "icon_id": "24899562",
+      "name": "chatboxes",
+      "font_class": "chatboxes",
+      "unicode": "e696",
+      "unicode_decimal": 59030
+    },
+    {
+      "icon_id": "24899563",
+      "name": "chatbubble",
+      "font_class": "chatbubble",
+      "unicode": "e697",
+      "unicode_decimal": 59031
+    },
+    {
+      "icon_id": "24881290",
+      "name": "upload-filled",
+      "font_class": "upload-filled",
+      "unicode": "e68e",
+      "unicode_decimal": 59022
+    },
+    {
+      "icon_id": "24881292",
+      "name": "upload",
+      "font_class": "upload",
+      "unicode": "e690",
+      "unicode_decimal": 59024
+    },
+    {
+      "icon_id": "24881293",
+      "name": "weixin",
+      "font_class": "weixin",
+      "unicode": "e691",
+      "unicode_decimal": 59025
+    },
+    {
+      "icon_id": "24881274",
+      "name": "compose",
+      "font_class": "compose",
+      "unicode": "e67f",
+      "unicode_decimal": 59007
+    },
+    {
+      "icon_id": "24881275",
+      "name": "qq",
+      "font_class": "qq",
+      "unicode": "e680",
+      "unicode_decimal": 59008
+    },
+    {
+      "icon_id": "24881276",
+      "name": "download-filled",
+      "font_class": "download-filled",
+      "unicode": "e681",
+      "unicode_decimal": 59009
+    },
+    {
+      "icon_id": "24881277",
+      "name": "pengyouquan",
+      "font_class": "pyq",
+      "unicode": "e682",
+      "unicode_decimal": 59010
+    },
+    {
+      "icon_id": "24881279",
+      "name": "sound",
+      "font_class": "sound",
+      "unicode": "e684",
+      "unicode_decimal": 59012
+    },
+    {
+      "icon_id": "24881280",
+      "name": "trash-filled",
+      "font_class": "trash-filled",
+      "unicode": "e685",
+      "unicode_decimal": 59013
+    },
+    {
+      "icon_id": "24881281",
+      "name": "sound-filled",
+      "font_class": "sound-filled",
+      "unicode": "e686",
+      "unicode_decimal": 59014
+    },
+    {
+      "icon_id": "24881282",
+      "name": "trash",
+      "font_class": "trash",
+      "unicode": "e687",
+      "unicode_decimal": 59015
+    },
+    {
+      "icon_id": "24881284",
+      "name": "videocam-filled",
+      "font_class": "videocam-filled",
+      "unicode": "e689",
+      "unicode_decimal": 59017
+    },
+    {
+      "icon_id": "24881285",
+      "name": "spinner-cycle",
+      "font_class": "spinner-cycle",
+      "unicode": "e68a",
+      "unicode_decimal": 59018
+    },
+    {
+      "icon_id": "24881286",
+      "name": "weibo",
+      "font_class": "weibo",
+      "unicode": "e68b",
+      "unicode_decimal": 59019
+    },
+    {
+      "icon_id": "24881288",
+      "name": "videocam",
+      "font_class": "videocam",
+      "unicode": "e68c",
+      "unicode_decimal": 59020
+    },
+    {
+      "icon_id": "24881289",
+      "name": "download",
+      "font_class": "download",
+      "unicode": "e68d",
+      "unicode_decimal": 59021
+    },
+    {
+      "icon_id": "24879601",
+      "name": "help",
+      "font_class": "help",
+      "unicode": "e679",
+      "unicode_decimal": 59001
+    },
+    {
+      "icon_id": "24879602",
+      "name": "navigate-filled",
+      "font_class": "navigate-filled",
+      "unicode": "e67a",
+      "unicode_decimal": 59002
+    },
+    {
+      "icon_id": "24879603",
+      "name": "plusempty",
+      "font_class": "plusempty",
+      "unicode": "e67b",
+      "unicode_decimal": 59003
+    },
+    {
+      "icon_id": "24879604",
+      "name": "smallcircle",
+      "font_class": "smallcircle",
+      "unicode": "e67c",
+      "unicode_decimal": 59004
+    },
+    {
+      "icon_id": "24879605",
+      "name": "minus-filled",
+      "font_class": "minus-filled",
+      "unicode": "e67d",
+      "unicode_decimal": 59005
+    },
+    {
+      "icon_id": "24879606",
+      "name": "micoff",
+      "font_class": "micoff",
+      "unicode": "e67e",
+      "unicode_decimal": 59006
+    },
+    {
+      "icon_id": "24879588",
+      "name": "closeempty",
+      "font_class": "closeempty",
+      "unicode": "e66c",
+      "unicode_decimal": 58988
+    },
+    {
+      "icon_id": "24879589",
+      "name": "clear",
+      "font_class": "clear",
+      "unicode": "e66d",
+      "unicode_decimal": 58989
+    },
+    {
+      "icon_id": "24879590",
+      "name": "navigate",
+      "font_class": "navigate",
+      "unicode": "e66e",
+      "unicode_decimal": 58990
+    },
+    {
+      "icon_id": "24879591",
+      "name": "minus",
+      "font_class": "minus",
+      "unicode": "e66f",
+      "unicode_decimal": 58991
+    },
+    {
+      "icon_id": "24879592",
+      "name": "image",
+      "font_class": "image",
+      "unicode": "e670",
+      "unicode_decimal": 58992
+    },
+    {
+      "icon_id": "24879593",
+      "name": "mic",
+      "font_class": "mic",
+      "unicode": "e671",
+      "unicode_decimal": 58993
+    },
+    {
+      "icon_id": "24879594",
+      "name": "paperplane",
+      "font_class": "paperplane",
+      "unicode": "e672",
+      "unicode_decimal": 58994
+    },
+    {
+      "icon_id": "24879595",
+      "name": "close",
+      "font_class": "close",
+      "unicode": "e673",
+      "unicode_decimal": 58995
+    },
+    {
+      "icon_id": "24879596",
+      "name": "help-filled",
+      "font_class": "help-filled",
+      "unicode": "e674",
+      "unicode_decimal": 58996
+    },
+    {
+      "icon_id": "24879597",
+      "name": "plus-filled",
+      "font_class": "paperplane-filled",
+      "unicode": "e675",
+      "unicode_decimal": 58997
+    },
+    {
+      "icon_id": "24879598",
+      "name": "plus",
+      "font_class": "plus",
+      "unicode": "e676",
+      "unicode_decimal": 58998
+    },
+    {
+      "icon_id": "24879599",
+      "name": "mic-filled",
+      "font_class": "mic-filled",
+      "unicode": "e677",
+      "unicode_decimal": 58999
+    },
+    {
+      "icon_id": "24879600",
+      "name": "image-filled",
+      "font_class": "image-filled",
+      "unicode": "e678",
+      "unicode_decimal": 59000
+    },
+    {
+      "icon_id": "24855900",
+      "name": "locked-filled",
+      "font_class": "locked-filled",
+      "unicode": "e668",
+      "unicode_decimal": 58984
+    },
+    {
+      "icon_id": "24855901",
+      "name": "info",
+      "font_class": "info",
+      "unicode": "e669",
+      "unicode_decimal": 58985
+    },
+    {
+      "icon_id": "24855903",
+      "name": "locked",
+      "font_class": "locked",
+      "unicode": "e66b",
+      "unicode_decimal": 58987
+    },
+    {
+      "icon_id": "24855884",
+      "name": "camera-filled",
+      "font_class": "camera-filled",
+      "unicode": "e658",
+      "unicode_decimal": 58968
+    },
+    {
+      "icon_id": "24855885",
+      "name": "chat-filled",
+      "font_class": "chat-filled",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
+    {
+      "icon_id": "24855886",
+      "name": "camera",
+      "font_class": "camera",
+      "unicode": "e65a",
+      "unicode_decimal": 58970
+    },
+    {
+      "icon_id": "24855887",
+      "name": "circle",
+      "font_class": "circle",
+      "unicode": "e65b",
+      "unicode_decimal": 58971
+    },
+    {
+      "icon_id": "24855888",
+      "name": "checkmarkempty",
+      "font_class": "checkmarkempty",
+      "unicode": "e65c",
+      "unicode_decimal": 58972
+    },
+    {
+      "icon_id": "24855889",
+      "name": "chat",
+      "font_class": "chat",
+      "unicode": "e65d",
+      "unicode_decimal": 58973
+    },
+    {
+      "icon_id": "24855890",
+      "name": "circle-filled",
+      "font_class": "circle-filled",
+      "unicode": "e65e",
+      "unicode_decimal": 58974
+    },
+    {
+      "icon_id": "24855891",
+      "name": "flag",
+      "font_class": "flag",
+      "unicode": "e65f",
+      "unicode_decimal": 58975
+    },
+    {
+      "icon_id": "24855892",
+      "name": "flag-filled",
+      "font_class": "flag-filled",
+      "unicode": "e660",
+      "unicode_decimal": 58976
+    },
+    {
+      "icon_id": "24855893",
+      "name": "gear-filled",
+      "font_class": "gear-filled",
+      "unicode": "e661",
+      "unicode_decimal": 58977
+    },
+    {
+      "icon_id": "24855894",
+      "name": "home",
+      "font_class": "home",
+      "unicode": "e662",
+      "unicode_decimal": 58978
+    },
+    {
+      "icon_id": "24855895",
+      "name": "home-filled",
+      "font_class": "home-filled",
+      "unicode": "e663",
+      "unicode_decimal": 58979
+    },
+    {
+      "icon_id": "24855896",
+      "name": "gear",
+      "font_class": "gear",
+      "unicode": "e664",
+      "unicode_decimal": 58980
+    },
+    {
+      "icon_id": "24855897",
+      "name": "smallcircle-filled",
+      "font_class": "smallcircle-filled",
+      "unicode": "e665",
+      "unicode_decimal": 58981
+    },
+    {
+      "icon_id": "24855898",
+      "name": "map-filled",
+      "font_class": "map-filled",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
+    {
+      "icon_id": "24855899",
+      "name": "map",
+      "font_class": "map",
+      "unicode": "e667",
+      "unicode_decimal": 58983
+    },
+    {
+      "icon_id": "24855825",
+      "name": "refresh-filled",
+      "font_class": "refresh-filled",
+      "unicode": "e656",
+      "unicode_decimal": 58966
+    },
+    {
+      "icon_id": "24855826",
+      "name": "refresh",
+      "font_class": "refresh",
+      "unicode": "e657",
+      "unicode_decimal": 58967
+    },
+    {
+      "icon_id": "24855808",
+      "name": "cloud-upload",
+      "font_class": "cloud-upload",
+      "unicode": "e645",
+      "unicode_decimal": 58949
+    },
+    {
+      "icon_id": "24855809",
+      "name": "cloud-download-filled",
+      "font_class": "cloud-download-filled",
+      "unicode": "e646",
+      "unicode_decimal": 58950
+    },
+    {
+      "icon_id": "24855810",
+      "name": "cloud-download",
+      "font_class": "cloud-download",
+      "unicode": "e647",
+      "unicode_decimal": 58951
+    },
+    {
+      "icon_id": "24855811",
+      "name": "cloud-upload-filled",
+      "font_class": "cloud-upload-filled",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "24855813",
+      "name": "redo",
+      "font_class": "redo",
+      "unicode": "e64a",
+      "unicode_decimal": 58954
+    },
+    {
+      "icon_id": "24855814",
+      "name": "images-filled",
+      "font_class": "images-filled",
+      "unicode": "e64b",
+      "unicode_decimal": 58955
+    },
+    {
+      "icon_id": "24855815",
+      "name": "undo-filled",
+      "font_class": "undo-filled",
+      "unicode": "e64c",
+      "unicode_decimal": 58956
+    },
+    {
+      "icon_id": "24855816",
+      "name": "more",
+      "font_class": "more",
+      "unicode": "e64d",
+      "unicode_decimal": 58957
+    },
+    {
+      "icon_id": "24855817",
+      "name": "more-filled",
+      "font_class": "more-filled",
+      "unicode": "e64e",
+      "unicode_decimal": 58958
+    },
+    {
+      "icon_id": "24855818",
+      "name": "undo",
+      "font_class": "undo",
+      "unicode": "e64f",
+      "unicode_decimal": 58959
+    },
+    {
+      "icon_id": "24855819",
+      "name": "images",
+      "font_class": "images",
+      "unicode": "e650",
+      "unicode_decimal": 58960
+    },
+    {
+      "icon_id": "24855821",
+      "name": "paperclip",
+      "font_class": "paperclip",
+      "unicode": "e652",
+      "unicode_decimal": 58962
+    },
+    {
+      "icon_id": "24855822",
+      "name": "settings",
+      "font_class": "settings",
+      "unicode": "e653",
+      "unicode_decimal": 58963
+    },
+    {
+      "icon_id": "24855823",
+      "name": "search",
+      "font_class": "search",
+      "unicode": "e654",
+      "unicode_decimal": 58964
+    },
+    {
+      "icon_id": "24855824",
+      "name": "redo-filled",
+      "font_class": "redo-filled",
+      "unicode": "e655",
+      "unicode_decimal": 58965
+    },
+    {
+      "icon_id": "24841702",
+      "name": "list",
+      "font_class": "list",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
+    {
+      "icon_id": "24841489",
+      "name": "mail-open-filled",
+      "font_class": "mail-open-filled",
+      "unicode": "e63a",
+      "unicode_decimal": 58938
+    },
+    {
+      "icon_id": "24841491",
+      "name": "hand-thumbsdown-filled",
+      "font_class": "hand-down-filled",
+      "unicode": "e63c",
+      "unicode_decimal": 58940
+    },
+    {
+      "icon_id": "24841492",
+      "name": "hand-thumbsdown",
+      "font_class": "hand-down",
+      "unicode": "e63d",
+      "unicode_decimal": 58941
+    },
+    {
+      "icon_id": "24841493",
+      "name": "hand-thumbsup-filled",
+      "font_class": "hand-up-filled",
+      "unicode": "e63e",
+      "unicode_decimal": 58942
+    },
+    {
+      "icon_id": "24841494",
+      "name": "hand-thumbsup",
+      "font_class": "hand-up",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    },
+    {
+      "icon_id": "24841496",
+      "name": "heart-filled",
+      "font_class": "heart-filled",
+      "unicode": "e641",
+      "unicode_decimal": 58945
+    },
+    {
+      "icon_id": "24841498",
+      "name": "mail-open",
+      "font_class": "mail-open",
+      "unicode": "e643",
+      "unicode_decimal": 58947
+    },
+    {
+      "icon_id": "24841488",
+      "name": "heart",
+      "font_class": "heart",
+      "unicode": "e639",
+      "unicode_decimal": 58937
+    },
+    {
+      "icon_id": "24839963",
+      "name": "loop",
+      "font_class": "loop",
+      "unicode": "e633",
+      "unicode_decimal": 58931
+    },
+    {
+      "icon_id": "24839866",
+      "name": "pulldown",
+      "font_class": "pulldown",
+      "unicode": "e632",
+      "unicode_decimal": 58930
+    },
+    {
+      "icon_id": "24813798",
+      "name": "scan",
+      "font_class": "scan",
+      "unicode": "e62a",
+      "unicode_decimal": 58922
+    },
+    {
+      "icon_id": "24813786",
+      "name": "bars",
+      "font_class": "bars",
+      "unicode": "e627",
+      "unicode_decimal": 58919
+    },
+    {
+      "icon_id": "24813788",
+      "name": "cart-filled",
+      "font_class": "cart-filled",
+      "unicode": "e629",
+      "unicode_decimal": 58921
+    },
+    {
+      "icon_id": "24813790",
+      "name": "checkbox",
+      "font_class": "checkbox",
+      "unicode": "e62b",
+      "unicode_decimal": 58923
+    },
+    {
+      "icon_id": "24813791",
+      "name": "checkbox-filled",
+      "font_class": "checkbox-filled",
+      "unicode": "e62c",
+      "unicode_decimal": 58924
+    },
+    {
+      "icon_id": "24813794",
+      "name": "shop",
+      "font_class": "shop",
+      "unicode": "e62f",
+      "unicode_decimal": 58927
+    },
+    {
+      "icon_id": "24813795",
+      "name": "headphones",
+      "font_class": "headphones",
+      "unicode": "e630",
+      "unicode_decimal": 58928
+    },
+    {
+      "icon_id": "24813796",
+      "name": "cart",
+      "font_class": "cart",
+      "unicode": "e631",
+      "unicode_decimal": 58929
+    }
+  ]
+}
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
new file mode 100644
index 0000000..86e7444
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -0,0 +1,96 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<!-- #endif -->
+	<!-- #ifndef APP-NVUE -->
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
+	<!-- #endif -->
+</template>
+
+<script>
+	import icons from './icons.js';
+	const getVal = (val) => {
+		const reg = /^[0-9]*$/g
+		return (typeof val === 'number' ||　reg.test(val) )? val + 'px' : val;
+	} 
+	// #ifdef APP-NVUE
+	var domModule = weex.requireModule('dom');
+	import iconUrl from './uniicons.ttf'
+	domModule.addRule('fontFace', {
+		'fontFamily': "uniicons",
+		'src': "url('"+iconUrl+"')"
+	});
+	// #endif
+
+	/**
+	 * Icons 图标
+	 * @description 用于展示 icons 图标
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+	 * @property {Number} size 图标大小
+	 * @property {String} type 图标图案，参考示例
+	 * @property {String} color 图标颜色
+	 * @property {String} customPrefix 自定义图标
+	 * @event {Function} click 点击 Icon 触发事件
+	 */
+	export default {
+		name: 'UniIcons',
+		emits:['click'],
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: [Number, String],
+				default: 16
+			},
+			customPrefix:{
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				icons: icons.glyphs
+			}
+		},
+		computed:{
+			unicode(){
+				let code = this.icons.find(v=>v.font_class === this.type)
+				if(code){
+					return unescape(`%u${code.unicode}`)
+				}
+				return ''
+			},
+			iconSize(){
+				return getVal(this.size)
+			}
+		},
+		methods: {
+			_onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	/* #ifndef APP-NVUE */
+	@import './uniicons.css';
+	@font-face {
+		font-family: uniicons;
+		src: url('./uniicons.ttf') format('truetype');
+	}
+
+	/* #endif */
+	.uni-icons {
+		font-family: uniicons;
+		text-decoration: none;
+		text-align: center;
+	}
+
+</style>
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.css b/uni_modules/uni-icons/components/uni-icons/uniicons.css
new file mode 100644
index 0000000..2f56eab
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons.css
@@ -0,0 +1,663 @@
+.uniui-color:before {
+  content: "\e6cf";
+}
+
+.uniui-wallet:before {
+  content: "\e6b1";
+}
+
+.uniui-settings-filled:before {
+  content: "\e6ce";
+}
+
+.uniui-auth-filled:before {
+  content: "\e6cc";
+}
+
+.uniui-shop-filled:before {
+  content: "\e6cd";
+}
+
+.uniui-staff-filled:before {
+  content: "\e6cb";
+}
+
+.uniui-vip-filled:before {
+  content: "\e6c6";
+}
+
+.uniui-plus-filled:before {
+  content: "\e6c7";
+}
+
+.uniui-folder-add-filled:before {
+  content: "\e6c8";
+}
+
+.uniui-color-filled:before {
+  content: "\e6c9";
+}
+
+.uniui-tune-filled:before {
+  content: "\e6ca";
+}
+
+.uniui-calendar-filled:before {
+  content: "\e6c0";
+}
+
+.uniui-notification-filled:before {
+  content: "\e6c1";
+}
+
+.uniui-wallet-filled:before {
+  content: "\e6c2";
+}
+
+.uniui-medal-filled:before {
+  content: "\e6c3";
+}
+
+.uniui-gift-filled:before {
+  content: "\e6c4";
+}
+
+.uniui-fire-filled:before {
+  content: "\e6c5";
+}
+
+.uniui-refreshempty:before {
+  content: "\e6bf";
+}
+
+.uniui-location-filled:before {
+  content: "\e6af";
+}
+
+.uniui-person-filled:before {
+  content: "\e69d";
+}
+
+.uniui-personadd-filled:before {
+  content: "\e698";
+}
+
+.uniui-back:before {
+  content: "\e6b9";
+}
+
+.uniui-forward:before {
+  content: "\e6ba";
+}
+
+.uniui-arrow-right:before {
+  content: "\e6bb";
+}
+
+.uniui-arrowthinright:before {
+  content: "\e6bb";
+}
+
+.uniui-arrow-left:before {
+  content: "\e6bc";
+}
+
+.uniui-arrowthinleft:before {
+  content: "\e6bc";
+}
+
+.uniui-arrow-up:before {
+  content: "\e6bd";
+}
+
+.uniui-arrowthinup:before {
+  content: "\e6bd";
+}
+
+.uniui-arrow-down:before {
+  content: "\e6be";
+}
+
+.uniui-arrowthindown:before {
+  content: "\e6be";
+}
+
+.uniui-bottom:before {
+  content: "\e6b8";
+}
+
+.uniui-arrowdown:before {
+  content: "\e6b8";
+}
+
+.uniui-right:before {
+  content: "\e6b5";
+}
+
+.uniui-arrowright:before {
+  content: "\e6b5";
+}
+
+.uniui-top:before {
+  content: "\e6b6";
+}
+
+.uniui-arrowup:before {
+  content: "\e6b6";
+}
+
+.uniui-left:before {
+  content: "\e6b7";
+}
+
+.uniui-arrowleft:before {
+  content: "\e6b7";
+}
+
+.uniui-eye:before {
+  content: "\e651";
+}
+
+.uniui-eye-filled:before {
+  content: "\e66a";
+}
+
+.uniui-eye-slash:before {
+  content: "\e6b3";
+}
+
+.uniui-eye-slash-filled:before {
+  content: "\e6b4";
+}
+
+.uniui-info-filled:before {
+  content: "\e649";
+}
+
+.uniui-reload:before {
+  content: "\e6b2";
+}
+
+.uniui-micoff-filled:before {
+  content: "\e6b0";
+}
+
+.uniui-map-pin-ellipse:before {
+  content: "\e6ac";
+}
+
+.uniui-map-pin:before {
+  content: "\e6ad";
+}
+
+.uniui-location:before {
+  content: "\e6ae";
+}
+
+.uniui-starhalf:before {
+  content: "\e683";
+}
+
+.uniui-star:before {
+  content: "\e688";
+}
+
+.uniui-star-filled:before {
+  content: "\e68f";
+}
+
+.uniui-calendar:before {
+  content: "\e6a0";
+}
+
+.uniui-fire:before {
+  content: "\e6a1";
+}
+
+.uniui-medal:before {
+  content: "\e6a2";
+}
+
+.uniui-font:before {
+  content: "\e6a3";
+}
+
+.uniui-gift:before {
+  content: "\e6a4";
+}
+
+.uniui-link:before {
+  content: "\e6a5";
+}
+
+.uniui-notification:before {
+  content: "\e6a6";
+}
+
+.uniui-staff:before {
+  content: "\e6a7";
+}
+
+.uniui-vip:before {
+  content: "\e6a8";
+}
+
+.uniui-folder-add:before {
+  content: "\e6a9";
+}
+
+.uniui-tune:before {
+  content: "\e6aa";
+}
+
+.uniui-auth:before {
+  content: "\e6ab";
+}
+
+.uniui-person:before {
+  content: "\e699";
+}
+
+.uniui-email-filled:before {
+  content: "\e69a";
+}
+
+.uniui-phone-filled:before {
+  content: "\e69b";
+}
+
+.uniui-phone:before {
+  content: "\e69c";
+}
+
+.uniui-email:before {
+  content: "\e69e";
+}
+
+.uniui-personadd:before {
+  content: "\e69f";
+}
+
+.uniui-chatboxes-filled:before {
+  content: "\e692";
+}
+
+.uniui-contact:before {
+  content: "\e693";
+}
+
+.uniui-chatbubble-filled:before {
+  content: "\e694";
+}
+
+.uniui-contact-filled:before {
+  content: "\e695";
+}
+
+.uniui-chatboxes:before {
+  content: "\e696";
+}
+
+.uniui-chatbubble:before {
+  content: "\e697";
+}
+
+.uniui-upload-filled:before {
+  content: "\e68e";
+}
+
+.uniui-upload:before {
+  content: "\e690";
+}
+
+.uniui-weixin:before {
+  content: "\e691";
+}
+
+.uniui-compose:before {
+  content: "\e67f";
+}
+
+.uniui-qq:before {
+  content: "\e680";
+}
+
+.uniui-download-filled:before {
+  content: "\e681";
+}
+
+.uniui-pyq:before {
+  content: "\e682";
+}
+
+.uniui-sound:before {
+  content: "\e684";
+}
+
+.uniui-trash-filled:before {
+  content: "\e685";
+}
+
+.uniui-sound-filled:before {
+  content: "\e686";
+}
+
+.uniui-trash:before {
+  content: "\e687";
+}
+
+.uniui-videocam-filled:before {
+  content: "\e689";
+}
+
+.uniui-spinner-cycle:before {
+  content: "\e68a";
+}
+
+.uniui-weibo:before {
+  content: "\e68b";
+}
+
+.uniui-videocam:before {
+  content: "\e68c";
+}
+
+.uniui-download:before {
+  content: "\e68d";
+}
+
+.uniui-help:before {
+  content: "\e679";
+}
+
+.uniui-navigate-filled:before {
+  content: "\e67a";
+}
+
+.uniui-plusempty:before {
+  content: "\e67b";
+}
+
+.uniui-smallcircle:before {
+  content: "\e67c";
+}
+
+.uniui-minus-filled:before {
+  content: "\e67d";
+}
+
+.uniui-micoff:before {
+  content: "\e67e";
+}
+
+.uniui-closeempty:before {
+  content: "\e66c";
+}
+
+.uniui-clear:before {
+  content: "\e66d";
+}
+
+.uniui-navigate:before {
+  content: "\e66e";
+}
+
+.uniui-minus:before {
+  content: "\e66f";
+}
+
+.uniui-image:before {
+  content: "\e670";
+}
+
+.uniui-mic:before {
+  content: "\e671";
+}
+
+.uniui-paperplane:before {
+  content: "\e672";
+}
+
+.uniui-close:before {
+  content: "\e673";
+}
+
+.uniui-help-filled:before {
+  content: "\e674";
+}
+
+.uniui-paperplane-filled:before {
+  content: "\e675";
+}
+
+.uniui-plus:before {
+  content: "\e676";
+}
+
+.uniui-mic-filled:before {
+  content: "\e677";
+}
+
+.uniui-image-filled:before {
+  content: "\e678";
+}
+
+.uniui-locked-filled:before {
+  content: "\e668";
+}
+
+.uniui-info:before {
+  content: "\e669";
+}
+
+.uniui-locked:before {
+  content: "\e66b";
+}
+
+.uniui-camera-filled:before {
+  content: "\e658";
+}
+
+.uniui-chat-filled:before {
+  content: "\e659";
+}
+
+.uniui-camera:before {
+  content: "\e65a";
+}
+
+.uniui-circle:before {
+  content: "\e65b";
+}
+
+.uniui-checkmarkempty:before {
+  content: "\e65c";
+}
+
+.uniui-chat:before {
+  content: "\e65d";
+}
+
+.uniui-circle-filled:before {
+  content: "\e65e";
+}
+
+.uniui-flag:before {
+  content: "\e65f";
+}
+
+.uniui-flag-filled:before {
+  content: "\e660";
+}
+
+.uniui-gear-filled:before {
+  content: "\e661";
+}
+
+.uniui-home:before {
+  content: "\e662";
+}
+
+.uniui-home-filled:before {
+  content: "\e663";
+}
+
+.uniui-gear:before {
+  content: "\e664";
+}
+
+.uniui-smallcircle-filled:before {
+  content: "\e665";
+}
+
+.uniui-map-filled:before {
+  content: "\e666";
+}
+
+.uniui-map:before {
+  content: "\e667";
+}
+
+.uniui-refresh-filled:before {
+  content: "\e656";
+}
+
+.uniui-refresh:before {
+  content: "\e657";
+}
+
+.uniui-cloud-upload:before {
+  content: "\e645";
+}
+
+.uniui-cloud-download-filled:before {
+  content: "\e646";
+}
+
+.uniui-cloud-download:before {
+  content: "\e647";
+}
+
+.uniui-cloud-upload-filled:before {
+  content: "\e648";
+}
+
+.uniui-redo:before {
+  content: "\e64a";
+}
+
+.uniui-images-filled:before {
+  content: "\e64b";
+}
+
+.uniui-undo-filled:before {
+  content: "\e64c";
+}
+
+.uniui-more:before {
+  content: "\e64d";
+}
+
+.uniui-more-filled:before {
+  content: "\e64e";
+}
+
+.uniui-undo:before {
+  content: "\e64f";
+}
+
+.uniui-images:before {
+  content: "\e650";
+}
+
+.uniui-paperclip:before {
+  content: "\e652";
+}
+
+.uniui-settings:before {
+  content: "\e653";
+}
+
+.uniui-search:before {
+  content: "\e654";
+}
+
+.uniui-redo-filled:before {
+  content: "\e655";
+}
+
+.uniui-list:before {
+  content: "\e644";
+}
+
+.uniui-mail-open-filled:before {
+  content: "\e63a";
+}
+
+.uniui-hand-down-filled:before {
+  content: "\e63c";
+}
+
+.uniui-hand-down:before {
+  content: "\e63d";
+}
+
+.uniui-hand-up-filled:before {
+  content: "\e63e";
+}
+
+.uniui-hand-up:before {
+  content: "\e63f";
+}
+
+.uniui-heart-filled:before {
+  content: "\e641";
+}
+
+.uniui-mail-open:before {
+  content: "\e643";
+}
+
+.uniui-heart:before {
+  content: "\e639";
+}
+
+.uniui-loop:before {
+  content: "\e633";
+}
+
+.uniui-pulldown:before {
+  content: "\e632";
+}
+
+.uniui-scan:before {
+  content: "\e62a";
+}
+
+.uniui-bars:before {
+  content: "\e627";
+}
+
+.uniui-cart-filled:before {
+  content: "\e629";
+}
+
+.uniui-checkbox:before {
+  content: "\e62b";
+}
+
+.uniui-checkbox-filled:before {
+  content: "\e62c";
+}
+
+.uniui-shop:before {
+  content: "\e62f";
+}
+
+.uniui-headphones:before {
+  content: "\e630";
+}
+
+.uniui-cart:before {
+  content: "\e631";
+}
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.ttf b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
new file mode 100644
index 0000000..835f33b
Binary files /dev/null and b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf differ
diff --git a/uni_modules/uni-icons/package.json b/uni_modules/uni-icons/package.json
new file mode 100644
index 0000000..d1c4e77
--- /dev/null
+++ b/uni_modules/uni-icons/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-icons",
+  "displayName": "uni-icons 图标",
+  "version": "1.3.5",
+  "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "icon",
+    "图标"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.2.14"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-icons/readme.md b/uni_modules/uni-icons/readme.md
new file mode 100644
index 0000000..86234ba
--- /dev/null
+++ b/uni_modules/uni-icons/readme.md
@@ -0,0 +1,8 @@
+## Icons 图标
+> **组件名：uni-icons**
+> 代码块： `uIcons`
+
+用于展示 icons 图标 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-icons)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
diff --git a/uni_modules/uni-notice-bar/changelog.md b/uni_modules/uni-notice-bar/changelog.md
new file mode 100644
index 0000000..d526811
--- /dev/null
+++ b/uni_modules/uni-notice-bar/changelog.md
@@ -0,0 +1,18 @@
+## 1.2.1（2022-09-05）
+- 新增 属性 fontSize，可修改文字大小。
+## 1.2.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-notice-bar](https://uniapp.dcloud.io/component/uniui/uni-notice-bar)
+## 1.1.1（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.9（2021-05-12）
+- 新增 组件示例地址
+## 1.0.8（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 1.0.7（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.6（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue b/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue
new file mode 100644
index 0000000..ff21aa5
--- /dev/null
+++ b/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue
@@ -0,0 +1,426 @@
+<template>
+	<view v-if="show" class="uni-noticebar" :style="{ backgroundColor }" @click="onClick">
+		<uni-icons v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon" type="sound"
+			:color="color" :size="fontSize * 1.5" />
+		<view ref="textBox" class="uni-noticebar__content-wrapper"
+			:class="{
+				'uni-noticebar__content-wrapper--scrollable': scrollable,
+				'uni-noticebar__content-wrapper--single': !scrollable && (single || moreText)
+			}"
+			:style="{ height: scrollable ? fontSize * 1.5 + 'px' : 'auto' }"
+		>
+			<view :id="elIdBox" class="uni-noticebar__content"
+				:class="{
+					'uni-noticebar__content--scrollable': scrollable,
+					'uni-noticebar__content--single': !scrollable && (single || moreText)
+				}"
+			>
+				<text :id="elId" ref="animationEle" class="uni-noticebar__content-text" 
+					:class="{
+						'uni-noticebar__content-text--scrollable': scrollable,
+						'uni-noticebar__content-text--single': !scrollable && (single || showGetMore)
+					}" 
+					:style="{
+						color: color,
+						fontSize: fontSize + 'px',
+						lineHeight: fontSize * 1.5 + 'px',
+						width: wrapWidth + 'px',
+						'animationDuration': animationDuration,
+						'-webkit-animationDuration': animationDuration,
+						animationPlayState: webviewHide ? 'paused' : animationPlayState,
+						'-webkit-animationPlayState': webviewHide ? 'paused' : animationPlayState,
+						animationDelay: animationDelay,
+						'-webkit-animationDelay': animationDelay
+					}"
+				>{{text}}</text>
+			</view>
+		</view>
+		<view v-if="isShowGetMore" class="uni-noticebar__more uni-cursor-point"
+			@click="clickMore">
+			<text v-if="moreText.length > 0" :style="{ color: moreColor, fontSize: fontSize + 'px' }">{{ moreText }}</text>
+			<uni-icons v-else type="right" :color="moreColor" :size="fontSize * 1.1" />
+		</view>
+		<view class="uni-noticebar-close uni-cursor-point" v-if="isShowClose">
+			<uni-icons type="closeempty" :color="color" :size="fontSize * 1.1" @click="close" />
+		</view>
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const dom = weex.requireModule('dom');
+	const animation = weex.requireModule('animation');
+	// #endif
+
+	/**
+	 * NoticeBar 自定义导航栏
+	 * @description 通告栏组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=30
+	 * @property {Number} speed 文字滚动的速度，默认100px/秒
+	 * @property {String} text 显示文字
+	 * @property {String} backgroundColor 背景颜色
+	 * @property {String} color 文字颜色
+	 * @property {String} moreColor 查看更多文字的颜色
+	 * @property {String} moreText 设置“查看更多”的文本
+	 * @property {Boolean} single = [true|false] 是否单行
+	 * @property {Boolean} scrollable = [true|false] 是否滚动，为true时，NoticeBar为单行
+	 * @property {Boolean} showIcon = [true|false] 是否显示左侧喇叭图标
+	 * @property {Boolean} showClose = [true|false] 是否显示左侧关闭按钮
+	 * @property {Boolean} showGetMore = [true|false] 是否显示右侧查看更多图标，为true时，NoticeBar为单行
+	 * @event {Function} click 点击 NoticeBar 触发事件
+	 * @event {Function} close 关闭 NoticeBar 触发事件
+	 * @event {Function} getmore 点击”查看更多“时触发事件
+	 */
+
+	export default {
+		name: 'UniNoticeBar',
+		emits: ['click', 'getmore', 'close'],
+		props: {
+			text: {
+				type: String,
+				default: ''
+			},
+			moreText: {
+				type: String,
+				default: ''
+			},
+			backgroundColor: {
+				type: String,
+				default: '#FFF9EA'
+			},
+			speed: {
+				// 默认1s滚动100px
+				type: Number,
+				default: 35
+			},
+			color: {
+				type: String,
+				default: '#FF9A43'
+			},
+			fontSize: {
+				type: Number,
+				default: 14
+			},
+			moreColor: {
+				type: String,
+				default: '#FF9A43'
+			},
+			single: {
+				// 是否单行
+				type: [Boolean, String],
+				default: false
+			},
+			scrollable: {
+				// 是否滚动，添加后控制单行效果取消
+				type: [Boolean, String],
+				default: false
+			},
+			showIcon: {
+				// 是否显示左侧icon
+				type: [Boolean, String],
+				default: false
+			},
+			showGetMore: {
+				// 是否显示右侧查看更多
+				type: [Boolean, String],
+				default: false
+			},
+			showClose: {
+				// 是否显示左侧关闭按钮
+				type: [Boolean, String],
+				default: false
+			}
+		},
+		data() {
+			const elId = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
+			const elIdBox = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
+			return {
+				textWidth: 0,
+				boxWidth: 0,
+				wrapWidth: '',
+				webviewHide: false,
+				// #ifdef APP-NVUE
+				stopAnimation: false,
+				// #endif
+				elId: elId,
+				elIdBox: elIdBox,
+				show: true,
+				animationDuration: 'none',
+				animationPlayState: 'paused',
+				animationDelay: '0s'
+			}
+		},
+		computed: {
+			isShowGetMore() {
+				return this.showGetMore === true || this.showGetMore === 'true'
+			},
+			isShowClose() {
+				return (this.showClose === true || this.showClose === 'true') 
+					&& (this.showGetMore === false || this.showGetMore === 'false')
+			}
+		},
+		mounted() {
+			// #ifdef APP-PLUS
+			var pages = getCurrentPages();
+			var page = pages[pages.length - 1];
+			var currentWebview = page.$getAppWebview();
+			currentWebview.addEventListener('hide', () => {
+				this.webviewHide = true
+			})
+			currentWebview.addEventListener('show', () => {
+				this.webviewHide = false
+			})
+			// #endif
+			this.$nextTick(() => {
+				this.initSize()
+			})
+		},
+		// #ifdef APP-NVUE
+		beforeDestroy() {
+			this.stopAnimation = true
+		},
+		// #endif
+		methods: {
+			initSize() {
+				if (this.scrollable) {
+					// #ifndef APP-NVUE
+					let query = [],
+						boxWidth = 0,
+						textWidth = 0;
+					let textQuery = new Promise((resolve, reject) => {
+						uni.createSelectorQuery()
+							// #ifndef MP-ALIPAY
+							.in(this)
+							// #endif
+							.select(`#${this.elId}`)
+							.boundingClientRect()
+							.exec(ret => {
+								this.textWidth = ret[0].width
+								resolve()
+							})
+					})
+					let boxQuery = new Promise((resolve, reject) => {
+						uni.createSelectorQuery()
+							// #ifndef MP-ALIPAY
+							.in(this)
+							// #endif
+							.select(`#${this.elIdBox}`)
+							.boundingClientRect()
+							.exec(ret => {
+								this.boxWidth = ret[0].width
+								resolve()
+							})
+					})
+					query.push(textQuery)
+					query.push(boxQuery)
+					Promise.all(query).then(() => {
+						this.animationDuration = `${this.textWidth / this.speed}s`
+						this.animationDelay = `-${this.boxWidth / this.speed}s`
+						setTimeout(() => {
+							this.animationPlayState = 'running'
+						}, 1000)
+					})
+					// #endif
+					// #ifdef APP-NVUE
+					dom.getComponentRect(this.$refs['animationEle'], (res) => {
+						let winWidth = uni.getSystemInfoSync().windowWidth
+						this.textWidth = res.size.width
+						animation.transition(this.$refs['animationEle'], {
+							styles: {
+								transform: `translateX(-${winWidth}px)`
+							},
+							duration: 0,
+							timingFunction: 'linear',
+							delay: 0
+						}, () => {
+							if (!this.stopAnimation) {
+								animation.transition(this.$refs['animationEle'], {
+									styles: {
+										transform: `translateX(-${this.textWidth}px)`
+									},
+									timingFunction: 'linear',
+									duration: (this.textWidth - winWidth) / this.speed * 1000,
+									delay: 1000
+								}, () => {
+									if (!this.stopAnimation) {
+										this.loopAnimation()
+									}
+								});
+							}
+						});
+					})
+					// #endif
+				}
+				// #ifdef APP-NVUE
+				if (!this.scrollable && (this.single || this.moreText)) {
+					dom.getComponentRect(this.$refs['textBox'], (res) => {
+						this.wrapWidth = res.size.width
+					})
+				}
+				// #endif
+			},
+			loopAnimation() {
+				// #ifdef APP-NVUE
+				animation.transition(this.$refs['animationEle'], {
+					styles: {
+						transform: `translateX(0px)`
+					},
+					duration: 0
+				}, () => {
+					if (!this.stopAnimation) {
+						animation.transition(this.$refs['animationEle'], {
+							styles: {
+								transform: `translateX(-${this.textWidth}px)`
+							},
+							duration: this.textWidth / this.speed * 1000,
+							timingFunction: 'linear',
+							delay: 0
+						}, () => {
+							if (!this.stopAnimation) {
+								this.loopAnimation()
+							}
+						});
+					}
+				});
+				// #endif
+			},
+			clickMore() {
+				this.$emit('getmore')
+			},
+			close() {
+				this.show = false;
+				this.$emit('close')
+			},
+			onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-noticebar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		width: 100%;
+		box-sizing: border-box;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding: 10px 12px;
+		margin-bottom: 10px;
+	}
+
+	.uni-cursor-point {
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-noticebar-close {
+		margin-left: 8px;
+		margin-right: 5px;
+	}
+
+	.uni-noticebar-icon {
+		margin-right: 5px;
+	}
+
+	.uni-noticebar__content-wrapper {
+		flex: 1;
+		flex-direction: column;
+		overflow: hidden;
+	}
+
+	.uni-noticebar__content-wrapper--single {
+		/* #ifndef APP-NVUE */
+		line-height: 18px;
+		/* #endif */
+	}
+
+	.uni-noticebar__content-wrapper--single,
+	.uni-noticebar__content-wrapper--scrollable {
+		flex-direction: row;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-noticebar__content-wrapper--scrollable {
+		position: relative;
+	}
+
+	/* #endif */
+
+	.uni-noticebar__content--scrollable {
+		/* #ifdef APP-NVUE */
+		flex: 0;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		flex: 1;
+		display: block;
+		overflow: hidden;
+		/* #endif */
+	}
+
+	.uni-noticebar__content--single {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex: none;
+		width: 100%;
+		justify-content: center;
+		/* #endif */
+	}
+
+	.uni-noticebar__content-text {
+		font-size: 14px;
+		line-height: 18px;
+		/* #ifndef APP-NVUE */
+		word-break: break-all;
+		/* #endif */
+	}
+
+	.uni-noticebar__content-text--single {
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		display: block;
+		width: 100%;
+		white-space: nowrap;
+		/* #endif */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.uni-noticebar__content-text--scrollable {
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		padding-left: 750rpx;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		position: absolute;
+		display: block;
+		height: 18px;
+		line-height: 18px;
+		white-space: nowrap;
+		padding-left: 100%;
+		animation: notice 10s 0s linear infinite both;
+		animation-play-state: paused;
+		/* #endif */
+	}
+
+	.uni-noticebar__more {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-items: center;
+		padding-left: 5px;
+	}
+
+	@keyframes notice {
+		100% {
+			transform: translate3d(-100%, 0, 0);
+		}
+	}
+</style>
diff --git a/uni_modules/uni-notice-bar/package.json b/uni_modules/uni-notice-bar/package.json
new file mode 100644
index 0000000..8d9b13c
--- /dev/null
+++ b/uni_modules/uni-notice-bar/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-notice-bar",
+  "displayName": "uni-notice-bar 通告栏",
+  "version": "1.2.1",
+  "description": "NoticeBar 通告栏组件，常用于展示公告信息，可设为滚动公告",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "通告栏",
+    "公告",
+    "跑马灯"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-notice-bar/readme.md b/uni_modules/uni-notice-bar/readme.md
new file mode 100644
index 0000000..fb2ede2
--- /dev/null
+++ b/uni_modules/uni-notice-bar/readme.md
@@ -0,0 +1,13 @@
+
+
+## NoticeBar 通告栏
+> **组件名：uni-notice-bar**
+> 代码块： `uNoticeBar`
+
+
+通告栏组件 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-notice-bar)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md
new file mode 100644
index 0000000..bc59f07
--- /dev/null
+++ b/uni_modules/uni-popup/changelog.md
@@ -0,0 +1,68 @@
+## 1.8.3（2023-04-17）
+- 修复 uni-popup 重复打开时的 bug
+## 1.8.2（2023-02-02）
+- uni-popup-dialog 组件新增 inputType 属性
+## 1.8.1（2022-12-01）
+- 修复 nvue 下 v-show 报错
+## 1.8.0（2022-11-29）
+- 优化 主题样式
+## 1.7.9（2022-04-02）
+- 修复 弹出层内部无法滚动的bug
+## 1.7.8（2022-03-28）
+- 修复 小程序中高度错误的bug
+## 1.7.7（2022-03-17）
+- 修复 快速调用open出现问题的Bug
+## 1.7.6（2022-02-14）
+- 修复 safeArea 属性不能设置为false的bug
+## 1.7.5（2022-01-19）
+- 修复 isMaskClick 失效的bug
+## 1.7.4（2022-01-19）
+- 新增 cancelText \ confirmText 属性 ，可自定义文本
+- 新增 maskBackgroundColor 属性 ，可以修改蒙版颜色
+- 优化 maskClick属性 更新为 isMaskClick ，解决微信小程序警告的问题
+## 1.7.3（2022-01-13）
+- 修复 设置 safeArea 属性不生效的bug
+## 1.7.2（2021-11-26）
+- 优化 组件示例
+## 1.7.1（2021-11-26）
+- 修复 vuedoc 文字错误
+## 1.7.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-popup](https://uniapp.dcloud.io/component/uniui/uni-popup)
+## 1.6.2（2021-08-24）
+- 新增 支持国际化
+## 1.6.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.6.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.5.0（2021-06-23）
+- 新增 mask-click 遮罩层点击事件
+## 1.4.5（2021-06-22）
+- 修复 nvue 平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.4（2021-06-18）
+- 修复 H5平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.3（2021-06-08）
+- 修复 错误的 watch 字段
+- 修复 safeArea 属性不生效的问题
+- 修复 点击内容，再点击遮罩无法关闭的Bug
+## 1.4.2（2021-05-12）
+- 新增 组件示例地址
+## 1.4.1（2021-04-29）
+- 修复 组件内放置 input 、textarea 组件，无法聚焦的问题
+## 1.4.0 （2021-04-29）
+- 新增 type 属性的 left\right 值，支持左右弹出
+- 新增 open(String:type) 方法参数 ，可以省略 type 属性 ，直接传入类型打开指定弹窗
+- 新增 backgroundColor 属性，可定义主窗口背景色,默认不显示背景色
+- 新增 safeArea 属性，是否适配底部安全区
+- 修复 App\h5\微信小程序底部安全区占位不对的Bug
+- 修复 App 端弹出等待的Bug
+- 优化 提升低配设备性能，优化动画卡顿问题
+- 优化 更简单的组件自定义方式
+## 1.2.9（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.2.8（2021-02-05）
+- 调整为uni_modules目录规范
+## 1.2.7（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持 PC 端
+- 新增 uni-popup-message 、uni-popup-dialog扩展组件支持 PC 端
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js b/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
new file mode 100644
index 0000000..6ef26a2
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    this.$once('hook:beforeDestroy', () => {
+      document.removeEventListener('keyup', listener)
+    })
+  },
+	render: () => {}
+}
+// #endif
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
new file mode 100644
index 0000000..74bc56a
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -0,0 +1,272 @@
+<template>
+	<view class="uni-popup-dialog">
+		<view class="uni-dialog-title">
+			<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{titleText}}</text>
+		</view>
+		<view v-if="mode === 'base'" class="uni-dialog-content">
+			<slot>
+				<text class="uni-dialog-content-text">{{content}}</text>
+			</slot>
+		</view>
+		<view v-else class="uni-dialog-content">
+			<slot>
+				<input class="uni-dialog-input" v-model="val" :type="inputType" :placeholder="placeholderText" :focus="focus" >
+			</slot>
+		</view>
+		<view class="uni-dialog-button-group">
+			<view class="uni-dialog-button" @click="closeDialog">
+				<text class="uni-dialog-button-text">{{closeText}}</text>
+			</view>
+			<view class="uni-dialog-button uni-border-left" @click="onOk">
+				<text class="uni-dialog-button-text uni-button-color">{{okText}}</text>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {	t } = initVueI18n(messages)
+	/**
+	 * PopUp 弹出层-对话框样式
+	 * @description 弹出层-对话框样式
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} value input 模式下的默认值
+	 * @property {String} placeholder input 模式下输入提示
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} mode = [base|input] 模式、
+	 * 	@value base 基础对话框
+	 * 	@value input 可输入对话框
+	 * @property {String} content 对话框内容
+	 * @property {Boolean} beforeClose 是否拦截取消事件
+	 * @event {Function} confirm 点击确认按钮触发
+	 * @event {Function} close 点击取消按钮触发
+	 */
+
+	export default {
+		name: "uniPopupDialog",
+		mixins: [popup],
+		emits:['confirm','close'],
+		props: {
+			inputType:{
+				type: String,
+				default: 'text'
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			placeholder: {
+				type: [String, Number],
+				default: ''
+			},
+			type: {
+				type: String,
+				default: 'error'
+			},
+			mode: {
+				type: String,
+				default: 'base'
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			content: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			},
+			cancelText:{
+				type: String,
+				default: ''
+			},
+			confirmText:{
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				dialogType: 'error',
+				focus: false,
+				val: ""
+			}
+		},
+		computed: {
+			okText() {
+				return this.confirmText || t("uni-popup.ok")
+			},
+			closeText() {
+				return this.cancelText || t("uni-popup.cancel")
+			},
+			placeholderText() {
+				return this.placeholder || t("uni-popup.placeholder")
+			},
+			titleText() {
+				return this.title || t("uni-popup.title")
+			}
+		},
+		watch: {
+			type(val) {
+				this.dialogType = val
+			},
+			mode(val) {
+				if (val === 'input') {
+					this.dialogType = 'info'
+				}
+			},
+			value(val) {
+				this.val = val
+			}
+		},
+		created() {
+			// 对话框遮罩不可点击
+			this.popup.disableMask()
+			// this.popup.closeMask()
+			if (this.mode === 'input') {
+				this.dialogType = 'info'
+				this.val = this.value
+			} else {
+				this.dialogType = this.type
+			}
+		},
+		methods: {
+			/**
+			 * 点击确认按钮
+			 */
+			onOk() {
+				if (this.mode === 'input'){
+					this.$emit('confirm', this.val)
+				}else{
+					this.$emit('confirm')
+				}
+				if(this.beforeClose) return
+				this.popup.close()
+			},
+			/**
+			 * 点击取消按钮
+			 */
+			closeDialog() {
+				this.$emit('close')
+				if(this.beforeClose) return
+				this.popup.close()
+			},
+			close(){
+				this.popup.close()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-popup-dialog {
+		width: 300px;
+		border-radius: 11px;
+		background-color: #fff;
+	}
+
+	.uni-dialog-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 25px;
+	}
+
+	.uni-dialog-title-text {
+		font-size: 16px;
+		font-weight: 500;
+	}
+
+	.uni-dialog-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		padding: 20px;
+	}
+
+	.uni-dialog-content-text {
+		font-size: 14px;
+		color: #6C6C6C;
+	}
+
+	.uni-dialog-button-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		border-top-color: #f5f5f5;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-dialog-button {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+
+		flex: 1;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 45px;
+	}
+
+	.uni-border-left {
+		border-left-color: #f0f0f0;
+		border-left-style: solid;
+		border-left-width: 1px;
+	}
+
+	.uni-dialog-button-text {
+		font-size: 16px;
+		color: #333;
+	}
+
+	.uni-button-color {
+		color: #007aff;
+	}
+
+	.uni-dialog-input {
+		flex: 1;
+		font-size: 14px;
+		border: 1px #eee solid;
+		height: 40px;
+		padding: 0 10px;
+		border-radius: 5px;
+		color: #555;
+	}
+
+	.uni-popup__success {
+		color: #4cd964;
+	}
+
+	.uni-popup__warn {
+		color: #f0ad4e;
+	}
+
+	.uni-popup__error {
+		color: #dd524d;
+	}
+
+	.uni-popup__info {
+		color: #909399;
+	}
+</style>
diff --git a/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
new file mode 100644
index 0000000..91370a8
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
@@ -0,0 +1,143 @@
+<template>
+	<view class="uni-popup-message">
+		<view class="uni-popup-message__box fixforpc-width" :class="'uni-popup__'+type">
+			<slot>
+				<text class="uni-popup-message-text" :class="'uni-popup__'+type+'-text'">{{message}}</text>
+			</slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	/**
+	 * PopUp 弹出层-消息提示
+	 * @description 弹出层-消息提示
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} message 消息提示文字
+	 * @property {String} duration 显示时间，设置为 0 则不会自动关闭
+	 */
+
+	export default {
+		name: 'uniPopupMessage',
+		mixins:[popup],
+		props: {
+			/**
+			 * 主题 success/warning/info/error	  默认 success
+			 */
+			type: {
+				type: String,
+				default: 'success'
+			},
+			/**
+			 * 消息文字
+			 */
+			message: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 显示时间，设置为 0 则不会自动关闭
+			 */
+			duration: {
+				type: Number,
+				default: 3000
+			},
+			maskShow:{
+				type:Boolean,
+				default:false
+			}
+		},
+		data() {
+			return {}
+		},
+		created() {
+			this.popup.maskShow = this.maskShow
+			this.popup.messageChild = this
+		},
+		methods: {
+			timerClose(){
+				if(this.duration === 0) return
+				clearTimeout(this.timer) 
+				this.timer = setTimeout(()=>{
+					this.popup.close()
+				},this.duration)
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-popup-message {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+	}
+
+	.uni-popup-message__box {
+		background-color: #e1f3d8;
+		padding: 10px 15px;
+		border-color: #eee;
+		border-style: solid;
+		border-width: 1px;
+		flex: 1;
+	}
+
+	@media screen and (min-width: 500px) {
+		.fixforpc-width {
+			margin-top: 20px;
+			border-radius: 4px;
+			flex: none;
+			min-width: 380px;
+			/* #ifndef APP-NVUE */
+			max-width: 50%;
+			/* #endif */
+			/* #ifdef APP-NVUE */
+			max-width: 500px;
+			/* #endif */
+		}
+	}
+
+	.uni-popup-message-text {
+		font-size: 14px;
+		padding: 0;
+	}
+
+	.uni-popup__success {
+		background-color: #e1f3d8;
+	}
+
+	.uni-popup__success-text {
+		color: #67C23A;
+	}
+
+	.uni-popup__warn {
+		background-color: #faecd8;
+	}
+
+	.uni-popup__warn-text {
+		color: #E6A23C;
+	}
+
+	.uni-popup__error {
+		background-color: #fde2e2;
+	}
+
+	.uni-popup__error-text {
+		color: #F56C6C;
+	}
+
+	.uni-popup__info {
+		background-color: #F2F6FC;
+	}
+
+	.uni-popup__info-text {
+		color: #909399;
+	}
+</style>
diff --git a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
new file mode 100644
index 0000000..5be7624
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
@@ -0,0 +1,187 @@
+<template>
+	<view class="uni-popup-share">
+		<view class="uni-share-title"><text class="uni-share-title-text">{{shareTitleText}}</text></view>
+		<view class="uni-share-content">
+			<view class="uni-share-content-box">
+				<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index" @click.stop="select(item,index)">
+					<image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
+					<text class="uni-share-text">{{item.text}}</text>
+				</view>
+
+			</view>
+		</view>
+		<view class="uni-share-button-box">
+			<button class="uni-share-button" @click="close">{{cancelText}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	export default {
+		name: 'UniPopupShare',
+		mixins:[popup],
+		emits:['select'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				bottomData: [{
+						text: '微信',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/c2b17470-50be-11eb-b680-7980c8a877b8.png',
+						name: 'wx'
+					},
+					{
+						text: '支付宝',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/d684ae40-50be-11eb-8ff1-d5dcf8779628.png',
+						name: 'wx'
+					},
+					{
+						text: 'QQ',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/e7a79520-50be-11eb-b997-9918a5dda011.png',
+						name: 'qq'
+					},
+					{
+						text: '新浪',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/0dacdbe0-50bf-11eb-8ff1-d5dcf8779628.png',
+						name: 'sina'
+					},
+					// {
+					// 	text: '百度',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/1ec6e920-50bf-11eb-8a36-ebb87efcf8c0.png',
+					// 	name: 'copy'
+					// },
+					// {
+					// 	text: '其他',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/2e0fdfe0-50bf-11eb-b997-9918a5dda011.png',
+					// 	name: 'more'
+					// }
+				]
+			}
+		},
+		created() {},
+		computed: {
+			cancelText() {
+				return t("uni-popup.cancel")
+			},
+		shareTitleText() {
+				return this.title || t("uni-popup.shareTitle")
+			}
+		},
+		methods: {
+			/**
+			 * 选择内容
+			 */
+			select(item, index) {
+				this.$emit('select', {
+					item,
+					index
+				})
+				this.close()
+
+			},
+			/**
+			 * 关闭窗口
+			 */
+			close() {
+				if(this.beforeClose) return
+				this.popup.close()
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-popup-share {
+		background-color: #fff;
+		border-top-left-radius: 11px;
+		border-top-right-radius: 11px;
+	}
+	.uni-share-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		height: 40px;
+	}
+	.uni-share-title-text {
+		font-size: 14px;
+		color: #666;
+	}
+	.uni-share-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 10px;
+	}
+
+	.uni-share-content-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: wrap;
+		width: 360px;
+	}
+
+	.uni-share-content-item {
+		width: 90px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		padding: 10px 0;
+		align-items: center;
+	}
+
+	.uni-share-content-item:active {
+		background-color: #f5f5f5;
+	}
+
+	.uni-share-image {
+		width: 30px;
+		height: 30px;
+	}
+
+	.uni-share-text {
+		margin-top: 10px;
+		font-size: 14px;
+		color: #3B4144;
+	}
+
+	.uni-share-button-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		padding: 10px 15px;
+	}
+
+	.uni-share-button {
+		flex: 1;
+		border-radius: 50px;
+		color: #666;
+		font-size: 16px;
+	}
+
+	.uni-share-button::after {
+		border-radius: 50px;
+	}
+</style>
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/en.json b/uni_modules/uni-popup/components/uni-popup/i18n/en.json
new file mode 100644
index 0000000..7f1bd06
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/en.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "cancel",
+	"uni-popup.ok": "ok",
+	"uni-popup.placeholder": "pleace enter",
+	"uni-popup.title": "Hint",
+	"uni-popup.shareTitle": "Share to"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/index.js b/uni_modules/uni-popup/components/uni-popup/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
new file mode 100644
index 0000000..5e3003c
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "确定",
+	"uni-popup.placeholder": "请输入",
+		"uni-popup.title": "提示",
+		"uni-popup.shareTitle": "分享到"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
new file mode 100644
index 0000000..13e39eb
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "確定",
+	"uni-popup.placeholder": "請輸入",
+	"uni-popup.title": "提示",
+	"uni-popup.shareTitle": "分享到"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/keypress.js b/uni_modules/uni-popup/components/uni-popup/keypress.js
new file mode 100644
index 0000000..62dda46
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    // this.$once('hook:beforeDestroy', () => {
+    //   document.removeEventListener('keyup', listener)
+    // })
+  },
+	render: () => {}
+}
+// #endif
diff --git a/uni_modules/uni-popup/components/uni-popup/popup.js b/uni_modules/uni-popup/components/uni-popup/popup.js
new file mode 100644
index 0000000..c4e5781
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/popup.js
@@ -0,0 +1,26 @@
+
+export default {
+	data() {
+		return {
+			
+		}
+	},
+	created(){
+		this.popup = this.getParent()
+	},
+	methods:{
+		/**
+		 * 获取父元素实例
+		 */
+		getParent(name = 'uniPopup') {
+			let parent = this.$parent;
+			let parentName = parent.$options.name;
+			while (parentName !== name) {
+				parent = parent.$parent;
+				if (!parent) return false
+				parentName = parent.$options.name;
+			}
+			return parent;
+		},
+	}
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
new file mode 100644
index 0000000..54afee2
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -0,0 +1,473 @@
+<template>
+	<view v-if="showPopup" class="uni-popup" :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']">
+		<view @touchstart="touchstart">
+			<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass"
+				:duration="duration" :show="showTrans" @click="onTap" />
+			<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration"
+				:show="showTrans" @click="onTap">
+				<view class="uni-popup__wrapper" :style="{ backgroundColor: bg }" :class="[popupstyle]" @click="clear">
+					<slot />
+				</view>
+			</uni-transition>
+		</view>
+		<!-- #ifdef H5 -->
+		<keypress v-if="maskShow" @esc="onTap" />
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import keypress from './keypress.js'
+	// #endif
+
+	/**
+	 * PopUp 弹出层
+	 * @description 弹出层组件，为了解决遮罩弹层的问题
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [top|center|bottom|left|right|message|dialog|share] 弹出方式
+	 * 	@value top 顶部弹出
+	 * 	@value center 中间弹出
+	 * 	@value bottom 底部弹出
+	 * 	@value left		左侧弹出
+	 * 	@value right  右侧弹出
+	 * 	@value message 消息提示
+	 * 	@value dialog 对话框
+	 * 	@value share 底部分享示例
+	 * @property {Boolean} animation = [true|false] 是否开启动画
+	 * @property {Boolean} maskClick = [true|false] 蒙版点击是否关闭弹窗(废弃)
+	 * @property {Boolean} isMaskClick = [true|false] 蒙版点击是否关闭弹窗
+	 * @property {String}  backgroundColor 主窗口背景色
+	 * @property {String}  maskBackgroundColor 蒙版颜色
+	 * @property {Boolean} safeArea		   是否适配底部安全区
+	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
+	 * @event {Function} maskClick 点击遮罩触发
+	 */
+
+	export default {
+		name: 'uniPopup',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
+		},
+		emits: ['change', 'maskClick'],
+		props: {
+			// 开启动画
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+			// message: 消息提示 ; dialog : 对话框
+			type: {
+				type: String,
+				default: 'center'
+			},
+			// maskClick
+			isMaskClick: {
+				type: Boolean,
+				default: null
+			},
+			// TODO 2 个版本后废弃属性 ，使用 isMaskClick
+			maskClick: {
+				type: Boolean,
+				default: null
+			},
+			backgroundColor: {
+				type: String,
+				default: 'none'
+			},
+			safeArea: {
+				type: Boolean,
+				default: true
+			},
+			maskBackgroundColor: {
+				type: String,
+				default: 'rgba(0, 0, 0, 0.4)'
+			},
+		},
+
+		watch: {
+			/**
+			 * 监听type类型
+			 */
+			type: {
+				handler: function(type) {
+					if (!this.config[type]) return
+					this[this.config[type]](true)
+				},
+				immediate: true
+			},
+			isDesktop: {
+				handler: function(newVal) {
+					if (!this.config[newVal]) return
+					this[this.config[this.type]](true)
+				},
+				immediate: true
+			},
+			/**
+			 * 监听遮罩是否可点击
+			 * @param {Object} val
+			 */
+			maskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			isMaskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			// H5 下禁止底部滚动
+			showPopup(show) {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
+				// #endif
+			}
+		},
+		data() {
+			return {
+				duration: 300,
+				ani: [],
+				showPopup: false,
+				showTrans: false,
+				popupWidth: 0,
+				popupHeight: 0,
+				config: {
+					top: 'top',
+					bottom: 'bottom',
+					center: 'center',
+					left: 'left',
+					right: 'right',
+					message: 'top',
+					dialog: 'center',
+					share: 'bottom'
+				},
+				maskClass: {
+					position: 'fixed',
+					bottom: 0,
+					top: 0,
+					left: 0,
+					right: 0,
+					backgroundColor: 'rgba(0, 0, 0, 0.4)'
+				},
+				transClass: {
+					position: 'fixed',
+					left: 0,
+					right: 0
+				},
+				maskShow: true,
+				mkclick: true,
+				popupstyle: this.isDesktop ? 'fixforpc-top' : 'top'
+			}
+		},
+		computed: {
+			isDesktop() {
+				return this.popupWidth >= 500 && this.popupHeight >= 500
+			},
+			bg() {
+				if (this.backgroundColor === '' || this.backgroundColor === 'none') {
+					return 'transparent'
+				}
+				return this.backgroundColor
+			}
+		},
+		mounted() {
+			const fixSize = () => {
+				const {
+					windowWidth,
+					windowHeight,
+					windowTop,
+					safeArea,
+					screenHeight,
+					safeAreaInsets
+				} = uni.getSystemInfoSync()
+				this.popupWidth = windowWidth
+				this.popupHeight = windowHeight + (windowTop || 0)
+				// TODO fix by mehaotian 是否适配底部安全区 ,目前微信ios 、和 app ios 计算有差异，需要框架修复
+				if (safeArea && this.safeArea) {
+					// #ifdef MP-WEIXIN
+					this.safeAreaInsets = screenHeight - safeArea.bottom
+					// #endif
+					// #ifndef MP-WEIXIN
+					this.safeAreaInsets = safeAreaInsets.bottom
+					// #endif
+				} else {
+					this.safeAreaInsets = 0
+				}
+			}
+			fixSize()
+			// #ifdef H5
+			// window.addEventListener('resize', fixSize)
+			// this.$once('hook:beforeDestroy', () => {
+			// 	window.removeEventListener('resize', fixSize)
+			// })
+			// #endif
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			this.setH5Visible()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.setH5Visible()
+		},
+		// #endif
+		created() {
+			// this.mkclick =  this.isMaskClick || this.maskClick
+			if (this.isMaskClick === null && this.maskClick === null) {
+				this.mkclick = true
+			} else {
+				this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick
+			}
+			if (this.animation) {
+				this.duration = 300
+			} else {
+				this.duration = 0
+			}
+			// TODO 处理 message 组件生命周期异常的问题
+			this.messageChild = null
+			// TODO 解决头条冒泡的问题
+			this.clearPropagation = false
+			this.maskClass.backgroundColor = this.maskBackgroundColor
+		},
+		methods: {
+			setH5Visible() {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = 'visible'
+				// #endif
+			},
+			/**
+			 * 公用方法，不显示遮罩层
+			 */
+			closeMask() {
+				this.maskShow = false
+			},
+			/**
+			 * 公用方法，遮罩层禁止点击
+			 */
+			disableMask() {
+				this.mkclick = false
+			},
+			// TODO nvue 取消冒泡
+			clear(e) {
+				// #ifndef APP-NVUE
+				e.stopPropagation()
+				// #endif
+				this.clearPropagation = true
+			},
+
+			open(direction) {
+				// fix by mehaotian 处理快速打开关闭的情况
+				if (this.showPopup) {
+					return
+				}
+				let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
+				if (!(direction && innerType.indexOf(direction) !== -1)) {
+					direction = this.type
+				}
+				if (!this.config[direction]) {
+					console.error('缺少类型：', direction)
+					return
+				}
+				this[this.config[direction]]()
+				this.$emit('change', {
+					show: true,
+					type: direction
+				})
+			},
+			close(type) {
+				this.showTrans = false
+				this.$emit('change', {
+					show: false,
+					type: this.type
+				})
+				clearTimeout(this.timer)
+				// // 自定义关闭事件
+				// this.customOpen && this.customClose()
+				this.timer = setTimeout(() => {
+					this.showPopup = false
+				}, 300)
+			},
+			// TODO 处理冒泡事件，头条的冒泡事件有问题 ，先这样兼容
+			touchstart() {
+				this.clearPropagation = false
+			},
+
+			onTap() {
+				if (this.clearPropagation) {
+					// fix by mehaotian 兼容 nvue
+					this.clearPropagation = false
+					return
+				}
+				this.$emit('maskClick')
+				if (!this.mkclick) return
+				this.close()
+			},
+			/**
+			 * 顶部弹出样式处理
+			 */
+			top(type) {
+				this.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top'
+				this.ani = ['slide-top']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					backgroundColor: this.bg
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+				this.$nextTick(() => {
+					if (this.messageChild && this.type === 'message') {
+						this.messageChild.timerClose()
+					}
+				})
+			},
+			/**
+			 * 底部弹出样式处理
+			 */
+			bottom(type) {
+				this.popupstyle = 'bottom'
+				this.ani = ['slide-bottom']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					bottom: 0,
+					paddingBottom: this.safeAreaInsets + 'px',
+					backgroundColor: this.bg
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			/**
+			 * 中间弹出样式处理
+			 */
+			center(type) {
+				this.popupstyle = 'center'
+				this.ani = ['zoom-out', 'fade']
+				this.transClass = {
+					position: 'fixed',
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column',
+					/* #endif */
+					bottom: 0,
+					left: 0,
+					right: 0,
+					top: 0,
+					justifyContent: 'center',
+					alignItems: 'center'
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			left(type) {
+				this.popupstyle = 'left'
+				this.ani = ['slide-left']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					bottom: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			right(type) {
+				this.popupstyle = 'right'
+				this.ani = ['slide-right']
+				this.transClass = {
+					position: 'fixed',
+					bottom: 0,
+					right: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	.uni-popup {
+		position: fixed;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+
+		/* #endif */
+		&.top,
+		&.left,
+		&.right {
+			/* #ifdef H5 */
+			top: var(--window-top);
+			/* #endif */
+			/* #ifndef H5 */
+			top: 0;
+			/* #endif */
+		}
+
+		.uni-popup__wrapper {
+			/* #ifndef APP-NVUE */
+			display: block;
+			/* #endif */
+			position: relative;
+
+			/* iphonex 等安全区设置，底部安全区适配 */
+			/* #ifndef APP-NVUE */
+			// padding-bottom: constant(safe-area-inset-bottom);
+			// padding-bottom: env(safe-area-inset-bottom);
+			/* #endif */
+			&.left,
+			&.right {
+				/* #ifdef H5 */
+				padding-top: var(--window-top);
+				/* #endif */
+				/* #ifndef H5 */
+				padding-top: 0;
+				/* #endif */
+				flex: 1;
+			}
+		}
+	}
+
+	.fixforpc-z-index {
+		/* #ifndef APP-NVUE */
+		z-index: 999;
+		/* #endif */
+	}
+
+	.fixforpc-top {
+		top: 0;
+	}
+</style>
diff --git a/uni_modules/uni-popup/package.json b/uni_modules/uni-popup/package.json
new file mode 100644
index 0000000..f40556b
--- /dev/null
+++ b/uni_modules/uni-popup/package.json
@@ -0,0 +1,87 @@
+{
+	"id": "uni-popup",
+	"displayName": "uni-popup 弹出层",
+	"version": "1.8.3",
+	"description": " Popup 组件，提供常用的弹层",
+	"keywords": [
+        "uni-ui",
+        "弹出层",
+        "弹窗",
+        "popup",
+        "弹框"
+    ],
+	"repository": "https://github.com/dcloudio/uni-ui",
+	"engines": {
+		"HBuilderX": ""
+	},
+	"directories": {
+		"example": "../../temps/example_temps"
+	},
+    "dcloudext": {
+        "sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+        "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+        "type": "component-vue"
+	},
+	"uni_modules": {
+		"dependencies": [
+			"uni-scss",
+			"uni-transition"
+		],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "y"
+				},
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "y",
+					"Safari": "y"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "y",
+					"百度": "y",
+					"字节跳动": "y",
+					"QQ": "y"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+                },
+                "Vue": {
+                    "vue2": "y",
+                    "vue3": "y"
+                }
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-popup/readme.md b/uni_modules/uni-popup/readme.md
new file mode 100644
index 0000000..fdad4b3
--- /dev/null
+++ b/uni_modules/uni-popup/readme.md
@@ -0,0 +1,17 @@
+
+
+## Popup 弹出层
+> **组件名：uni-popup**
+> 代码块： `uPopup`
+> 关联组件：`uni-transition`
+
+
+弹出层组件，在应用中弹出一个消息提示窗口、提示框等
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-popup)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
+
+
diff --git a/uni_modules/uni-rate/changelog.md b/uni_modules/uni-rate/changelog.md
new file mode 100644
index 0000000..207ac4f
--- /dev/null
+++ b/uni_modules/uni-rate/changelog.md
@@ -0,0 +1,20 @@
+## 1.2.2（2021-09-10）
+- 优化 默认值修改为 0 颗星
+## 1.2.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.2（2021-05-12）
+- 新增 组件示例地址
+## 1.1.1（2021-04-21）
+- 修复 布局变化后 uni-rate  星星计算不准确的 bug
+- 优化 添加依赖 uni-icons, 导入 uni-rate 自动下载依赖
+## 1.1.0（2021-04-16）
+- 修复 uni-rate 属性 margin 值为 string 组件失效的 bug
+
+## 1.0.9（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.8（2021-02-05）
+- 调整为uni_modules目录规范
+- 支持 pc 端
diff --git a/uni_modules/uni-rate/components/uni-rate/uni-rate.vue b/uni_modules/uni-rate/components/uni-rate/uni-rate.vue
new file mode 100644
index 0000000..6e554fc
--- /dev/null
+++ b/uni_modules/uni-rate/components/uni-rate/uni-rate.vue
@@ -0,0 +1,393 @@
+<template>
+	<view>
+		<view
+		    ref="uni-rate"
+		    class="uni-rate"
+		>
+			<view
+					class="uni-rate__icon"
+					:class="{'uni-cursor-not-allowed': disabled}"
+					:style="{ 'margin-right': marginNumber + 'px' }"
+					v-for="(star, index) in stars"
+					:key="index"
+					@touchstart.stop="touchstart"
+					@touchmove.stop="touchmove"
+					@mousedown.stop="mousedown"
+					@mousemove.stop="mousemove"
+					@mouseleave="mouseleave"
+			>
+				<uni-icons
+				    :color="color"
+				    :size="size"
+				    :type="isFill ? 'star-filled' : 'star'"
+				/>
+				<!-- #ifdef APP-NVUE -->
+				<view
+				    :style="{ width: star.activeWitch.replace('%','')*size/100+'px'}"
+				    class="uni-rate__icon-on"
+				>
+					<uni-icons
+					    style="text-align: left;"
+					    :color="disabled?'#ccc':activeColor"
+					    :size="size"
+					    type="star-filled"
+					/>
+				</view>
+				<!-- #endif -->
+				<!-- #ifndef APP-NVUE -->
+				<view
+				    :style="{ width: star.activeWitch}"
+				    class="uni-rate__icon-on"
+				>
+					<uni-icons
+					    :color="disabled?disabledColor:activeColor"
+					    :size="size"
+					    type="star-filled"
+					/>
+				</view>
+				<!-- #endif -->
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const dom = uni.requireNativePlugin('dom');
+	// #endif
+	/**
+	 * Rate 评分
+	 * @description 评分组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=33
+	 * @property {Boolean} 	isFill = [true|false] 		星星的类型，是否为实心类型, 默认为实心
+	 * @property {String} 	color 						未选中状态的星星颜色，默认为 "#ececec"
+	 * @property {String} 	activeColor 				选中状态的星星颜色，默认为 "#ffca3e"
+	 * @property {String} 	disabledColor 				禁用状态的星星颜色，默认为 "#c0c0c0"
+	 * @property {Number} 	size 						星星的大小
+	 * @property {Number} 	value/v-model 				当前评分
+	 * @property {Number} 	max 						最大评分评分数量，目前一分一颗星
+	 * @property {Number} 	margin 						星星的间距，单位 px
+	 * @property {Boolean} 	disabled = [true|false] 	是否为禁用状态，默认为 false
+	 * @property {Boolean} 	readonly = [true|false] 	是否为只读状态，默认为 false
+	 * @property {Boolean} 	allowHalf = [true|false] 	是否实现半星，默认为 false
+	 * @property {Boolean} 	touchable = [true|false] 	是否支持滑动手势，默认为 true
+	 * @event {Function} change 						uniRate 的 value 改变时触发事件，e={value:Number}
+	 */
+
+	export default {
+		name: "UniRate",
+		props: {
+			isFill: {
+				// 星星的类型，是否镂空
+				type: [Boolean, String],
+				default: true
+			},
+			color: {
+				// 星星未选中的颜色
+				type: String,
+				default: "#ececec"
+			},
+			activeColor: {
+				// 星星选中状态颜色
+				type: String,
+				default: "#ffca3e"
+			},
+			disabledColor: {
+				// 星星禁用状态颜色
+				type: String,
+				default: "#c0c0c0"
+			},
+			size: {
+				// 星星的大小
+				type: [Number, String],
+				default: 24
+			},
+			value: {
+				// 当前评分
+				type: [Number, String],
+				default: 0
+			},
+			modelValue: {
+				// 当前评分
+				type: [Number, String],
+				default: 0
+			},
+			max: {
+				// 最大评分
+				type: [Number, String],
+				default: 5
+			},
+			margin: {
+				// 星星的间距
+				type: [Number, String],
+				default: 0
+			},
+			disabled: {
+				// 是否可点击
+				type: [Boolean, String],
+				default: false
+			},
+			readonly: {
+				// 是否只读
+				type: [Boolean, String],
+				default: false
+			},
+			allowHalf: {
+				// 是否显示半星
+				type: [Boolean, String],
+				default: false
+			},
+			touchable: {
+				// 是否支持滑动手势
+				type: [Boolean, String],
+				default: true
+			}
+		},
+		data() {
+			return {
+				valueSync: "",
+				userMouseFristMove: true,
+				userRated: false,
+				userLastRate: 1
+			};
+		},
+		watch: {
+			value(newVal) {
+				this.valueSync = Number(newVal);
+			},
+			modelValue(newVal) {
+				this.valueSync = Number(newVal);
+			},
+		},
+		computed: {
+			stars() {
+				const value = this.valueSync ? this.valueSync : 0;
+				const starList = [];
+				const floorValue = Math.floor(value);
+				const ceilValue = Math.ceil(value);
+				for (let i = 0; i < this.max; i++) {
+					if (floorValue > i) {
+						starList.push({
+							activeWitch: "100%"
+						});
+					} else if (ceilValue - 1 === i) {
+						starList.push({
+							activeWitch: (value - floorValue) * 100 + "%"
+						});
+					} else {
+						starList.push({
+							activeWitch: "0"
+						});
+					}
+				}
+				return starList;
+			},
+
+			marginNumber() {
+				return Number(this.margin)
+			}
+		},
+		created() {
+			this.valueSync = Number(this.value||this.modelValue);
+			this._rateBoxLeft = 0
+			this._oldValue = null
+		},
+		mounted() {
+			setTimeout(() => {
+				this._getSize()
+			}, 100)
+			// #ifdef H5
+			this.PC = this.IsPC()
+			// #endif
+		},
+		methods: {
+			touchstart(e) {
+				// #ifdef H5
+				if( this.IsPC() ) return
+				// #endif
+				if (this.readonly || this.disabled) return
+				const {
+					clientX,
+					screenX
+				} = e.changedTouches[0]
+				// TODO 做一下兼容，只有 Nvue 下才有 screenX，其他平台式 clientX
+				this._getRateCount(clientX || screenX)
+			},
+			touchmove(e) {
+				// #ifdef H5
+				if( this.IsPC() ) return
+				// #endif
+				if (this.readonly || this.disabled || !this.touchable) return
+				const {
+					clientX,
+					screenX
+				} = e.changedTouches[0]
+				this._getRateCount(clientX || screenX)
+			},
+
+			/**
+			 * 兼容 PC @tian
+			 */
+
+			mousedown(e) {
+				// #ifdef H5
+				if( !this.IsPC() ) return
+				if (this.readonly || this.disabled) return
+				const {
+					clientX,
+				} = e
+				this.userLastRate = this.valueSync
+				this._getRateCount(clientX)
+				this.userRated = true
+				// #endif
+			},
+			mousemove(e) {
+				// #ifdef H5
+				if( !this.IsPC() ) return
+				if( this.userRated ) return
+				if( this.userMouseFristMove ) {
+					console.log('---mousemove----', this.valueSync);
+						this.userLastRate = this.valueSync
+						this.userMouseFristMove = false
+				}
+				if (this.readonly || this.disabled || !this.touchable) return
+				const {
+					clientX,
+				} = e
+				this._getRateCount(clientX)
+				// #endif
+			},
+			mouseleave(e) {
+				// #ifdef H5
+				if( !this.IsPC() ) return
+				if (this.readonly || this.disabled || !this.touchable) return
+				if( this.userRated ) {
+					this.userRated = false
+					return
+				}
+					this.valueSync = this.userLastRate
+				// #endif
+			},
+			// #ifdef H5
+			IsPC() {
+				var userAgentInfo = navigator.userAgent;
+				var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+				var flag = true;
+				for (let v = 0; v < Agents.length - 1; v++) {
+					if (userAgentInfo.indexOf(Agents[v]) > 0) {
+						flag = false;
+						break;
+					}
+				}
+				return flag;
+			},
+			// #endif
+
+			/**
+			 * 获取星星个数
+			 */
+			_getRateCount(clientX) {
+				this._getSize()
+				const size = Number(this.size)
+				if(size === NaN){
+					return new Error('size 属性只能设置为数字')
+				}
+				const rateMoveRange = clientX - this._rateBoxLeft
+				let index = parseInt(rateMoveRange / (size + this.marginNumber))
+				index = index < 0 ? 0 : index;
+				index = index > this.max ? this.max : index;
+				const range = parseInt(rateMoveRange - (size + this.marginNumber) * index);
+				let value = 0;
+				if (this._oldValue === index && !this.PC) return;
+				this._oldValue = index;
+				if (this.allowHalf) {
+					if (range > (size / 2)) {
+						value = index + 1
+					} else {
+						value = index + 0.5
+					}
+				} else {
+					value = index + 1
+				}
+
+				value = Math.max(0.5, Math.min(value, this.max))
+				this.valueSync = value
+				this._onChange()
+			},
+
+			/**
+			 * 触发动态修改
+			 */
+			_onChange() {
+
+				this.$emit("input", this.valueSync);
+				this.$emit("update:modelValue", this.valueSync);
+				this.$emit("change", {
+					value: this.valueSync
+				});
+			},
+			/**
+			 * 获取星星距离屏幕左侧距离
+			 */
+			_getSize() {
+				// #ifndef APP-NVUE
+				uni.createSelectorQuery()
+					.in(this)
+					.select('.uni-rate')
+					.boundingClientRect()
+					.exec(ret => {
+						if (ret) {
+							this._rateBoxLeft = ret[0].left
+						}
+					})
+				// #endif
+				// #ifdef APP-NVUE
+				dom.getComponentRect(this.$refs['uni-rate'], (ret) => {
+					const size = ret.size
+					if (size) {
+						this._rateBoxLeft = size.left
+					}
+				})
+				// #endif
+			}
+		}
+	};
+</script>
+
+<style
+    lang="scss"
+    scoped
+>
+	.uni-rate {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		line-height: 1;
+		font-size: 0;
+		flex-direction: row;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-rate__icon {
+		position: relative;
+		line-height: 1;
+		font-size: 0;
+	}
+
+	.uni-rate__icon-on {
+		overflow: hidden;
+		position: absolute;
+		top: 0;
+		left: 0;
+		line-height: 1;
+		text-align: left;
+	}
+
+	.uni-cursor-not-allowed {
+		/* #ifdef H5 */
+		cursor: not-allowed !important;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/uni-rate/package.json b/uni_modules/uni-rate/package.json
new file mode 100644
index 0000000..503a60f
--- /dev/null
+++ b/uni_modules/uni-rate/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-rate",
+  "displayName": "uni-rate 评分",
+  "version": "1.2.2",
+  "description": "Rate 评分组件，可自定义评分星星图标的大小、间隔、评分数。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "评分"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "u"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-rate/readme.md b/uni_modules/uni-rate/readme.md
new file mode 100644
index 0000000..8d657d0
--- /dev/null
+++ b/uni_modules/uni-rate/readme.md
@@ -0,0 +1,107 @@
+
+
+## Rate 评分
+> **组件名：uni-rate**
+> 代码块： `uRate`
+> 关联组件：`uni-icons`
+
+
+评分组件，多用于购买商品后，对商品进行评价等场景
+
+> **注意事项**
+> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的使用说明，可以帮你避免一些错误。
+> - 暂时不支持零星选择
+> - 当前版本暂不支持修改图标，后续版本会继续优化
+> - 绑定值推荐使用 `v-model` 的方式
+> - 如需设置一个星星表示多分，如：显示5个星星，最高分10分。这种情况请在 change 事件监听中自行处理，获取到的值乘以你的基数就可以，默认组件是一星一分
+
+
+### 安装方式
+
+本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
+
+如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
+
+
+## 基本用法 
+
+```html
+<!-- 基本用法 -->
+<!-- 需要在 script 中绑定 value 变量 -->
+<uni-rate v-model="value" @change="onChange"/>
+
+<!-- 不支持滑动手势选择评分 -->
+<uni-rate :touchable="false" :value="5"/>
+<!-- 设置尺寸大小 -->
+<uni-rate :size="18" :value="5"/>
+
+<!-- 设置评分数 -->
+<uni-rate :max="10" :value="5" />
+	
+<!-- 设置星星间隔 -->
+<uni-rate :value="4" :margin="20" />	
+
+<!-- 设置颜色 -->
+<uni-rate :value="3" color="#bbb" active-color="red" />
+
+<!-- 选择半星 -->
+<uni-rate allow-half :value="3.5" />
+
+<!-- 只读状态 -->
+<uni-rate :readonly="true" :value="2" />
+
+<!-- 禁用状态 -->
+<uni-rate :disabled="true" disabledColor="#ccc" :value="3" />
+
+<!-- 未选中的星星为镂空状态 -->
+<uni-rate :value="3" :is-fill="false" />
+
+			 
+```
+
+```javascript
+
+export default {
+	components: {},
+	data() {
+		return {
+			value: 2
+		}
+	},
+	methods: {
+		onChange(e) {
+			console.log('rate发生改变:' + JSON.stringify(e))
+		}
+	}
+}
+
+```
+
+## API
+### Rate Props
+
+属性名			|	类型			|	默认值	|	说明																									
+:-:				|	:-:		|	:-:		|	:-:	
+value/v-model	|	Number 	 	| 0			|	当前评分
+color 			|	String 	 	| #ececec	|	未选中状态的星星颜色
+activeColor 	|	String 	 	| #ffca3e	|	选中状态的星星颜色
+disabledColor 	|	String 	 	| #c0c0c0	|	禁用状态的星星颜色
+size 			|	Number 	 	| 24		|	星星的大小
+max 			|	Number 	 	| 5			|	最大评分评分数量，目前一分一颗星
+margin 			|	Number 	 	| 0			|	星星的间距，单位 px
+isFill 			| 	Boolean 	| true		|	星星的类型，是否为实心类型
+disabled 		|	Boolean 	| false		|	是否为禁用状态 (之前版本为已读状态，现更正为禁用状态)
+readonly 		|	Boolean 	| false		| 	是否为只读状态
+allowHalf		| 	Boolean 	| false		|	是否展示半星
+touchable		|	Boolean 	| true		|	是否支持滑动手势
+
+### Rate Events
+
+事件称名			|	说明						|	返回参数			
+:-:				|	:-:						|	:-:	
+@change			|	改变 value 的值返回		|	e = { value:number }		
+
+
+## 组件示例
+
+点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/rate/rate](https://hellouniapp.dcloud.net.cn/pages/extUI/rate/rate)
\ No newline at end of file
diff --git a/uni_modules/uni-scss/changelog.md b/uni_modules/uni-scss/changelog.md
new file mode 100644
index 0000000..b863bb0
--- /dev/null
+++ b/uni_modules/uni-scss/changelog.md
@@ -0,0 +1,8 @@
+## 1.0.3（2022-01-21）
+- 优化 组件示例
+## 1.0.2（2021-11-22）
+- 修复 / 符号在 vue 不同版本兼容问题引起的报错问题
+## 1.0.1（2021-11-22）
+- 修复 vue3中scss语法兼容问题
+## 1.0.0（2021-11-18）
+- init
diff --git a/uni_modules/uni-scss/index.scss b/uni_modules/uni-scss/index.scss
new file mode 100644
index 0000000..1744a5f
--- /dev/null
+++ b/uni_modules/uni-scss/index.scss
@@ -0,0 +1 @@
+@import './styles/index.scss';
diff --git a/uni_modules/uni-scss/package.json b/uni_modules/uni-scss/package.json
new file mode 100644
index 0000000..7cc0ccb
--- /dev/null
+++ b/uni_modules/uni-scss/package.json
@@ -0,0 +1,82 @@
+{
+  "id": "uni-scss",
+  "displayName": "uni-scss 辅助样式",
+  "version": "1.0.3",
+  "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。",
+  "keywords": [
+    "uni-scss",
+    "uni-ui",
+    "辅助样式"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "JS SDK",
+        "通用 SDK"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "n",
+          "联盟": "n"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-scss/readme.md b/uni_modules/uni-scss/readme.md
new file mode 100644
index 0000000..b7d1c25
--- /dev/null
+++ b/uni_modules/uni-scss/readme.md
@@ -0,0 +1,4 @@
+`uni-sass` 是 `uni-ui`提供的一套全局样式 ，通过一些简单的类名和`sass`变量，实现简单的页面布局操作，比如颜色、边距、圆角等。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-sass)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/index.scss b/uni_modules/uni-scss/styles/index.scss
new file mode 100644
index 0000000..ffac4fe
--- /dev/null
+++ b/uni_modules/uni-scss/styles/index.scss
@@ -0,0 +1,7 @@
+@import './setting/_variables.scss';
+@import './setting/_border.scss';
+@import './setting/_color.scss';
+@import './setting/_space.scss';
+@import './setting/_radius.scss';
+@import './setting/_text.scss';
+@import './setting/_styles.scss';
diff --git a/uni_modules/uni-scss/styles/setting/_border.scss b/uni_modules/uni-scss/styles/setting/_border.scss
new file mode 100644
index 0000000..12a11c3
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_border.scss
@@ -0,0 +1,3 @@
+.uni-border {
+	border: 1px $uni-border-1 solid;
+}
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/setting/_color.scss b/uni_modules/uni-scss/styles/setting/_color.scss
new file mode 100644
index 0000000..1ededd9
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_color.scss
@@ -0,0 +1,66 @@
+
+// TODO 暂时不需要 class ，需要用户使用变量实现 ，如果使用类名其实并不推荐
+// @mixin get-styles($k,$c) {
+// 	@if $k == size or $k == weight{
+// 		font-#{$k}:#{$c}
+// 	}@else{
+// 		#{$k}:#{$c}
+// 	}
+// }
+$uni-ui-color:(
+	// 主色
+	primary: $uni-primary,
+	primary-disable: $uni-primary-disable,
+	primary-light: $uni-primary-light,
+	// 辅助色
+	success: $uni-success,
+	success-disable: $uni-success-disable,
+	success-light: $uni-success-light,
+	warning: $uni-warning,
+	warning-disable: $uni-warning-disable,
+	warning-light: $uni-warning-light,
+	error: $uni-error,
+	error-disable: $uni-error-disable,
+	error-light: $uni-error-light,
+	info: $uni-info,
+	info-disable: $uni-info-disable,
+	info-light: $uni-info-light,
+	// 中性色
+	main-color: $uni-main-color,
+	base-color: $uni-base-color,
+	secondary-color: $uni-secondary-color,
+	extra-color: $uni-extra-color,
+	// 背景色
+	bg-color: $uni-bg-color,
+	// 边框颜色
+	border-1: $uni-border-1,
+	border-2: $uni-border-2,
+	border-3: $uni-border-3,
+	border-4: $uni-border-4,
+	// 黑色
+	black:$uni-black,
+	// 白色
+	white:$uni-white,
+	// 透明
+	transparent:$uni-transparent
+) !default;
+@each $key, $child in $uni-ui-color {
+	.uni-#{"" + $key} {
+		color: $child;
+	}
+	.uni-#{"" + $key}-bg {
+		background-color: $child;
+	}
+}
+.uni-shadow-sm {
+	box-shadow: $uni-shadow-sm;
+}
+.uni-shadow-base {
+	box-shadow: $uni-shadow-base;
+}
+.uni-shadow-lg {
+	box-shadow: $uni-shadow-lg;
+}
+.uni-mask {
+	background-color:$uni-mask;
+}
diff --git a/uni_modules/uni-scss/styles/setting/_radius.scss b/uni_modules/uni-scss/styles/setting/_radius.scss
new file mode 100644
index 0000000..9a0428b
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_radius.scss
@@ -0,0 +1,55 @@
+@mixin radius($r,$d:null ,$important: false){
+  $radius-value:map-get($uni-radius, $r) if($important, !important, null);
+  // Key exists within the $uni-radius variable
+  @if (map-has-key($uni-radius, $r) and  $d){
+		@if $d == t {
+				border-top-left-radius:$radius-value;
+				border-top-right-radius:$radius-value;
+		}@else if $d == r {
+				border-top-right-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == b {
+				border-bottom-left-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == l {
+				border-top-left-radius:$radius-value;
+				border-bottom-left-radius:$radius-value;
+		}@else if $d == tl {
+				border-top-left-radius:$radius-value;
+		}@else if $d == tr {
+				border-top-right-radius:$radius-value;
+		}@else if $d == br {
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == bl {
+				border-bottom-left-radius:$radius-value;
+		}
+  }@else{
+		border-radius:$radius-value;
+  }
+}
+
+@each $key, $child in $uni-radius {
+	@if($key){
+		.uni-radius-#{"" + $key} {
+				@include radius($key)
+		}
+	}@else{
+		.uni-radius {
+				@include radius($key)
+		}
+	}
+}
+
+@each $direction in t, r, b, l,tl, tr, br, bl {
+	@each $key, $child in $uni-radius {
+		@if($key){
+			.uni-radius-#{"" + $direction}-#{"" + $key} {
+				@include radius($key,$direction,false)
+			}
+		}@else{
+			.uni-radius-#{$direction} {
+				@include radius($key,$direction,false)
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-scss/styles/setting/_space.scss b/uni_modules/uni-scss/styles/setting/_space.scss
new file mode 100644
index 0000000..3c89528
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_space.scss
@@ -0,0 +1,56 @@
+
+@mixin fn($space,$direction,$size,$n) {
+	@if $n {
+		#{$space}-#{$direction}: #{$size*$uni-space-root}px
+	} @else {
+		 #{$space}-#{$direction}: #{-$size*$uni-space-root}px
+	}
+}
+@mixin get-styles($direction,$i,$space,$n){
+	@if $direction == t {
+		@include fn($space, top,$i,$n);
+	} 
+	@if $direction == r {
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == b {
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == l {
+	 @include fn($space, left,$i,$n);
+	} 
+	@if $direction == x {
+		@include fn($space, left,$i,$n);
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == y {
+		@include fn($space, top,$i,$n);
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == a {
+		@if $n {
+			#{$space}:#{$i*$uni-space-root}px;
+		} @else {
+			#{$space}:#{-$i*$uni-space-root}px;
+		}
+	} 
+}
+
+@each $orientation in m,p {
+	$space: margin;
+	@if $orientation == m {
+		$space: margin;
+	} @else {
+		$space: padding;
+	}
+	@for $i from 0 through 16 {
+		@each $direction in t, r, b, l, x, y, a {
+			.uni-#{$orientation}#{$direction}-#{$i} { 
+				@include  get-styles($direction,$i,$space,true);
+			} 
+			.uni-#{$orientation}#{$direction}-n#{$i} { 
+				@include  get-styles($direction,$i,$space,false);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/setting/_styles.scss b/uni_modules/uni-scss/styles/setting/_styles.scss
new file mode 100644
index 0000000..689afec
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_styles.scss
@@ -0,0 +1,167 @@
+/* #ifndef APP-NVUE */
+
+$-color-white:#fff;
+$-color-black:#000;
+@mixin base-style($color) {
+	color: #fff;
+	background-color: $color;
+	border-color: mix($-color-black, $color, 8%);
+	&:not([hover-class]):active {
+		background: mix($-color-black, $color, 10%);
+		border-color: mix($-color-black, $color, 20%);
+		color: $-color-white;
+		outline: none;
+	}
+}
+@mixin is-color($color) {
+	@include base-style($color);
+	&[loading] {
+		@include base-style($color);
+		&::before {
+			margin-right:5px;
+		}
+	}
+	&[disabled] {
+	  &,
+		&[loading],
+	  &:not([hover-class]):active {
+	    color: $-color-white;
+			border-color: mix(darken($color,10%), $-color-white);
+	    background-color: mix($color, $-color-white);
+	  }
+	}
+
+}
+@mixin base-plain-style($color) {
+	color:$color;
+	background-color: mix($-color-white, $color, 90%);
+	border-color: mix($-color-white, $color, 70%);
+	&:not([hover-class]):active {
+	  background: mix($-color-white, $color, 80%);
+	  color: $color;
+	  outline: none;
+		border-color: mix($-color-white, $color, 50%);
+	}
+}
+@mixin is-plain($color){
+	&[plain] {
+		@include base-plain-style($color);
+		&[loading] {
+			@include base-plain-style($color);
+			&::before {
+				margin-right:5px;
+			}
+		}
+		&[disabled] {
+		  &,
+		  &:active {
+		    color: mix($-color-white, $color, 40%);
+		    background-color: mix($-color-white, $color, 90%);
+				border-color: mix($-color-white, $color, 80%);
+		  }
+		}
+	}
+}
+
+
+.uni-btn {
+	margin: 5px;
+	color: #393939;
+	border:1px solid #ccc;
+	font-size: 16px;
+	font-weight: 200;
+	background-color: #F9F9F9;
+	// TODO 暂时处理边框隐藏一边的问题
+	overflow: visible;
+	&::after{
+		border: none;
+	}
+
+	&:not([type]),&[type=default] {
+		color: #999;
+		&[loading] {
+			background: none;
+			&::before {
+				margin-right:5px;
+			}
+		}
+
+
+
+		&[disabled]{
+			color: mix($-color-white, #999, 60%);
+		  &,
+			&[loading],
+		  &:active {
+				color: mix($-color-white, #999, 60%);
+		    background-color: mix($-color-white,$-color-black , 98%);
+				border-color: mix($-color-white,  #999, 85%);
+		  }
+		}
+
+		&[plain] {
+			color: #999;
+			background: none;
+			border-color: $uni-border-1;
+			&:not([hover-class]):active {
+				background: none;
+			  color: mix($-color-white, $-color-black, 80%);
+				border-color: mix($-color-white, $-color-black, 90%);
+			  outline: none;
+			}
+			&[disabled]{
+			  &,
+				&[loading],
+			  &:active {
+			    background: none;
+					color: mix($-color-white, #999, 60%);
+					border-color: mix($-color-white,  #999, 85%);
+			  }
+			}
+		}
+	}
+
+	&:not([hover-class]):active {
+	  color: mix($-color-white, $-color-black, 50%);
+	}
+
+	&[size=mini] {
+		font-size: 16px;
+		font-weight: 200;
+		border-radius: 8px;
+	}
+
+
+
+	&.uni-btn-small {
+		font-size: 14px;
+	}
+	&.uni-btn-mini {
+		font-size: 12px;
+	}
+
+	&.uni-btn-radius {
+		border-radius: 999px;
+	}
+	&[type=primary] {
+		@include is-color($uni-primary);
+		@include is-plain($uni-primary)
+	}
+	&[type=success] {
+		@include is-color($uni-success);
+		@include is-plain($uni-success)
+	}
+	&[type=error] {
+		@include is-color($uni-error);
+		@include is-plain($uni-error)
+	}
+	&[type=warning] {
+		@include is-color($uni-warning);
+		@include is-plain($uni-warning)
+	}
+	&[type=info] {
+		@include is-color($uni-info);
+		@include is-plain($uni-info)
+	}
+}
+/* #endif */
diff --git a/uni_modules/uni-scss/styles/setting/_text.scss b/uni_modules/uni-scss/styles/setting/_text.scss
new file mode 100644
index 0000000..a34d08f
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_text.scss
@@ -0,0 +1,24 @@
+@mixin get-styles($k,$c) {
+	@if $k == size or $k == weight{
+		font-#{$k}:#{$c}
+	}@else{
+		#{$k}:#{$c}
+	}
+}
+
+@each $key, $child in $uni-headings {
+	/* #ifndef APP-NVUE */
+	.uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	.container .uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+}
diff --git a/uni_modules/uni-scss/styles/setting/_variables.scss b/uni_modules/uni-scss/styles/setting/_variables.scss
new file mode 100644
index 0000000..557d3d7
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_variables.scss
@@ -0,0 +1,146 @@
+// @use "sass:math";
+@import  '../tools/functions.scss';
+// 间距基础倍数
+$uni-space-root: 2 !default;
+// 边框半径默认值
+$uni-radius-root:5px !default;
+$uni-radius: () !default;
+// 边框半径断点
+$uni-radius: map-deep-merge(
+  (
+    0: 0,
+		// TODO 当前版本暂时不支持 sm 属性
+    // 'sm': math.div($uni-radius-root, 2),
+    null: $uni-radius-root,
+    'lg': $uni-radius-root * 2,
+    'xl': $uni-radius-root * 6,
+    'pill': 9999px,
+    'circle': 50%
+  ),
+  $uni-radius
+);
+// 字体家族
+$body-font-family: 'Roboto', sans-serif !default;
+// 文本
+$heading-font-family: $body-font-family !default;
+$uni-headings: () !default;
+$letterSpacing: -0.01562em;
+$uni-headings: map-deep-merge(
+  (
+    'h1': (
+      size: 32px,
+			weight: 300,
+			line-height: 50px,
+			// letter-spacing:-0.01562em
+    ),
+    'h2': (
+      size: 28px,
+      weight: 300,
+      line-height: 40px,
+      // letter-spacing: -0.00833em
+    ),
+    'h3': (
+      size: 24px,
+      weight: 400,
+      line-height: 32px,
+      // letter-spacing: normal
+    ),
+    'h4': (
+      size: 20px,
+      weight: 400,
+      line-height: 30px,
+      // letter-spacing: 0.00735em
+    ),
+    'h5': (
+      size: 16px,
+      weight: 400,
+      line-height: 24px,
+      // letter-spacing: normal
+    ),
+    'h6': (
+      size: 14px,
+      weight: 500,
+      line-height: 18px,
+      // letter-spacing: 0.0125em
+    ),
+    'subtitle': (
+      size: 12px,
+      weight: 400,
+      line-height: 20px,
+      // letter-spacing: 0.00937em
+    ),
+    'body': (
+      font-size: 14px,
+			font-weight: 400,
+			line-height: 22px,
+			// letter-spacing: 0.03125em
+    ),
+    'caption': (
+      'size': 12px,
+      'weight': 400,
+      'line-height': 20px,
+      // 'letter-spacing': 0.03333em,
+      // 'text-transform': false
+    )
+  ),
+  $uni-headings
+);
+
+
+
+// 主色
+$uni-primary: #2979ff !default;
+$uni-primary-disable:lighten($uni-primary,20%) !default;
+$uni-primary-light: lighten($uni-primary,25%) !default;
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37 !default;
+$uni-success-disable:lighten($uni-success,20%) !default;
+$uni-success-light: lighten($uni-success,25%) !default;
+
+$uni-warning: #f3a73f !default;
+$uni-warning-disable:lighten($uni-warning,20%) !default;
+$uni-warning-light: lighten($uni-warning,25%) !default;
+
+$uni-error: #e43d33 !default;
+$uni-error-disable:lighten($uni-error,20%) !default;
+$uni-error-light: lighten($uni-error,25%) !default;
+
+$uni-info: #8f939c !default;
+$uni-info-disable:lighten($uni-info,20%) !default;
+$uni-info-light: lighten($uni-info,25%) !default;
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a !default; 			// 主要文字
+$uni-base-color: #6a6a6a !default;			// 常规文字
+$uni-secondary-color: #909399 !default;	// 次要文字
+$uni-extra-color: #c7c7c7 !default;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0 !default;
+$uni-border-2: #EDEDED !default;
+$uni-border-3: #DCDCDC !default;
+$uni-border-4: #B9B9B9 !default;
+
+// 常规色
+$uni-black: #000000 !default;
+$uni-white: #ffffff !default;
+$uni-transparent: rgba($color: #000000, $alpha: 0) !default;
+
+// 背景色
+$uni-bg-color: #f7f7f7 !default;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px !default;
+$uni-spacing-base: 15px !default;
+$uni-spacing-lg: 30px !default;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default;
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default;
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4) !default;
diff --git a/uni_modules/uni-scss/styles/tools/functions.scss b/uni_modules/uni-scss/styles/tools/functions.scss
new file mode 100644
index 0000000..ac6f63e
--- /dev/null
+++ b/uni_modules/uni-scss/styles/tools/functions.scss
@@ -0,0 +1,19 @@
+// 合并 map
+@function map-deep-merge($parent-map, $child-map){
+	$result: $parent-map;
+	@each $key, $child in $child-map {
+		$parent-has-key: map-has-key($result, $key);
+		$parent-value: map-get($result, $key);
+		$parent-type: type-of($parent-value);
+		$child-type: type-of($child);
+		$parent-is-map: $parent-type == map;
+		$child-is-map: $child-type == map;
+			
+		@if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){
+			$result: map-merge($result, ( $key: $child ));
+		}@else {
+			$result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) ));
+		}
+	}
+	@return $result;
+};
diff --git a/uni_modules/uni-scss/theme.scss b/uni_modules/uni-scss/theme.scss
new file mode 100644
index 0000000..80ee62f
--- /dev/null
+++ b/uni_modules/uni-scss/theme.scss
@@ -0,0 +1,31 @@
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+// 主色
+$uni-primary: #2979ff;
+// 辅助色
+$uni-success: #4cd964;
+// 警告色
+$uni-warning: #f0ad4e;
+// 错误色
+$uni-error: #dd524d;
+// 描述色
+$uni-info: #909399;
+// 中性色
+$uni-main-color: #303133;
+$uni-base-color: #606266;
+$uni-secondary-color: #909399;
+$uni-extra-color: #C0C4CC;
+// 背景色
+$uni-bg-color: #f5f5f5;
+// 边框颜色
+$uni-border-1: #DCDFE6;
+$uni-border-2: #E4E7ED;
+$uni-border-3: #EBEEF5;
+$uni-border-4: #F2F6FC;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
diff --git a/uni_modules/uni-scss/variables.scss b/uni_modules/uni-scss/variables.scss
new file mode 100644
index 0000000..1c062d4
--- /dev/null
+++ b/uni_modules/uni-scss/variables.scss
@@ -0,0 +1,62 @@
+@import './styles/setting/_variables.scss';
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+
+// 主色
+$uni-primary: #2979ff;
+$uni-primary-disable:mix(#fff,$uni-primary,50%);
+$uni-primary-light: mix(#fff,$uni-primary,80%);
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37;
+$uni-success-disable:mix(#fff,$uni-success,50%);
+$uni-success-light: mix(#fff,$uni-success,80%);
+
+$uni-warning: #f3a73f;
+$uni-warning-disable:mix(#fff,$uni-warning,50%);
+$uni-warning-light: mix(#fff,$uni-warning,80%);
+
+$uni-error: #e43d33;
+$uni-error-disable:mix(#fff,$uni-error,50%);
+$uni-error-light: mix(#fff,$uni-error,80%);
+
+$uni-info: #8f939c;
+$uni-info-disable:mix(#fff,$uni-info,50%);
+$uni-info-light: mix(#fff,$uni-info,80%);
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a; 			// 主要文字
+$uni-base-color: #6a6a6a;			// 常规文字
+$uni-secondary-color: #909399;	// 次要文字
+$uni-extra-color: #c7c7c7;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0;
+$uni-border-2: #EDEDED;
+$uni-border-3: #DCDCDC;
+$uni-border-4: #B9B9B9;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
+
+// 背景色
+$uni-bg-color: #f7f7f7;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px;
+$uni-spacing-base: 15px;
+$uni-spacing-lg: 30px;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5);
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2);
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4);
diff --git a/uni_modules/uni-swipe-action/changelog.md b/uni_modules/uni-swipe-action/changelog.md
new file mode 100644
index 0000000..0ab2085
--- /dev/null
+++ b/uni_modules/uni-swipe-action/changelog.md
@@ -0,0 +1,33 @@
+## 1.3.3（2022-03-31）
+- 修复 按钮字体大小不能设置的bug
+## 1.3.2（2022-03-16）
+- 修复 h5和app端下报el错误的bug
+## 1.3.1（2022-03-07）
+- 修复 HBuilderX 1.4.X 版本中，h5和app端下报错的bug
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-swipe-action](https://uniapp.dcloud.io/component/uniui/uni-swipe-action)
+## 1.2.4（2021-08-20）
+- 优化 close-all 方法
+## 1.2.3（2021-08-20）
+- 新增 close-all 方法，关闭所有已打开的组件
+## 1.2.2（2021-08-17）
+- 新增 resize() 方法，在非微信小程序、h5、app-vue端出现不能滑动的问题的时候，重置组件
+- 修复 app 端偶尔出现类似 Page[x][-x,xx;-x,xx,x,x-x] 的问题 
+- 优化 微信小程序、h5、app-vue 滑动逻辑，避免出现动态新增组件后不能滑动的问题
+## 1.2.1（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+- 修复 跨页面修改组件数据 ，导致不能滑动的问题
+## 1.1.10（2021-06-17）
+- 修复 按钮点击执行两次的bug
+## 1.1.9（2021-05-12）
+- 新增 项目示例地址
+## 1.1.8（2021-03-26）
+- 修复 微信小程序 nv_navigator is not defined 报错的bug
+## 1.1.7（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 左侧滑动
+- 新增 插槽使用方式
+- 新增 threshold 属性，可以控制滑动缺省值
+- 优化 长列表滚动性能
+- 修复 滚动页面时触发组件滑动的Bug
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js
new file mode 100644
index 0000000..5b15f7f
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js
@@ -0,0 +1,300 @@
+let bindIngXMixins = {}
+
+// #ifdef APP-NVUE
+const BindingX = uni.requireNativePlugin('bindingx');
+const dom = uni.requireNativePlugin('dom');
+const animation = uni.requireNativePlugin('animation');
+
+bindIngXMixins = {
+	data() {
+		return {}
+	},
+
+	watch: {
+		show(newVal) {
+			if (this.autoClose) return
+			if (this.stop) return
+			this.stop = true
+			if (newVal) {
+				this.open(newVal)
+			} else {
+				this.close()
+			}
+		},
+		leftOptions() {
+			this.getSelectorQuery()
+			this.init()
+		},
+		rightOptions(newVal) {
+			this.init()
+		}
+	},
+	created() {
+		this.swipeaction = this.getSwipeAction()
+		if (this.swipeaction.children !== undefined) {
+			this.swipeaction.children.push(this)
+		}
+	},
+	mounted() {
+		this.box = this.getEl(this.$refs['selector-box--hock'])
+		this.selector = this.getEl(this.$refs['selector-content--hock']);
+		this.leftButton = this.getEl(this.$refs['selector-left-button--hock']);
+		this.rightButton = this.getEl(this.$refs['selector-right-button--hock']);
+		this.init()
+	},
+	// beforeDestroy() {
+	// 	this.swipeaction.children.forEach((item, index) => {
+	// 		if (item === this) {
+	// 			this.swipeaction.children.splice(index, 1)
+	// 		}
+	// 	})
+	// },
+	methods: {
+		init() {
+			this.$nextTick(() => {
+				this.x = 0
+				this.button = {
+					show: false
+				}
+				setTimeout(() => {
+					this.getSelectorQuery()
+				}, 200)
+			})
+		},
+		onClick(index, item, position) {
+			this.$emit('click', {
+				content: item,
+				index,
+				position
+			})
+		},
+		touchstart(e) {
+			// 每次只触发一次，避免多次监听造成闪烁
+			if (this.stop) return
+			this.stop = true
+			if (this.autoClose) {
+				this.swipeaction.closeOther(this)
+			}
+
+			const leftWidth = this.button.left.width
+			const rightWidth = this.button.right.width
+			let expression = this.range(this.x, -rightWidth, leftWidth)
+			let leftExpression = this.range(this.x - leftWidth, -leftWidth, 0)
+			let rightExpression = this.range(this.x + rightWidth, 0, rightWidth)
+
+			this.eventpan = BindingX.bind({
+				anchor: this.box,
+				eventType: 'pan',
+				props: [{
+					element: this.selector,
+					property: 'transform.translateX',
+					expression
+				}, {
+					element: this.leftButton,
+					property: 'transform.translateX',
+					expression: leftExpression
+				}, {
+					element: this.rightButton,
+					property: 'transform.translateX',
+					expression: rightExpression
+				}, ]
+			}, (e) => {
+				// nope
+				if (e.state === 'end') {
+					this.x = e.deltaX + this.x;
+					this.isclick = true
+					this.bindTiming(e.deltaX)
+				}
+			});
+		},
+		touchend(e) {
+			if (this.isopen !== 'none' && !this.isclick) {
+				this.open('none')
+			}
+		},
+		bindTiming(x) {
+			const left = this.x
+			const leftWidth = this.button.left.width
+			const rightWidth = this.button.right.width
+			const threshold = this.threshold
+			if (!this.isopen || this.isopen === 'none') {
+				if (left > threshold) {
+					this.open('left')
+				} else if (left < -threshold) {
+					this.open('right')
+				} else {
+					this.open('none')
+				}
+			} else {
+				if ((x > -leftWidth && x < 0) || x > rightWidth) {
+					if ((x > -threshold && x < 0) || (x - rightWidth > threshold)) {
+						this.open('left')
+					} else {
+						this.open('none')
+					}
+				} else {
+					if ((x < threshold && x > 0) || (x + leftWidth < -threshold)) {
+						this.open('right')
+					} else {
+						this.open('none')
+					}
+				}
+			}
+		},
+
+		/**
+		 * 移动范围
+		 * @param {Object} num
+		 * @param {Object} mix
+		 * @param {Object} max
+		 */
+		range(num, mix, max) {
+			return `min(max(x+${num}, ${mix}), ${max})`
+		},
+
+		/**
+		 * 开启swipe
+		 */
+		open(type) {
+			this.animation(type)
+		},
+
+		/**
+		 * 关闭swipe
+		 */
+		close() {
+			this.animation('none')
+		},
+
+		/**
+		 * 开启关闭动画
+		 * @param {Object} type
+		 */
+		animation(type) {
+			const time = 300
+			const leftWidth = this.button.left.width
+			const rightWidth = this.button.right.width
+			if (this.eventpan && this.eventpan.token) {
+				BindingX.unbind({
+					token: this.eventpan.token,
+					eventType: 'pan'
+				})
+			}
+
+			switch (type) {
+				case 'left':
+					Promise.all([
+						this.move(this.selector, leftWidth),
+						this.move(this.leftButton, 0),
+						this.move(this.rightButton, rightWidth * 2)
+					]).then(() => {
+						this.setEmit(leftWidth, type)
+					})
+					break
+				case 'right':
+					Promise.all([
+						this.move(this.selector, -rightWidth),
+						this.move(this.leftButton, -leftWidth * 2),
+						this.move(this.rightButton, 0)
+					]).then(() => {
+						this.setEmit(-rightWidth, type)
+					})
+					break
+				default:
+					Promise.all([
+						this.move(this.selector, 0),
+						this.move(this.leftButton, -leftWidth),
+						this.move(this.rightButton, rightWidth)
+					]).then(() => {
+						this.setEmit(0, type)
+					})
+
+			}
+		},
+		setEmit(x, type) {
+			const leftWidth = this.button.left.width
+			const rightWidth = this.button.right.width
+			this.isopen = this.isopen || 'none'
+			this.stop = false
+			this.isclick = false
+			// 只有状态不一致才会返回结果
+			if (this.isopen !== type && this.x !== x) {
+				if (type === 'left' && leftWidth > 0) {
+					this.$emit('change', 'left')
+				}
+				if (type === 'right' && rightWidth > 0) {
+					this.$emit('change', 'right')
+				}
+				if (type === 'none') {
+					this.$emit('change', 'none')
+				}
+			}
+			this.x = x
+			this.isopen = type
+		},
+		move(ref, value) {
+			return new Promise((resolve, reject) => {
+				animation.transition(ref, {
+					styles: {
+						transform: `translateX(${value})`,
+					},
+					duration: 150, //ms
+					timingFunction: 'linear',
+					needLayout: false,
+					delay: 0 //ms
+				}, function(res) {
+					resolve(res)
+				})
+			})
+
+		},
+
+		/**
+		 * 获取ref
+		 * @param {Object} el
+		 */
+		getEl(el) {
+			return el.ref
+		},
+		/**
+		 * 获取节点信息
+		 */
+		getSelectorQuery() {
+			Promise.all([
+				this.getDom('left'),
+				this.getDom('right'),
+			]).then((data) => {
+				let show = 'none'
+				if (this.autoClose) {
+					show = 'none'
+				} else {
+					show = this.show
+				}
+
+				if (show === 'none') {
+					// this.close()
+				} else {
+					this.open(show)
+				}
+
+			})
+
+		},
+		getDom(str) {
+			return new Promise((resolve, reject) => {
+				dom.getComponentRect(this.$refs[`selector-${str}-button--hock`], (data) => {
+					if (data) {
+						this.button[str] = data.size
+						resolve(data)
+					} else {
+						reject()
+					}
+				})
+			})
+		}
+	}
+}
+
+// #endif
+
+export default bindIngXMixins
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/isPC.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/isPC.js
new file mode 100644
index 0000000..9a10ece
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/isPC.js
@@ -0,0 +1,12 @@
+export function isPC() {
+	var userAgentInfo = navigator.userAgent;
+	var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+	var flag = true;
+	for (let v = 0; v < Agents.length - 1; v++) {
+		if (userAgentInfo.indexOf(Agents[v]) > 0) {
+			flag = false;
+			break;
+		}
+	}
+	return flag;
+}
\ No newline at end of file
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js
new file mode 100644
index 0000000..1a68ef8
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js
@@ -0,0 +1,193 @@
+export default {
+	data() {
+		return {
+			x: 0,
+			transition: false,
+			width: 0,
+			viewWidth: 0,
+			swipeShow: 0
+		}
+	},
+	watch: {
+		show(newVal) {
+			if (this.autoClose) return
+			if (newVal && newVal !== 'none' ) {
+				this.transition = true
+				this.open(newVal)
+			} else {
+				this.close()
+			}
+		}
+	},
+	created() {
+		this.swipeaction = this.getSwipeAction()
+		if (this.swipeaction.children !== undefined) {
+			this.swipeaction.children.push(this)
+		}
+	},
+	mounted() {
+		this.isopen = false
+		setTimeout(() => {
+			this.getQuerySelect()
+		}, 50)
+	},
+	methods: {
+		appTouchStart(e) {
+			const {
+				clientX
+			} = e.changedTouches[0]
+			this.clientX = clientX
+			this.timestamp = new Date().getTime()
+		},
+		appTouchEnd(e, index, item, position) {
+			const {
+				clientX
+			} = e.changedTouches[0]
+			// fixed by xxxx 模拟点击事件，解决 ios 13 点击区域错位的问题
+			let diff = Math.abs(this.clientX - clientX)
+			let time = (new Date().getTime()) - this.timestamp
+			if (diff < 40 && time < 300) {
+				this.$emit('click', {
+					content: item,
+					index,
+					position
+				})
+			}
+		},
+		/**
+		 * 移动触发
+		 * @param {Object} e
+		 */
+		onChange(e) {
+			this.moveX = e.detail.x
+			this.isclose = false
+		},
+		touchstart(e) {
+			this.transition = false
+			this.isclose = true
+			this.autoClose && this.swipeaction.closeOther(this)
+		},
+		touchmove(e) {},
+		touchend(e) {
+			// 0的位置什么都不执行
+			if (this.isclose && this.isopen === 'none') return
+			if (this.isclose && this.isopen !== 'none') {
+				this.transition = true
+				this.close()
+			} else {
+				this.move(this.moveX + this.leftWidth)
+			}
+		},
+
+		/**
+		 * 移动
+		 * @param {Object} moveX
+		 */
+		move(moveX) {
+			// 打开关闭的处理逻辑不太一样
+			this.transition = true
+			// 未打开状态
+			if (!this.isopen || this.isopen === 'none') {
+				if (moveX > this.threshold) {
+					this.open('left')
+				} else if (moveX < -this.threshold) {
+					this.open('right')
+				} else {
+					this.close()
+				}
+			} else {
+				if (moveX < 0 && moveX < this.rightWidth) {
+					const rightX = this.rightWidth + moveX
+					if (rightX < this.threshold) {
+						this.open('right')
+					} else {
+						this.close()
+					}
+				} else if (moveX > 0 && moveX < this.leftWidth) {
+					const leftX = this.leftWidth - moveX
+					if (leftX < this.threshold) {
+						this.open('left')
+					} else {
+						this.close()
+					}
+				}
+
+			}
+
+		},
+
+		/**
+		 * 打开
+		 */
+		open(type) {
+			this.x = this.moveX
+			this.animation(type)
+		},
+
+		/**
+		 * 关闭
+		 */
+		close() {
+			this.x = this.moveX
+			// TODO 解决 x 值不更新的问题，所以会多触发一次 nextTick ，待优化
+			this.$nextTick(() => {
+				this.x = -this.leftWidth
+				if(this.isopen!=='none'){
+					this.$emit('change', 'none')
+				}
+				this.isopen = 'none'
+			})
+		},
+
+		/**
+		 * 执行结束动画
+		 * @param {Object} type
+		 */
+		animation(type) {
+			this.$nextTick(() => {
+				if (type === 'left') {
+					this.x = 0
+				} else {
+					this.x = -this.rightWidth - this.leftWidth
+				}
+				
+				if(this.isopen!==type){
+					this.$emit('change', type)
+				}
+				this.isopen = type
+			})
+
+		},
+		getSlide(x) {},
+		getQuerySelect() {
+			const query = uni.createSelectorQuery().in(this);
+			query.selectAll('.movable-view--hock').boundingClientRect(data => {
+				this.leftWidth = data[1].width
+				this.rightWidth = data[2].width
+				this.width = data[0].width
+				this.viewWidth = this.width + this.rightWidth + this.leftWidth
+				if (this.leftWidth === 0) {
+					// TODO 疑似bug ,初始化的时候如果x 是0，会导致移动位置错误，所以让元素超出一点
+					this.x = -0.1
+				} else {
+					this.x = -this.leftWidth
+				}
+				this.moveX = this.x
+				this.$nextTick(() => {
+					this.swipeShow = 1
+				})
+
+				if (!this.buttonWidth) {
+					this.disabledView = true
+				}
+
+				if (this.autoClose) return
+				if (this.show !== 'none') {
+					this.transition = true
+					this.open(this.shows)
+				}
+			}).exec();
+
+		}
+	}
+}
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js
new file mode 100644
index 0000000..c44adfd
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js
@@ -0,0 +1,257 @@
+let otherMixins = {}
+
+// #ifndef APP-PLUS|| MP-WEIXIN  ||  H5
+const MIN_DISTANCE = 10;
+otherMixins =  {
+	data() {
+		// TODO 随机生生元素ID，解决百度小程序获取同一个元素位置信息的bug
+		const elClass = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
+		return {
+			uniShow: false,
+			left: 0,
+			buttonShow: 'none',
+			ani: false,
+			moveLeft:'',
+			elClass
+		}
+	},
+	watch: {
+		show(newVal) {
+			if (this.autoClose) return
+			this.openState(newVal)
+		},
+		left(){
+			this.moveLeft = `translateX(${this.left}px)`
+		},
+		buttonShow(newVal){
+			if (this.autoClose) return
+			this.openState(newVal)
+		},
+		leftOptions() {
+			this.init()
+		},
+		rightOptions() {
+			this.init()
+		}
+	},
+	mounted() {
+		this.swipeaction = this.getSwipeAction()
+		if (this.swipeaction.children !== undefined) {
+			this.swipeaction.children.push(this)
+		}
+		this.init()
+	},
+	methods: {
+		init(){
+			clearTimeout(this.timer)
+			this.timer = setTimeout(() => {
+				this.getSelectorQuery()
+			}, 100)
+			// 移动距离
+			this.left = 0
+			this.x = 0
+		},
+
+		closeSwipe(e) {
+			if (!this.autoClose) return
+			this.swipeaction.closeOther(this)
+		},
+		appTouchStart(e) {
+			const {
+				clientX
+			} = e.changedTouches[0]
+			this.clientX = clientX
+			this.timestamp = new Date().getTime()
+		},
+		appTouchEnd(e, index, item, position) {
+			const {
+				clientX
+			} = e.changedTouches[0]
+			// fixed by xxxx 模拟点击事件，解决 ios 13 点击区域错位的问题
+			let diff = Math.abs(this.clientX - clientX)
+			let time = (new Date().getTime()) - this.timestamp
+			if (diff < 40 && time < 300) {
+				this.$emit('click', {
+					content: item,
+					index,
+					position
+				})
+			}
+		},
+		touchstart(e) {
+			if (this.disabled) return
+			this.ani = false
+			this.x = this.left || 0
+			this.stopTouchStart(e)
+			this.autoClose && this.closeSwipe()
+		},
+		touchmove(e) {
+			if (this.disabled) return
+			// 是否可以滑动页面
+			this.stopTouchMove(e);
+			if (this.direction !== 'horizontal') {
+				return;
+			}
+			this.move(this.x + this.deltaX)
+			return false
+		},
+		touchend() {
+			if (this.disabled) return
+			this.moveDirection(this.left)
+		},
+		/**
+		 * 设置移动距离
+		 * @param {Object} value
+		 */
+		move(value) {
+			value = value || 0
+			const leftWidth = this.leftWidth
+			const rightWidth = this.rightWidth
+			// 获取可滑动范围
+			this.left = this.range(value, -rightWidth, leftWidth);
+		},
+
+		/**
+		 * 获取范围
+		 * @param {Object} num
+		 * @param {Object} min
+		 * @param {Object} max
+		 */
+		range(num, min, max) {
+			return Math.min(Math.max(num, min), max);
+		},
+		/**
+		 * 移动方向判断
+		 * @param {Object} left
+		 * @param {Object} value
+		 */
+		moveDirection(left) {
+			const threshold = this.threshold
+			const isopen = this.isopen || 'none'
+			const leftWidth = this.leftWidth
+			const rightWidth = this.rightWidth
+			if (this.deltaX === 0) {
+				this.openState('none')
+				return
+			}
+			if ((isopen === 'none' && rightWidth > 0 && -left > threshold) || (isopen !== 'none' && rightWidth > 0 && rightWidth +
+					left < threshold)) {
+				// right
+				this.openState('right')
+			} else if ((isopen === 'none' && leftWidth > 0 && left > threshold) || (isopen !== 'none' && leftWidth > 0 &&
+					leftWidth - left < threshold)) {
+				// left
+				this.openState('left')
+			} else {
+				// default
+				this.openState('none')
+			}
+		},
+
+		/**
+		 * 开启状态
+		 * @param {Boolean} type
+		 */
+		openState(type) {
+			const leftWidth = this.leftWidth
+			const rightWidth = this.rightWidth
+			let left = ''
+			this.isopen = this.isopen ? this.isopen : 'none'
+			switch (type) {
+				case "left":
+					left = leftWidth
+					break
+				case "right":
+					left = -rightWidth
+					break
+				default:
+					left = 0
+			}
+
+
+			if (this.isopen !== type) {
+				this.throttle = true
+				this.$emit('change', type)
+			}
+
+			this.isopen = type
+			// 添加动画类
+			this.ani = true
+			this.$nextTick(() => {
+				this.move(left)
+			})
+			// 设置最终移动位置,理论上只要进入到这个函数，肯定是要打开的
+		},
+		close() {
+			this.openState('none')
+		},
+		getDirection(x, y) {
+			if (x > y && x > MIN_DISTANCE) {
+				return 'horizontal';
+			}
+			if (y > x && y > MIN_DISTANCE) {
+				return 'vertical';
+			}
+			return '';
+		},
+
+		/**
+		 * 重置滑动状态
+		 * @param {Object} event
+		 */
+		resetTouchStatus() {
+			this.direction = '';
+			this.deltaX = 0;
+			this.deltaY = 0;
+			this.offsetX = 0;
+			this.offsetY = 0;
+		},
+
+		/**
+		 * 设置滑动开始位置
+		 * @param {Object} event
+		 */
+		stopTouchStart(event) {
+			this.resetTouchStatus();
+			const touch = event.touches[0];
+			this.startX = touch.clientX;
+			this.startY = touch.clientY;
+		},
+
+		/**
+		 * 滑动中，是否禁止打开
+		 * @param {Object} event
+		 */
+		stopTouchMove(event) {
+			const touch = event.touches[0];
+			this.deltaX = touch.clientX - this.startX;
+			this.deltaY = touch.clientY - this.startY;
+			this.offsetX = Math.abs(this.deltaX);
+			this.offsetY = Math.abs(this.deltaY);
+			this.direction = this.direction || this.getDirection(this.offsetX, this.offsetY);
+		},
+
+		getSelectorQuery() {
+			const views = uni.createSelectorQuery().in(this)
+			views
+				.selectAll('.'+this.elClass)
+				.boundingClientRect(data => {
+					if(data.length === 0) return
+					let show = 'none'
+					if (this.autoClose) {
+						show = 'none'
+					} else {
+						show = this.show
+					}
+					this.leftWidth = data[0].width || 0
+					this.rightWidth = data[1].width || 0
+					this.buttonShow = show
+				})
+				.exec()
+		}
+	}
+}
+
+// #endif
+
+export default otherMixins
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js
new file mode 100644
index 0000000..e5e30bb
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js
@@ -0,0 +1,82 @@
+let mpMixins = {}
+// #ifdef APP-VUE|| MP-WEIXIN || H5
+import {
+	isPC
+} from "./isPC"
+mpMixins = {
+	data() {
+		return {
+			is_show: 'none'
+		}
+	},
+	watch: {
+		show(newVal) {
+			this.is_show = this.show
+		}
+	},
+	created() {
+		this.swipeaction = this.getSwipeAction()
+		if (this.swipeaction.children !== undefined) {
+			this.swipeaction.children.push(this)
+		}
+	},
+	mounted() {
+		this.is_show = this.show
+	},
+	methods: {
+		// wxs 中调用
+		closeSwipe(e) {
+			if (!this.autoClose) return
+			this.swipeaction.closeOther(this)
+		},
+
+		change(e) {
+			this.$emit('change', e.open)
+			if (this.is_show !== e.open) {
+				this.is_show = e.open
+			}
+		},
+
+		appTouchStart(e) {
+			// #ifdef H5
+			if (isPC()) return
+			// #endif
+			const {
+				clientX
+			} = e.changedTouches[0]
+			this.clientX = clientX
+			this.timestamp = new Date().getTime()
+		},
+		appTouchEnd(e, index, item, position) {
+			// #ifdef H5
+			if (isPC()) return
+			// #endif
+			const {
+				clientX
+			} = e.changedTouches[0]
+			// fixed by xxxx 模拟点击事件，解决 ios 13 点击区域错位的问题
+			let diff = Math.abs(this.clientX - clientX)
+			let time = (new Date().getTime()) - this.timestamp
+			if (diff < 40 && time < 300) {
+				this.$emit('click', {
+					content: item,
+					index,
+					position
+				})
+			}
+		},
+		onClickForPC(index, item, position) {
+			// #ifdef H5
+			if (!isPC()) return
+			this.$emit('click', {
+				content: item,
+				index,
+				position
+			})
+			// #endif
+		}
+	}
+}
+
+// #endif
+export default mpMixins
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/render.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/render.js
new file mode 100644
index 0000000..ed42f1b
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/render.js
@@ -0,0 +1,270 @@
+const MIN_DISTANCE = 10;
+export default {
+	showWatch(newVal, oldVal, ownerInstance, instance,self) {
+		var state = self.state
+		var $el = ownerInstance.$el || ownerInstance.$vm && ownerInstance.$vm.$el
+		if(!$el) return
+		this.getDom(instance, ownerInstance,self)
+		if (newVal && newVal !== 'none') {
+			this.openState(newVal, instance, ownerInstance,self)
+			return
+		}
+
+		if (state.left) {
+			this.openState('none', instance, ownerInstance,self)
+		}
+		this.resetTouchStatus(instance,self)
+	},
+
+	/**
+	 * 开始触摸操作
+	 * @param {Object} e
+	 * @param {Object} ins
+	 */
+	touchstart(e, ownerInstance, self) {
+		let instance = e.instance;
+		let disabled = instance.getDataset().disabled
+		let state = self.state;
+		this.getDom(instance, ownerInstance, self)
+		// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+		disabled = this.getDisabledType(disabled)
+		if (disabled) return
+		// 开始触摸时移除动画类
+		instance.requestAnimationFrame(function() {
+			instance.removeClass('ani');
+			ownerInstance.callMethod('closeSwipe');
+		})
+
+		// 记录上次的位置
+		state.x = state.left || 0
+		// 计算滑动开始位置
+		this.stopTouchStart(e, ownerInstance, self)
+	},
+
+	/**
+	 * 开始滑动操作
+	 * @param {Object} e
+	 * @param {Object} ownerInstance
+	 */
+	touchmove(e, ownerInstance, self) {
+		let instance = e.instance;
+		// 删除之后已经那不到实例了
+		if(!instance) return;
+		let disabled = instance.getDataset().disabled
+		let state = self.state
+		// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+		disabled = this.getDisabledType(disabled)
+		if (disabled) return
+		// 是否可以滑动页面
+		this.stopTouchMove(e, self);
+		if (state.direction !== 'horizontal') {
+			return;
+		}
+		if (e.preventDefault) {
+			// 阻止页面滚动
+			e.preventDefault()
+		}
+		let x = state.x + state.deltaX
+		this.move(x, instance, ownerInstance, self)
+	},
+
+	/**
+	 * 结束触摸操作
+	 * @param {Object} e
+	 * @param {Object} ownerInstance
+	 */
+	touchend(e, ownerInstance, self) {
+		let instance = e.instance;
+		let disabled = instance.getDataset().disabled
+		let state = self.state
+		// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+		disabled = this.getDisabledType(disabled)
+
+		if (disabled) return
+		// 滑动过程中触摸结束,通过阙值判断是开启还是关闭
+		// fixed by mehaotian 定时器解决点击按钮，touchend 触发比 click 事件时机早的问题 ，主要是 ios13
+		this.moveDirection(state.left, instance, ownerInstance, self)
+
+	},
+
+	/**
+	 * 设置移动距离
+	 * @param {Object} value
+	 * @param {Object} instance
+	 * @param {Object} ownerInstance
+	 */
+	move(value, instance, ownerInstance, self) {
+		value = value || 0
+		let state = self.state
+		let leftWidth = state.leftWidth
+		let rightWidth = state.rightWidth
+		// 获取可滑动范围
+		state.left = this.range(value, -rightWidth, leftWidth);
+		instance.requestAnimationFrame(function() {
+			instance.setStyle({
+				transform: 'translateX(' + state.left + 'px)',
+				'-webkit-transform': 'translateX(' + state.left + 'px)'
+			})
+		})
+
+	},
+
+	/**
+	 * 获取元素信息
+	 * @param {Object} instance
+	 * @param {Object} ownerInstance
+	 */
+	getDom(instance, ownerInstance, self) {
+		var state = self.state
+		var $el = ownerInstance.$el || ownerInstance.$vm && ownerInstance.$vm.$el
+		var leftDom = $el.querySelector('.button-group--left')
+		var rightDom = $el.querySelector('.button-group--right')
+
+		state.leftWidth = leftDom.offsetWidth || 0
+		state.rightWidth = rightDom.offsetWidth || 0
+		state.threshold = instance.getDataset().threshold
+	},
+
+	getDisabledType(value) {
+		return (typeof(value) === 'string' ? JSON.parse(value) : value) || false;
+	},
+
+	/**
+	 * 获取范围
+	 * @param {Object} num
+	 * @param {Object} min
+	 * @param {Object} max
+	 */
+	range(num, min, max) {
+		return Math.min(Math.max(num, min), max);
+	},
+
+
+	/**
+	 * 移动方向判断
+	 * @param {Object} left
+	 * @param {Object} value
+	 * @param {Object} ownerInstance
+	 * @param {Object} ins
+	 */
+	moveDirection(left, ins, ownerInstance, self) {
+		var state = self.state
+		var threshold = state.threshold
+		var position = state.position
+		var isopen = state.isopen || 'none'
+		var leftWidth = state.leftWidth
+		var rightWidth = state.rightWidth
+		if (state.deltaX === 0) {
+			this.openState('none', ins, ownerInstance, self)
+			return
+		}
+		if ((isopen === 'none' && rightWidth > 0 && -left > threshold) || (isopen !== 'none' && rightWidth > 0 &&
+				rightWidth +
+				left < threshold)) {
+			// right
+			this.openState('right', ins, ownerInstance, self)
+		} else if ((isopen === 'none' && leftWidth > 0 && left > threshold) || (isopen !== 'none' && leftWidth > 0 &&
+				leftWidth - left < threshold)) {
+			// left
+			this.openState('left', ins, ownerInstance, self)
+		} else {
+			// default
+			this.openState('none', ins, ownerInstance, self)
+		}
+	},
+
+
+	/**
+	 * 开启状态
+	 * @param {Boolean} type
+	 * @param {Object} ins
+	 * @param {Object} ownerInstance
+	 */
+	openState(type, ins, ownerInstance, self) {
+		let state = self.state
+		let leftWidth = state.leftWidth
+		let rightWidth = state.rightWidth
+		let left = ''
+		state.isopen = state.isopen ? state.isopen : 'none'
+		switch (type) {
+			case "left":
+				left = leftWidth
+				break
+			case "right":
+				left = -rightWidth
+				break
+			default:
+				left = 0
+		}
+
+		// && !state.throttle
+
+		if (state.isopen !== type) {
+			state.throttle = true
+			ownerInstance.callMethod('change', {
+				open: type
+			})
+
+		}
+
+		state.isopen = type
+		// 添加动画类
+		ins.requestAnimationFrame(()=> {
+			ins.addClass('ani');
+			this.move(left, ins, ownerInstance, self)
+		})
+	},
+
+
+	getDirection(x, y) {
+		if (x > y && x > MIN_DISTANCE) {
+			return 'horizontal';
+		}
+		if (y > x && y > MIN_DISTANCE) {
+			return 'vertical';
+		}
+		return '';
+	},
+
+	/**
+	 * 重置滑动状态
+	 * @param {Object} event
+	 */
+	resetTouchStatus(instance, self) {
+		let state = self.state;
+		state.direction = '';
+		state.deltaX = 0;
+		state.deltaY = 0;
+		state.offsetX = 0;
+		state.offsetY = 0;
+	},
+
+	/**
+	 * 设置滑动开始位置
+	 * @param {Object} event
+	 */
+	stopTouchStart(event, ownerInstance, self) {
+		let instance = event.instance;
+		let state = self.state
+		this.resetTouchStatus(instance, self);
+		var touch = event.touches[0];
+		state.startX = touch.clientX;
+		state.startY = touch.clientY;
+	},
+
+	/**
+	 * 滑动中，是否禁止打开
+	 * @param {Object} event
+	 */
+	stopTouchMove(event, self) {
+		let instance = event.instance;
+		let state = self.state;
+		let touch = event.touches[0];
+
+		state.deltaX = touch.clientX - state.startX;
+		state.deltaY = touch.clientY - state.startY;
+		state.offsetY = Math.abs(state.deltaY);
+		state.offsetX = Math.abs(state.deltaX);
+		state.direction = state.direction || this.getDirection(state.offsetX, state.offsetY);
+	}
+}
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue
new file mode 100644
index 0000000..56b9c6d
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue
@@ -0,0 +1,344 @@
+<template>
+	<!-- 在微信小程序 app vue端 h5 使用wxs 实现-->
+	<!-- #ifdef APP-VUE || MP-WEIXIN || H5 || MP-KUAISHOU -->
+	<view class="uni-swipe">
+		<!--  #ifdef MP-WEIXIN || VUE3 || MP-KUAISHOU -->
+		<view class="uni-swipe_box" :change:prop="wxsswipe.showWatch"
+			:prop="is_show" :data-threshold="threshold" :data-disabled="disabled" @touchstart="wxsswipe.touchstart" @touchmove="wxsswipe.touchmove" @touchend="wxsswipe.touchend">
+		<!-- #endif -->
+		<!--  #ifndef MP-WEIXIN || VUE3 || MP-KUAISHOU -->
+		<view class="uni-swipe_box" :change:prop="renderswipe.showWatch"
+			:prop="is_show" :data-threshold="threshold" :data-disabled="disabled+''" @touchstart="renderswipe.touchstart" @touchmove="renderswipe.touchmove" @touchend="renderswipe.touchend">
+		<!-- #endif -->
+			<!-- 在微信小程序 app vue端 h5 使用wxs 实现-->
+			<view class="uni-swipe_button-group button-group--left">
+				<slot name="left">
+					<view v-for="(item,index) in leftOptions"  :key="index" :style="{
+					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
+					}" class="uni-swipe_button button-hock" @touchstart="appTouchStart"
+						@touchend="appTouchEnd($event,index,item,'left')" @click.stop="onClickForPC(index,item,'left')">
+						<text class="uni-swipe_button-text"
+							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
+					</view>
+				</slot>
+			</view>
+			<view class="uni-swipe_text--center">
+				<slot></slot>
+			</view>
+			<view class="uni-swipe_button-group button-group--right">
+				<slot name="right">
+					<view v-for="(item,index) in rightOptions"  :key="index" :style="{
+					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
+					}" class="uni-swipe_button button-hock" @touchstart="appTouchStart"
+						@touchend="appTouchEnd($event,index,item,'right')"
+						@click.stop="onClickForPC(index,item,'right')"><text class="uni-swipe_button-text"
+							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
+					</view>
+				</slot>
+			</view>
+		</view>
+	</view>
+	<!-- #endif -->
+	<!-- app nvue端 使用 bindingx -->
+	<!-- #ifdef APP-NVUE -->
+	<view ref="selector-box--hock" class="uni-swipe" @horizontalpan="touchstart" @touchend="touchend">
+		<view ref='selector-left-button--hock' class="uni-swipe_button-group button-group--left">
+			<slot name="left">
+				<view v-for="(item,index) in leftOptions" :data-button="btn" :key="index" :style="{
+				  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
+				}" class="uni-swipe_button button-hock" @click.stop="onClick(index,item,'left')"><text
+						class="uni-swipe_button-text"
+						:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF', fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
+				</view>
+			</slot>
+		</view>
+		<view ref='selector-right-button--hock' class="uni-swipe_button-group button-group--right">
+			<slot name="right">
+				<view v-for="(item,index) in rightOptions" :data-button="btn" :key="index" :style="{
+				  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
+				}" class="uni-swipe_button button-hock" @click.stop="onClick(index,item,'right')"><text
+						class="uni-swipe_button-text"
+						:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
+				</view>
+			</slot>
+		</view>
+		<view ref='selector-content--hock' class="uni-swipe_box">
+			<slot></slot>
+		</view>
+	</view>
+	<!-- #endif -->
+	<!-- 其他平台使用 js ，长列表性能可能会有影响-->
+	<!-- #ifdef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO || MP-QQ || MP-KUAISHOU -->
+	<view class="uni-swipe">
+		<view class="uni-swipe_box" @touchstart="touchstart" @touchmove="touchmove" @touchend="touchend"
+			:style="{transform:moveLeft}" :class="{ani:ani}">
+			<view class="uni-swipe_button-group button-group--left" :class="[elClass]">
+				<slot name="left">
+					<view v-for="(item,index) in leftOptions" :data-button="btn" :key="index" :style="{
+					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
+					  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
+					}" class="uni-swipe_button button-hock" @touchstart="appTouchStart"
+						@touchend="appTouchEnd($event,index,item,'left')"><text class="uni-swipe_button-text"
+							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
+					</view>
+				</slot>
+			</view>
+			<slot></slot>
+			<view class="uni-swipe_button-group button-group--right" :class="[elClass]">
+				<slot name="right">
+					<view v-for="(item,index) in rightOptions" :data-button="btn" :key="index" :style="{
+					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
+					  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
+					}" @touchstart="appTouchStart" @touchend="appTouchEnd($event,index,item,'right')"
+						class="uni-swipe_button button-hock"><text class="uni-swipe_button-text"
+							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
+					</view>
+				</slot>
+			</view>
+		</view>
+	</view>
+	<!-- #endif -->
+
+</template>
+<script src="./wx.wxs" module="wxsswipe" lang="wxs"></script>
+
+<script module="renderswipe" lang="renderjs">
+	import render from './render.js'
+	export default {
+		mounted(e,ins,owner) {
+			this.state = {}
+		},
+		methods:{
+			showWatch(newVal, oldVal, ownerInstance, instance){
+				render.showWatch(newVal, oldVal, ownerInstance, instance,this)
+			},
+			touchstart(e,ownerInstance){
+				render.touchstart(e,ownerInstance,this)
+			},
+			touchmove(e, ownerInstance){
+				render.touchmove(e,ownerInstance,this)
+			},
+			touchend(e,ownerInstance){
+				render.touchend(e,ownerInstance,this)
+			}
+		}
+	}
+</script>
+<script>
+	import mpwxs from './mpwxs'
+	import bindingx from './bindingx.js'
+	import mpother from './mpother'
+
+	/**
+	 * SwipeActionItem 滑动操作子组件
+	 * @description 通过滑动触发选项的容器
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=181
+	 * @property {Boolean} show = [left|right｜none] 	开启关闭组件，auto-close = false 时生效
+	 * @property {Boolean} disabled = [true|false] 		是否禁止滑动
+	 * @property {Boolean} autoClose = [true|false] 	滑动打开当前组件，是否关闭其他组件
+	 * @property {Number}  threshold 					滑动缺省值
+	 * @property {Array} leftOptions 					左侧选项内容及样式
+	 * @property {Array} rgihtOptions 					右侧选项内容及样式
+	 * @event {Function} click 							点击选项按钮时触发事件，e = {content,index} ，content（点击内容）、index（下标)
+	 * @event {Function} change 						组件打开或关闭时触发，left\right\none
+	 */
+
+	export default {
+		mixins: [mpwxs,bindingx,mpother],
+		emits:['click','change'],
+		props: {
+			// 控制开关
+			show: {
+				type: String,
+				default: 'none'
+			},
+
+			// 禁用
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+
+			// 是否自动关闭
+			autoClose: {
+				type: Boolean,
+				default: true
+			},
+
+			// 滑动缺省距离
+			threshold: {
+				type: Number,
+				default: 20
+			},
+
+			// 左侧按钮内容
+			leftOptions: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+
+			// 右侧按钮内容
+			rightOptions: {
+				type: Array,
+				default () {
+					return []
+				}
+			}
+
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			if (this.__isUnmounted) return
+			this.uninstall()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.__isUnmounted = true
+			this.uninstall()
+		},
+		// #endif
+
+		methods: {
+			uninstall() {
+				if (this.swipeaction) {
+					this.swipeaction.children.forEach((item, index) => {
+						if (item === this) {
+							this.swipeaction.children.splice(index, 1)
+						}
+					})
+				}
+			},
+			/**
+			 * 获取父元素实例
+			 */
+			getSwipeAction(name = 'uniSwipeAction') {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== name) {
+					parent = parent.$parent;
+					if (!parent) return false;
+					parentName = parent.$options.name;
+				}
+				return parent;
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	.uni-swipe {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		/* #endif */
+	}
+
+	.uni-swipe_box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex-shrink: 0;
+		// touch-action: none;
+		/* #endif */
+		position: relative;
+	}
+
+	.uni-swipe_content {
+		// border: 1px red solid;
+	}
+
+	.uni-swipe_text--center {
+		width: 100%;
+		/* #ifndef APP-NVUE */
+		cursor: grab;
+		/* #endif */
+	}
+
+	.uni-swipe_button-group {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		position: absolute;
+		top: 0;
+		bottom: 0;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.button-group--left {
+		left: 0;
+		transform: translateX(-100%)
+	}
+
+	.button-group--right {
+		right: 0;
+		transform: translateX(100%)
+	}
+
+	.uni-swipe_button {
+		/* #ifdef APP-NVUE */
+		flex: 1;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		padding: 0 20px;
+	}
+
+	.uni-swipe_button-text {
+		/* #ifndef APP-NVUE */
+		flex-shrink: 0;
+		/* #endif */
+		font-size: 14px;
+	}
+
+	.ani {
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transition-timing-function: cubic-bezier(0.165, 0.84, 0.44, 1);
+	}
+
+	/* #ifdef MP-ALIPAY */
+	.movable-area {
+		/* width: 100%; */
+		height: 45px;
+	}
+
+	.movable-view {
+		display: flex;
+		/* justify-content: center; */
+		position: relative;
+		flex: 1;
+		height: 45px;
+		z-index: 2;
+	}
+
+	.movable-view-button {
+		display: flex;
+		flex-shrink: 0;
+		flex-direction: row;
+		height: 100%;
+		background: #C0C0C0;
+	}
+
+	/* .transition {
+		transition: all 0.3s;
+	} */
+
+	.movable-view-box {
+		flex-shrink: 0;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/wx.wxs b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/wx.wxs
new file mode 100644
index 0000000..b394244
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/wx.wxs
@@ -0,0 +1,341 @@
+var MIN_DISTANCE = 10;
+
+/**
+ * 判断当前是否为H5、app-vue
+ */
+var IS_HTML5 = false
+if (typeof window === 'object') IS_HTML5 = true
+
+/**
+ * 监听页面内值的变化,主要用于动态开关swipe-action
+ * @param {Object} newValue
+ * @param {Object} oldValue
+ * @param {Object} ownerInstance
+ * @param {Object} instance
+ */
+function showWatch(newVal, oldVal, ownerInstance, instance) {
+	var state = instance.getState()
+	getDom(instance, ownerInstance)
+	if (newVal && newVal !== 'none') {
+		openState(newVal, instance, ownerInstance)
+		return
+	}
+
+	if (state.left) {
+		openState('none', instance, ownerInstance)
+	}
+	resetTouchStatus(instance)
+}
+
+/**
+ * 开始触摸操作
+ * @param {Object} e
+ * @param {Object} ins
+ */
+function touchstart(e, ownerInstance) {
+	var instance = e.instance;
+	var disabled = instance.getDataset().disabled
+	var state = instance.getState();
+	getDom(instance, ownerInstance)
+	// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+	disabled = (typeof(disabled) === 'string' ? JSON.parse(disabled) : disabled) || false;
+	if (disabled) return
+	// 开始触摸时移除动画类
+	instance.requestAnimationFrame(function() {
+		instance.removeClass('ani');
+		ownerInstance.callMethod('closeSwipe');
+	})
+
+	// 记录上次的位置
+	state.x = state.left || 0
+	// 计算滑动开始位置
+	stopTouchStart(e, ownerInstance)
+}
+
+/**
+ * 开始滑动操作
+ * @param {Object} e
+ * @param {Object} ownerInstance
+ */
+function touchmove(e, ownerInstance) {
+	var instance = e.instance;
+	var disabled = instance.getDataset().disabled
+	var state = instance.getState()
+	// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+	disabled = (typeof(disabled) === 'string' ? JSON.parse(disabled) : disabled) || false;
+	if (disabled) return
+	// 是否可以滑动页面
+	stopTouchMove(e);
+	if (state.direction !== 'horizontal') {
+		return;
+	}
+
+	if (e.preventDefault) {
+		// 阻止页面滚动
+		e.preventDefault()
+	}
+
+	move(state.x + state.deltaX, instance, ownerInstance)
+}
+
+/**
+ * 结束触摸操作
+ * @param {Object} e
+ * @param {Object} ownerInstance
+ */
+function touchend(e, ownerInstance) {
+	var instance = e.instance;
+	var disabled = instance.getDataset().disabled
+	var state = instance.getState()
+	// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
+	disabled = (typeof(disabled) === 'string' ? JSON.parse(disabled) : disabled) || false;
+
+	if (disabled) return
+	// 滑动过程中触摸结束,通过阙值判断是开启还是关闭
+	// fixed by mehaotian 定时器解决点击按钮，touchend 触发比 click 事件时机早的问题 ，主要是 ios13
+	moveDirection(state.left, instance, ownerInstance)
+
+}
+
+/**
+ * 设置移动距离
+ * @param {Object} value
+ * @param {Object} instance
+ * @param {Object} ownerInstance
+ */
+function move(value, instance, ownerInstance) {
+	value = value || 0
+	var state = instance.getState()
+	var leftWidth = state.leftWidth
+	var rightWidth = state.rightWidth
+	// 获取可滑动范围
+	state.left = range(value, -rightWidth, leftWidth);
+	instance.requestAnimationFrame(function() {
+		instance.setStyle({
+			transform: 'translateX(' + state.left + 'px)',
+			'-webkit-transform': 'translateX(' + state.left + 'px)'
+		})
+	})
+
+}
+
+/**
+ * 获取元素信息
+ * @param {Object} instance
+ * @param {Object} ownerInstance
+ */
+function getDom(instance, ownerInstance) {
+	var state = instance.getState()
+	var leftDom = ownerInstance.selectComponent('.button-group--left')
+	var rightDom = ownerInstance.selectComponent('.button-group--right')
+	var leftStyles = {
+		width: 0
+	}
+	var rightStyles = {
+		width: 0
+	}
+	leftStyles = leftDom.getBoundingClientRect()
+	rightStyles = rightDom.getBoundingClientRect()
+
+	state.leftWidth = leftStyles.width || 0
+	state.rightWidth = rightStyles.width || 0
+	state.threshold = instance.getDataset().threshold
+}
+
+/**
+ * 获取范围
+ * @param {Object} num
+ * @param {Object} min
+ * @param {Object} max
+ */
+function range(num, min, max) {
+	return Math.min(Math.max(num, min), max);
+}
+
+
+/**
+ * 移动方向判断
+ * @param {Object} left
+ * @param {Object} value
+ * @param {Object} ownerInstance
+ * @param {Object} ins
+ */
+function moveDirection(left, ins, ownerInstance) {
+	var state = ins.getState()
+	var threshold = state.threshold
+	var position = state.position
+	var isopen = state.isopen || 'none'
+	var leftWidth = state.leftWidth
+	var rightWidth = state.rightWidth
+	if (state.deltaX === 0) {
+		openState('none', ins, ownerInstance)
+		return
+	}
+	if ((isopen === 'none' && rightWidth > 0 && -left > threshold) || (isopen !== 'none' && rightWidth > 0 &&
+			rightWidth +
+			left < threshold)) {
+		// right
+		openState('right', ins, ownerInstance)
+	} else if ((isopen === 'none' && leftWidth > 0 && left > threshold) || (isopen !== 'none' && leftWidth > 0 &&
+			leftWidth - left < threshold)) {
+		// left
+		openState('left', ins, ownerInstance)
+	} else {
+		// default
+		openState('none', ins, ownerInstance)
+	}
+}
+
+
+/**
+ * 开启状态
+ * @param {Boolean} type
+ * @param {Object} ins
+ * @param {Object} ownerInstance
+ */
+function openState(type, ins, ownerInstance) {
+	var state = ins.getState()
+	var leftWidth = state.leftWidth
+	var rightWidth = state.rightWidth
+	var left = ''
+	state.isopen = state.isopen ? state.isopen : 'none'
+	switch (type) {
+		case "left":
+			left = leftWidth
+			break
+		case "right":
+			left = -rightWidth
+			break
+		default:
+			left = 0
+	}
+
+	// && !state.throttle
+
+	if (state.isopen !== type) {
+		state.throttle = true
+		ownerInstance.callMethod('change', {
+			open: type
+		})
+
+	}
+
+	state.isopen = type
+	// 添加动画类
+	ins.requestAnimationFrame(function() {
+		ins.addClass('ani');
+		move(left, ins, ownerInstance)
+	})
+	// 设置最终移动位置,理论上只要进入到这个函数，肯定是要打开的
+}
+
+
+function getDirection(x, y) {
+	if (x > y && x > MIN_DISTANCE) {
+		return 'horizontal';
+	}
+	if (y > x && y > MIN_DISTANCE) {
+		return 'vertical';
+	}
+	return '';
+}
+
+/**
+ * 重置滑动状态
+ * @param {Object} event
+ */
+function resetTouchStatus(instance) {
+	var state = instance.getState();
+	state.direction = '';
+	state.deltaX = 0;
+	state.deltaY = 0;
+	state.offsetX = 0;
+	state.offsetY = 0;
+}
+
+/**
+ * 设置滑动开始位置
+ * @param {Object} event
+ */
+function stopTouchStart(event) {
+	var instance = event.instance;
+	var state = instance.getState();
+	resetTouchStatus(instance);
+	var touch = event.touches[0];
+	if (IS_HTML5 && isPC()) {
+		touch = event;
+	}
+	state.startX = touch.clientX;
+	state.startY = touch.clientY;
+}
+
+/**
+ * 滑动中，是否禁止打开
+ * @param {Object} event
+ */
+function stopTouchMove(event) {
+	var instance = event.instance;
+	var state = instance.getState();
+	var touch = event.touches[0];
+	if (IS_HTML5 && isPC()) {
+		touch = event;
+	}
+	state.deltaX = touch.clientX - state.startX;
+	state.deltaY = touch.clientY - state.startY;
+	state.offsetY = Math.abs(state.deltaY);
+	state.offsetX = Math.abs(state.deltaX);
+	state.direction = state.direction || getDirection(state.offsetX, state.offsetY);
+}
+
+function isPC() {
+	var userAgentInfo = navigator.userAgent;
+	var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+	var flag = true;
+	for (var v = 0; v < Agents.length - 1; v++) {
+		if (userAgentInfo.indexOf(Agents[v]) > 0) {
+			flag = false;
+			break;
+		}
+	}
+	return flag;
+}
+
+var movable = false
+
+function mousedown(e, ins) {
+	if (!IS_HTML5) return
+	if (!isPC()) return
+	touchstart(e, ins)
+	movable = true
+}
+
+function mousemove(e, ins) {
+	if (!IS_HTML5) return
+	if (!isPC()) return
+	if (!movable) return
+	touchmove(e, ins)
+}
+
+function mouseup(e, ins) {
+	if (!IS_HTML5) return
+	if (!isPC()) return
+	touchend(e, ins)
+	movable = false
+}
+
+function mouseleave(e, ins) {
+	if (!IS_HTML5) return
+	if (!isPC()) return
+	movable = false
+}
+
+module.exports = {
+	showWatch: showWatch,
+	touchstart: touchstart,
+	touchmove: touchmove,
+	touchend: touchend,
+	mousedown: mousedown,
+	mousemove: mousemove,
+	mouseup: mouseup,
+	mouseleave: mouseleave
+}
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue b/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue
new file mode 100644
index 0000000..334a7c3
--- /dev/null
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue
@@ -0,0 +1,60 @@
+<template>
+	<view>
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	/**
+	 * SwipeAction 滑动操作
+	 * @description 通过滑动触发选项的容器
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=181
+	 */
+	export default {
+		name:"uniSwipeAction",
+		data() {
+			return {};
+		},
+		created() {
+			this.children = [];
+		},
+		methods: {
+			// 公开给用户使用，重制组件样式
+			resize(){
+				// wxs 会自己计算组件大小，所以无需执行下面代码
+				// #ifndef APP-VUE || H5 || MP-WEIXIN || MP-KUAISHOU
+				this.children.forEach(vm=>{
+					vm.init()
+				})
+				// #endif
+			},
+			// 公开给用户使用，关闭全部 已经打开的组件
+			closeAll(){
+				this.children.forEach(vm=>{
+					// #ifdef APP-VUE || H5 || MP-WEIXIN || MP-KUAISHOU
+					vm.is_show = 'none'
+					// #endif
+
+					// #ifndef APP-VUE || H5 || MP-WEIXIN || MP-KUAISHOU
+					vm.close()
+					// #endif
+				})
+			},
+			closeOther(vm) {
+				if (this.openItem && this.openItem !== vm) {
+					// #ifdef APP-VUE || H5 || MP-WEIXIN || MP-KUAISHOU
+					this.openItem.is_show = 'none'
+					// #endif
+
+					// #ifndef APP-VUE || H5 || MP-WEIXIN || MP-KUAISHOU
+					this.openItem.close()
+					// #endif
+				}
+				// 记录上一个打开的 swipe-action-item ,用于 auto-close
+				this.openItem = vm
+			}
+		}
+	};
+</script>
+
+<style></style>
diff --git a/uni_modules/uni-swipe-action/package.json b/uni_modules/uni-swipe-action/package.json
new file mode 100644
index 0000000..7938097
--- /dev/null
+++ b/uni_modules/uni-swipe-action/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-swipe-action",
+  "displayName": "uni-swipe-action 滑动操作",
+  "version": "1.3.3",
+  "description": "SwipeAction 滑动操作操作组件",
+  "keywords": [
+    "",
+    "uni-ui",
+    "uniui",
+    "滑动删除",
+    "侧滑删除"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-swipe-action/readme.md b/uni_modules/uni-swipe-action/readme.md
new file mode 100644
index 0000000..93a5cac
--- /dev/null
+++ b/uni_modules/uni-swipe-action/readme.md
@@ -0,0 +1,11 @@
+
+
+## SwipeAction 滑动操作
+> **组件名：uni-swipe-action**
+> 代码块： `uSwipeAction`、`uSwipeActionItem`
+
+
+通过滑动触发选项的容器
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-swipe-action)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-swiper-dot/changelog.md b/uni_modules/uni-swiper-dot/changelog.md
new file mode 100644
index 0000000..85cf54d
--- /dev/null
+++ b/uni_modules/uni-swiper-dot/changelog.md
@@ -0,0 +1,12 @@
+## 1.2.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-swiper-dot](https://uniapp.dcloud.io/component/uniui/uni-swiper-dot)
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.6（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的Bug
+## 1.0.5（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 clickItem 事件，支持指示点控制轮播
+- 新增 支持 pc 可用
diff --git a/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue b/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue
new file mode 100644
index 0000000..335e5ef
--- /dev/null
+++ b/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue
@@ -0,0 +1,218 @@
+<template>
+	<view class="uni-swiper__warp">
+		<slot />
+		<view v-if="mode === 'default'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='default'>
+			<view v-for="(item,index) in info" @tap="clickItem(index)" :style="{
+        'width': (index === current? dots.width*2:dots.width ) + 'px','height':dots.width/2 +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border-radius':'0px'}"
+			 :key="index" class="uni-swiper__dots-item uni-swiper__dots-bar" />
+		</view>
+		<view v-if="mode === 'dot'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='dot'>
+			<view v-for="(item,index) in info" @tap="clickItem(index)" :style="{
+        'width': dots.width + 'px','height':dots.height +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
+			 :key="index" class="uni-swiper__dots-item" />
+		</view>
+		<view v-if="mode === 'round'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='round'>
+			<view v-for="(item,index) in info" @tap="clickItem(index)" :class="[index === current&&'uni-swiper__dots-long']" :style="{
+		    'width':(index === current? dots.width*3:dots.width ) + 'px','height':dots.height +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
+			 :key="index" class="uni-swiper__dots-item " />
+		</view>
+		<view v-if="mode === 'nav'" key='nav' :style="{'background-color':dotsStyles.backgroundColor,'bottom':'0'}" class="uni-swiper__dots-box uni-swiper__dots-nav">
+			<text :style="{'color':dotsStyles.color}" class="uni-swiper__dots-nav-item">{{ (current+1)+"/"+info.length +' ' +info[current][field] }}</text>
+		</view>
+		<view v-if="mode === 'indexes'" key='indexes' :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box">
+			<view v-for="(item,index) in info" @tap="clickItem(index)" :style="{
+        'width':dots.width + 'px','height':dots.height +'px' ,'color':index === current?dots.selectedColor:dots.color,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
+			 :key="index" class="uni-swiper__dots-item uni-swiper__dots-indexes"><text class="uni-swiper__dots-indexes-text">{{ index+1 }}</text></view>
+		</view>
+	</view>
+</template>
+
+<script>
+
+	/**
+	 * SwiperDod 轮播图指示点
+	 * @description 自定义轮播图指示点
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=284
+	 * @property {Number} current 当前指示点索引，必须是通过 `swiper` 的 `change` 事件获取到的 `e.detail.current`
+	 * @property {String} mode = [default|round|nav|indexes] 指示点的类型
+	 * 	@value defualt 默认指示点
+	 * 	@value round 圆形指示点
+	 * 	@value nav 条形指示点
+	 * 	@value indexes 索引指示点
+	 * @property {String} field mode 为 nav 时，显示的内容字段（mode = nav 时必填）
+	 * @property {String} info 轮播图的数据，通过数组长度决定指示点个数
+	 * @property {Object} dotsStyles 指示点样式
+	 * @event {Function} clickItem 组件触发点击事件时触发，e={currentIndex}
+	 */
+
+	export default {
+		name: 'UniSwiperDot',
+		emits:['clickItem'],
+		props: {
+			info: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			current: {
+				type: Number,
+				default: 0
+			},
+			dotsStyles: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 类型 ：default(默认) indexes long nav
+			mode: {
+				type: String,
+				default: 'default'
+			},
+			// 只在 nav 模式下生效，变量名称
+			field: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				dots: {
+					width: 6,
+					height: 6,
+					bottom: 10,
+					color: '#fff',
+					backgroundColor: 'rgba(0, 0, 0, .3)',
+					border: '1px rgba(0, 0, 0, .3) solid',
+					selectedBackgroundColor: '#333',
+					selectedBorder: '1px rgba(0, 0, 0, .9) solid'
+				}
+			}
+		},
+		watch: {
+			dotsStyles(newVal) {
+				this.dots = Object.assign(this.dots, this.dotsStyles)
+			},
+			mode(newVal) {
+				if (newVal === 'indexes') {
+					this.dots.width = 14
+					this.dots.height = 14
+				} else {
+					this.dots.width = 6
+					this.dots.height = 6
+				}
+			}
+
+		},
+		created() {
+			if (this.mode === 'indexes') {
+				this.dots.width = 12
+				this.dots.height = 12
+			}
+			this.dots = Object.assign(this.dots, this.dotsStyles)
+		},
+		methods: {
+			clickItem(index) {
+				this.$emit('clickItem', index)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-swiper__warp {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: column;
+		position: relative;
+		overflow: hidden;
+	}
+
+	.uni-swiper__dots-box {
+		position: absolute;
+		bottom: 10px;
+		left: 0;
+		right: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.uni-swiper__dots-item {
+		width: 8px;
+		border-radius: 100px;
+		margin-left: 6px;
+		background-color: rgba(0, 0, 0, 0.4);
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+		/* #ifdef H5 */
+		// border-width: 5px 0;
+		// border-style: solid;
+		// border-color: transparent;
+		// background-clip: padding-box;
+		/* #endif */
+		// transition: width 0.2s linear;  不要取消注释，不然会不能变色
+	}
+
+	.uni-swiper__dots-item:first-child {
+		margin: 0;
+	}
+
+	.uni-swiper__dots-default {
+		border-radius: 100px;
+	}
+
+	.uni-swiper__dots-long {
+		border-radius: 50px;
+	}
+
+	.uni-swiper__dots-bar {
+		border-radius: 50px;
+	}
+
+	.uni-swiper__dots-nav {
+		bottom: 0px;
+		// height: 26px;
+		padding: 8px 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		justify-content: flex-start;
+		align-items: center;
+		background-color: rgba(0, 0, 0, 0.2);
+	}
+
+	.uni-swiper__dots-nav-item {
+		/* overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap; */
+		font-size: 14px;
+		color: #fff;
+		margin: 0 15px;
+	}
+
+	.uni-swiper__dots-indexes {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		// flex: 1;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.uni-swiper__dots-indexes-text {
+		color: #fff;
+		font-size: 12px;
+		line-height: 14px;
+	}
+</style>
diff --git a/uni_modules/uni-swiper-dot/package.json b/uni_modules/uni-swiper-dot/package.json
new file mode 100644
index 0000000..f2dd8d2
--- /dev/null
+++ b/uni_modules/uni-swiper-dot/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-swiper-dot",
+  "displayName": "uni-swiper-dot 轮播图指示点",
+  "version": "1.2.0",
+  "description": "自定义轮播图指示点组件",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "轮播图指示点",
+    "dot",
+    "swiper"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-swiper-dot/readme.md b/uni_modules/uni-swiper-dot/readme.md
new file mode 100644
index 0000000..7d397e2
--- /dev/null
+++ b/uni_modules/uni-swiper-dot/readme.md
@@ -0,0 +1,11 @@
+
+
+## SwiperDot 轮播图指示点
+> **组件名：uni-swiper-dot**
+> 代码块： `uSwiperDot`
+
+
+自定义轮播图指示点
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-swiper-dot)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-transition/changelog.md b/uni_modules/uni-transition/changelog.md
new file mode 100644
index 0000000..70c1cd4
--- /dev/null
+++ b/uni_modules/uni-transition/changelog.md
@@ -0,0 +1,22 @@
+## 1.3.2（2023-05-04）
+- 修复 NVUE 平台报错的问题
+## 1.3.1（2021-11-23）
+- 修复 init 方法初始化问题
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-transition](https://uniapp.dcloud.io/component/uniui/uni-transition)
+## 1.2.1（2021-09-27）
+- 修复 init 方法不生效的 Bug
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.1（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的 Bug
+## 1.1.0（2021-04-22）
+- 新增 通过方法自定义动画
+- 新增 custom-class 非 NVUE 平台支持自定义 class 定制样式
+- 优化 动画触发逻辑，使动画更流畅
+- 优化 支持单独的动画类型
+- 优化 文档示例
+## 1.0.2（2021-02-05）
+- 调整为 uni_modules 目录规范
diff --git a/uni_modules/uni-transition/components/uni-transition/createAnimation.js b/uni_modules/uni-transition/components/uni-transition/createAnimation.js
new file mode 100644
index 0000000..8f89b18
--- /dev/null
+++ b/uni_modules/uni-transition/components/uni-transition/createAnimation.js
@@ -0,0 +1,131 @@
+// const defaultOption = {
+// 	duration: 300,
+// 	timingFunction: 'linear',
+// 	delay: 0,
+// 	transformOrigin: '50% 50% 0'
+// }
+// #ifdef APP-NVUE
+const nvueAnimation = uni.requireNativePlugin('animation')
+// #endif
+class MPAnimation {
+	constructor(options, _this) {
+		this.options = options
+		// 在iOS10+QQ小程序平台下，传给原生的对象一定是个普通对象而不是Proxy对象，否则会报parameter should be Object instead of ProxyObject的错误
+		this.animation = uni.createAnimation({
+			...options
+		})
+		this.currentStepAnimates = {}
+		this.next = 0
+		this.$ = _this
+
+	}
+
+	_nvuePushAnimates(type, args) {
+		let aniObj = this.currentStepAnimates[this.next]
+		let styles = {}
+		if (!aniObj) {
+			styles = {
+				styles: {},
+				config: {}
+			}
+		} else {
+			styles = aniObj
+		}
+		if (animateTypes1.includes(type)) {
+			if (!styles.styles.transform) {
+				styles.styles.transform = ''
+			}
+			let unit = ''
+			if(type === 'rotate'){
+				unit = 'deg'
+			}
+			styles.styles.transform += `${type}(${args+unit}) `
+		} else {
+			styles.styles[type] = `${args}`
+		}
+		this.currentStepAnimates[this.next] = styles
+	}
+	_animateRun(styles = {}, config = {}) {
+		let ref = this.$.$refs['ani'].ref
+		if (!ref) return
+		return new Promise((resolve, reject) => {
+			nvueAnimation.transition(ref, {
+				styles,
+				...config
+			}, res => {
+				resolve()
+			})
+		})
+	}
+
+	_nvueNextAnimate(animates, step = 0, fn) {
+		let obj = animates[step]
+		if (obj) {
+			let {
+				styles,
+				config
+			} = obj
+			this._animateRun(styles, config).then(() => {
+				step += 1
+				this._nvueNextAnimate(animates, step, fn)
+			})
+		} else {
+			this.currentStepAnimates = {}
+			typeof fn === 'function' && fn()
+			this.isEnd = true
+		}
+	}
+
+	step(config = {}) {
+		// #ifndef APP-NVUE
+		this.animation.step(config)
+		// #endif
+		// #ifdef APP-NVUE
+		this.currentStepAnimates[this.next].config = Object.assign({}, this.options, config)
+		this.currentStepAnimates[this.next].styles.transformOrigin = this.currentStepAnimates[this.next].config.transformOrigin
+		this.next++
+		// #endif
+		return this
+	}
+
+	run(fn) {
+		// #ifndef APP-NVUE
+		this.$.animationData = this.animation.export()
+		this.$.timer = setTimeout(() => {
+			typeof fn === 'function' && fn()
+		}, this.$.durationTime)
+		// #endif
+		// #ifdef APP-NVUE
+		this.isEnd = false
+		let ref = this.$.$refs['ani'] && this.$.$refs['ani'].ref
+		if(!ref) return
+		this._nvueNextAnimate(this.currentStepAnimates, 0, fn)
+		this.next = 0
+		// #endif
+	}
+}
+
+
+const animateTypes1 = ['matrix', 'matrix3d', 'rotate', 'rotate3d', 'rotateX', 'rotateY', 'rotateZ', 'scale', 'scale3d',
+	'scaleX', 'scaleY', 'scaleZ', 'skew', 'skewX', 'skewY', 'translate', 'translate3d', 'translateX', 'translateY',
+	'translateZ'
+]
+const animateTypes2 = ['opacity', 'backgroundColor']
+const animateTypes3 = ['width', 'height', 'left', 'right', 'top', 'bottom']
+animateTypes1.concat(animateTypes2, animateTypes3).forEach(type => {
+	MPAnimation.prototype[type] = function(...args) {
+		// #ifndef APP-NVUE
+		this.animation[type](...args)
+		// #endif
+		// #ifdef APP-NVUE
+		this._nvuePushAnimates(type, args)
+		// #endif
+		return this
+	}
+})
+
+export function createAnimation(option, _this) {
+	if(!_this) return
+	clearTimeout(_this.timer)
+	return new MPAnimation(option, _this)
+}
diff --git a/uni_modules/uni-transition/components/uni-transition/uni-transition.vue b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
new file mode 100644
index 0000000..bfbba93
--- /dev/null
+++ b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
@@ -0,0 +1,286 @@
+<template>
+  <!-- #ifndef APP-NVUE -->
+  <view v-show="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
+  <!-- #endif -->
+  <!-- #ifdef APP-NVUE -->
+  <view v-if="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
+  <!-- #endif -->
+</template>
+
+<script>
+import { createAnimation } from './createAnimation'
+
+/**
+ * Transition 过渡动画
+ * @description 简单过渡动画组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=985
+ * @property {Boolean} show = [false|true] 控制组件显示或隐藏
+ * @property {Array|String} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
+ *  @value fade 渐隐渐出过渡
+ *  @value slide-top 由上至下过渡
+ *  @value slide-right 由右至左过渡
+ *  @value slide-bottom 由下至上过渡
+ *  @value slide-left 由左至右过渡
+ *  @value zoom-in 由小到大过渡
+ *  @value zoom-out 由大到小过渡
+ * @property {Number} duration 过渡动画持续时间
+ * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
+ */
+export default {
+	name: 'uniTransition',
+	emits:['click','change'],
+	props: {
+		show: {
+			type: Boolean,
+			default: false
+		},
+		modeClass: {
+			type: [Array, String],
+			default() {
+				return 'fade'
+			}
+		},
+		duration: {
+			type: Number,
+			default: 300
+		},
+		styles: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		customClass:{
+			type: String,
+			default: ''
+		},
+		onceRender:{
+			type:Boolean,
+			default:false
+		},
+	},
+	data() {
+		return {
+			isShow: false,
+			transform: '',
+			opacity: 1,
+			animationData: {},
+			durationTime: 300,
+			config: {}
+		}
+	},
+	watch: {
+		show: {
+			handler(newVal) {
+				if (newVal) {
+					this.open()
+				} else {
+					// 避免上来就执行 close,导致动画错乱
+					if (this.isShow) {
+						this.close()
+					}
+				}
+			},
+			immediate: true
+		}
+	},
+	computed: {
+		// 生成样式数据
+		stylesObject() {
+			let styles = {
+				...this.styles,
+				'transition-duration': this.duration / 1000 + 's'
+			}
+			let transform = ''
+			for (let i in styles) {
+				let line = this.toLine(i)
+				transform += line + ':' + styles[i] + ';'
+			}
+			return transform
+		},
+		// 初始化动画条件
+		transformStyles() {
+			return 'transform:' + this.transform + ';' + 'opacity:' + this.opacity + ';' + this.stylesObject
+		}
+	},
+	created() {
+		// 动画默认配置
+		this.config = {
+			duration: this.duration,
+			timingFunction: 'ease',
+			transformOrigin: '50% 50%',
+			delay: 0
+		}
+		this.durationTime = this.duration
+	},
+	methods: {
+		/**
+		 *  ref 触发 初始化动画
+		 */
+		init(obj = {}) {
+			if (obj.duration) {
+				this.durationTime = obj.duration
+			}
+			this.animation = createAnimation(Object.assign(this.config, obj),this)
+		},
+		/**
+		 * 点击组件触发回调
+		 */
+		onClick() {
+			this.$emit('click', {
+				detail: this.isShow
+			})
+		},
+		/**
+		 * ref 触发 动画分组
+		 * @param {Object} obj
+		 */
+		step(obj, config = {}) {
+			if (!this.animation) return
+			for (let i in obj) {
+				try {
+					if(typeof obj[i] === 'object'){
+						this.animation[i](...obj[i])
+					}else{
+						this.animation[i](obj[i])
+					}
+				} catch (e) {
+					console.error(`方法 ${i} 不存在`)
+				}
+			}
+			this.animation.step(config)
+			return this
+		},
+		/**
+		 *  ref 触发 执行动画
+		 */
+		run(fn) {
+			if (!this.animation) return
+			this.animation.run(fn)
+		},
+		// 开始过度动画
+		open() {
+			clearTimeout(this.timer)
+			this.transform = ''
+			this.isShow = true
+			let { opacity, transform } = this.styleInit(false)
+			if (typeof opacity !== 'undefined') {
+				this.opacity = opacity
+			}
+			this.transform = transform
+			// 确保动态样式已经生效后，执行动画，如果不加 nextTick ，会导致 wx 动画执行异常
+			this.$nextTick(() => {
+				// TODO 定时器保证动画完全执行，目前有些问题，后面会取消定时器
+				this.timer = setTimeout(() => {
+					this.animation = createAnimation(this.config, this)
+					this.tranfromInit(false).step()
+					this.animation.run()
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				}, 20)
+			})
+		},
+		// 关闭过度动画
+		close(type) {
+			if (!this.animation) return
+			this.tranfromInit(true)
+				.step()
+				.run(() => {
+					this.isShow = false
+					this.animationData = null
+					this.animation = null
+					let { opacity, transform } = this.styleInit(false)
+					this.opacity = opacity || 1
+					this.transform = transform
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				})
+		},
+		// 处理动画开始前的默认样式
+		styleInit(type) {
+			let styles = {
+				transform: ''
+			}
+			let buildStyle = (type, mode) => {
+				if (mode === 'fade') {
+					styles.opacity = this.animationType(type)[mode]
+				} else {
+					styles.transform += this.animationType(type)[mode] + ' '
+				}
+			}
+			if (typeof this.modeClass === 'string') {
+				buildStyle(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildStyle(type, mode)
+				})
+			}
+			return styles
+		},
+		// 处理内置组合动画
+		tranfromInit(type) {
+			let buildTranfrom = (type, mode) => {
+				let aniNum = null
+				if (mode === 'fade') {
+					aniNum = type ? 0 : 1
+				} else {
+					aniNum = type ? '-100%' : '0'
+					if (mode === 'zoom-in') {
+						aniNum = type ? 0.8 : 1
+					}
+					if (mode === 'zoom-out') {
+						aniNum = type ? 1.2 : 1
+					}
+					if (mode === 'slide-right') {
+						aniNum = type ? '100%' : '0'
+					}
+					if (mode === 'slide-bottom') {
+						aniNum = type ? '100%' : '0'
+					}
+				}
+				this.animation[this.animationMode()[mode]](aniNum)
+			}
+			if (typeof this.modeClass === 'string') {
+				buildTranfrom(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildTranfrom(type, mode)
+				})
+			}
+
+			return this.animation
+		},
+		animationType(type) {
+			return {
+				fade: type ? 1 : 0,
+				'slide-top': `translateY(${type ? '0' : '-100%'})`,
+				'slide-right': `translateX(${type ? '0' : '100%'})`,
+				'slide-bottom': `translateY(${type ? '0' : '100%'})`,
+				'slide-left': `translateX(${type ? '0' : '-100%'})`,
+				'zoom-in': `scaleX(${type ? 1 : 0.8}) scaleY(${type ? 1 : 0.8})`,
+				'zoom-out': `scaleX(${type ? 1 : 1.2}) scaleY(${type ? 1 : 1.2})`
+			}
+		},
+		// 内置动画类型与实际动画对应字典
+		animationMode() {
+			return {
+				fade: 'opacity',
+				'slide-top': 'translateY',
+				'slide-right': 'translateX',
+				'slide-bottom': 'translateY',
+				'slide-left': 'translateX',
+				'zoom-in': 'scale',
+				'zoom-out': 'scale'
+			}
+		},
+		// 驼峰转中横线
+		toLine(name) {
+			return name.replace(/([A-Z])/g, '-$1').toLowerCase()
+		}
+	}
+}
+</script>
+
+<style></style>
diff --git a/uni_modules/uni-transition/package.json b/uni_modules/uni-transition/package.json
new file mode 100644
index 0000000..ea995a2
--- /dev/null
+++ b/uni_modules/uni-transition/package.json
@@ -0,0 +1,84 @@
+{
+  "id": "uni-transition",
+  "displayName": "uni-transition 过渡动画",
+  "version": "1.3.2",
+  "description": "元素的简单过渡动画",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "动画",
+    "过渡",
+    "过渡动画"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-transition/readme.md b/uni_modules/uni-transition/readme.md
new file mode 100644
index 0000000..2f8a77e
--- /dev/null
+++ b/uni_modules/uni-transition/readme.md
@@ -0,0 +1,11 @@
+
+
+## Transition 过渡动画
+> **组件名：uni-transition**
+> 代码块： `uTransition`
+
+
+元素过渡动画
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-transition)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/changelog.md b/uni_modules/uv-ui-tools/changelog.md
new file mode 100644
index 0000000..998373e
--- /dev/null
+++ b/uni_modules/uv-ui-tools/changelog.md
@@ -0,0 +1,76 @@
+## 1.1.25（2024-01-20）
+1.1.20版本更新
+## 1.1.24（2023-12-21）
+1. luch-request更新
+## 1.1.23（2023-12-12）
+1. 1.1.19版本
+## 1.1.22（2023-11-28）
+1. 优化
+## 1.1.21（2023-11-10）
+1. 1.1.17版本
+## 1.1.20（2023-10-30）
+1. 1.1.16版本
+## 1.1.19（2023-10-13）
+1. 兼容vue3
+## 1.1.18（2023-10-12）
+1. 1.1.15版本
+## 1.1.17（2023-09-27）
+1. 1.1.14版本发布
+## 1.1.16（2023-09-15）
+1. 1.1.13版本发布
+## 1.1.15（2023-09-15）
+1. 更新button.js相关按钮支持open-type="agreePrivacyAuthorization"
+## 1.1.14（2023-09-14）
+1. 优化dayjs
+## 1.1.13（2023-09-13）
+1. 优化，$uv中增加unit参数，方便组件中使用
+## 1.1.12（2023-09-10）
+1. 升级版本
+## 1.1.11（2023-09-04）
+1. 1.1.11版本
+## 1.1.10（2023-08-31）
+1. 修复customStyle和customClass存在冲突的问题
+## 1.1.9（2023-08-27）
+1. 版本升级
+2. 优化
+## 1.1.8（2023-08-24）
+1. 版本升级
+## 1.1.7（2023-08-22）
+1. 版本升级
+## 1.1.6（2023-08-18）
+uvui版本：1.1.6
+## 1.0.15（2023-08-14）
+1. 更新uvui版本号
+## 1.0.13（2023-08-06）
+1. 优化
+## 1.0.12（2023-08-06）
+1. 修改版本号
+## 1.0.11（2023-08-06）
+1. 路由增加events参数
+2. 路由拦截修复
+## 1.0.10（2023-08-01）
+1. 优化
+## 1.0.9（2023-06-28）
+优化openType.js
+## 1.0.8（2023-06-15）
+1. 修改支付宝报错的BUG
+## 1.0.7（2023-06-07）
+1. 解决微信小程序使用uvui提示 Some selectors are not allowed in component wxss, including tag name selectors, ID selectors, and attribute selectors
+2. 解决上述提示，需要在uni.scss配置$uvui-nvue-style: false; 然后在APP.vue下面引入uvui内置的基础样式:@import '@/uni_modules/uv-ui-tools/index.scss';
+## 1.0.6（2023-06-04）
+1.  uv-ui-tools 优化工具组件，兼容更多功能
+2.  小程序分享功能优化等
+## 1.0.5（2023-06-02）
+1. 修改扩展使用mixin中方法的问题
+## 1.0.4（2023-05-23）
+1. 兼容百度小程序修改bem函数
+## 1.0.3（2023-05-16）
+1. 优化组件依赖，修改后无需全局引入，组件导入即可使用
+2. 优化部分功能
+## 1.0.2（2023-05-10）
+1. 增加Http请求封装
+2. 优化
+## 1.0.1（2023-05-04）
+1. 修改名称及备注
+## 1.0.0（2023-05-04）
+1. uv-ui工具集首次发布
diff --git a/uni_modules/uv-ui-tools/components/uv-ui-tools/uv-ui-tools.vue b/uni_modules/uv-ui-tools/components/uv-ui-tools/uv-ui-tools.vue
new file mode 100644
index 0000000..baf45e9
--- /dev/null
+++ b/uni_modules/uv-ui-tools/components/uv-ui-tools/uv-ui-tools.vue
@@ -0,0 +1,6 @@
+<template>
+</template>
+<script>
+</script>
+<style>
+</style>
diff --git a/uni_modules/uv-ui-tools/index.js b/uni_modules/uv-ui-tools/index.js
new file mode 100644
index 0000000..71a8b66
--- /dev/null
+++ b/uni_modules/uv-ui-tools/index.js
@@ -0,0 +1,79 @@
+// 全局挂载引入http相关请求拦截插件
+import Request from './libs/luch-request'
+
+// 引入全局mixin
+import mixin from './libs/mixin/mixin.js'
+// 小程序特有的mixin
+import mpMixin from './libs/mixin/mpMixin.js'
+// #ifdef MP
+import mpShare from './libs/mixin/mpShare.js'
+// #endif
+
+// 路由封装
+import route from './libs/util/route.js'
+// 公共工具函数
+import * as index from './libs/function/index.js'
+// 防抖方法
+import debounce from './libs/function/debounce.js'
+// 节流方法
+import throttle from './libs/function/throttle.js'
+// 规则检验
+import * as test from './libs/function/test.js'
+
+// 颜色渐变相关,colorGradient-颜色渐变,hexToRgb-十六进制颜色转rgb颜色,rgbToHex-rgb转十六进制
+import * as colorGradient from './libs/function/colorGradient.js'
+
+// 配置信息
+import config from './libs/config/config.js'
+// 平台
+import platform from './libs/function/platform'
+
+const $uv = {
+	route,
+	config,
+	test,
+	date: index.timeFormat, // 另名date
+	...index,
+	colorGradient: colorGradient.colorGradient,
+	hexToRgb: colorGradient.hexToRgb,
+	rgbToHex: colorGradient.rgbToHex,
+	colorToRgba: colorGradient.colorToRgba,
+	http: new Request(),
+	debounce,
+	throttle,
+	platform,
+	mixin,
+	mpMixin
+}
+uni.$uv = $uv;
+const install = (Vue,options={}) => {
+		// #ifndef APP-NVUE
+		const cloneMixin = index.deepClone(mixin);
+		delete cloneMixin?.props?.customClass;
+		delete cloneMixin?.props?.customStyle;
+		Vue.mixin(cloneMixin);
+		// #ifdef MP
+		if(options.mpShare){
+			Vue.mixin(mpShare);
+		}
+		// #endif
+		// #endif
+		// #ifdef VUE2
+		// 时间格式化，同时两个名称，date和timeFormat
+		Vue.filter('timeFormat', (timestamp, format) => uni.$uv.timeFormat(timestamp, format));
+		Vue.filter('date', (timestamp, format) => uni.$uv.timeFormat(timestamp, format));
+		// 将多久以前的方法，注入到全局过滤器
+		Vue.filter('timeFrom', (timestamp, format) => uni.$uv.timeFrom(timestamp, format));
+		// 同时挂载到uni和Vue.prototype中
+		// #ifndef APP-NVUE
+		// 只有vue，挂载到Vue.prototype才有意义，因为nvue中全局Vue.prototype和Vue.mixin是无效的
+		Vue.prototype.$uv = $uv;
+		// #endif
+		// #endif
+		// #ifdef VUE3
+		Vue.config.globalProperties.$uv = $uv;
+		// #endif
+}
+export default {
+	install
+}
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/index.scss b/uni_modules/uv-ui-tools/index.scss
new file mode 100644
index 0000000..8d05b8d
--- /dev/null
+++ b/uni_modules/uv-ui-tools/index.scss
@@ -0,0 +1,7 @@
+// 引入公共基础类
+@import "./libs/css/common.scss";
+
+// 非nvue的样式
+/* #ifndef APP-NVUE */
+@import "./libs/css/vue.scss";
+/* #endif */
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/libs/config/config.js b/uni_modules/uv-ui-tools/libs/config/config.js
new file mode 100644
index 0000000..f18ae74
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/config/config.js
@@ -0,0 +1,34 @@
+// 此版本发布于2024-01-20
+const version = '1.1.20'
+
+// 开发环境才提示，生产环境不会提示
+if (process.env.NODE_ENV === 'development') {
+	console.log(`\n %c uvui V${version} https://www.uvui.cn/ \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0; border-radius: 5px;');
+}
+
+export default {
+    v: version,
+    version,
+    // 主题名称
+    type: [
+        'primary',
+        'success',
+        'info',
+        'error',
+        'warning'
+    ],
+    // 颜色部分，本来可以通过scss的:export导出供js使用，但是奈何nvue不支持
+    color: {
+        'uv-primary': '#2979ff',
+        'uv-warning': '#ff9900',
+        'uv-success': '#19be6b',
+        'uv-error': '#fa3534',
+        'uv-info': '#909399',
+        'uv-main-color': '#303133',
+        'uv-content-color': '#606266',
+        'uv-tips-color': '#909399',
+        'uv-light-color': '#c0c4cc'
+    },
+	// 默认单位，可以通过配置为rpx，那么在用于传入组件大小参数为数值时，就默认为rpx
+	unit: 'px'
+}
diff --git a/uni_modules/uv-ui-tools/libs/css/color.scss b/uni_modules/uv-ui-tools/libs/css/color.scss
new file mode 100644
index 0000000..ce65743
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/css/color.scss
@@ -0,0 +1,32 @@
+$uv-main-color: #303133 !default;
+$uv-content-color: #606266 !default;
+$uv-tips-color: #909193 !default;
+$uv-light-color: #c0c4cc !default;
+$uv-border-color: #dadbde !default;
+$uv-bg-color: #f3f4f6 !default;
+$uv-disabled-color: #c8c9cc !default;
+
+$uv-primary: #3c9cff !default;
+$uv-primary-dark: #398ade !default;
+$uv-primary-disabled: #9acafc !default;
+$uv-primary-light: #ecf5ff !default;
+
+$uv-warning: #f9ae3d !default;
+$uv-warning-dark: #f1a532 !default;
+$uv-warning-disabled: #f9d39b !default;
+$uv-warning-light: #fdf6ec !default;
+
+$uv-success: #5ac725 !default;
+$uv-success-dark: #53c21d !default;
+$uv-success-disabled: #a9e08f !default;
+$uv-success-light: #f5fff0;
+
+$uv-error: #f56c6c !default;
+$uv-error-dark: #e45656 !default;
+$uv-error-disabled: #f7b2b2 !default;
+$uv-error-light: #fef0f0 !default;
+
+$uv-info: #909399 !default;
+$uv-info-dark: #767a82 !default;
+$uv-info-disabled: #c4c6c9 !default;
+$uv-info-light: #f4f4f5 !default;
diff --git a/uni_modules/uv-ui-tools/libs/css/common.scss b/uni_modules/uv-ui-tools/libs/css/common.scss
new file mode 100644
index 0000000..7ab99f8
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/css/common.scss
@@ -0,0 +1,100 @@
+// 超出行数，自动显示行尾省略号，最多5行
+// 来自uvui的温馨提示：当您在控制台看到此报错，说明需要在App.vue的style标签加上【lang="scss"】
+@for $i from 1 through 5 {
+	.uv-line-#{$i} {
+		/* #ifdef APP-NVUE */
+		// nvue下，可以直接使用lines属性，这是weex特有样式
+		lines: $i;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		flex: 1;
+		/* #endif */
+
+		/* #ifndef APP-NVUE */
+		// vue下，单行和多行显示省略号需要单独处理
+		@if $i == '1' {
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		} @else {
+			display: -webkit-box!important;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			word-break: break-all;
+			-webkit-line-clamp: $i;
+			-webkit-box-orient: vertical!important;
+		}
+		/* #endif */
+	}
+}
+$uv-bordercolor: #dadbde;
+@if variable-exists(uv-border-color) {
+	$uv-bordercolor: $uv-border-color;
+}
+
+// 此处加上!important并非随意乱用，而是因为目前*.nvue页面编译到H5时，
+// App.vue的样式会被uni-app的view元素的自带border属性覆盖，导致无效
+// 综上，这是uni-app的缺陷导致我们为了多端兼容，而必须要加上!important
+// 移动端兼容性较好，直接使用0.5px去实现细边框，不使用伪元素形式实现
+.uv-border {
+	border-width: 0.5px!important;
+	border-color: $uv-bordercolor!important;
+    border-style: solid;
+}
+
+.uv-border-top {
+	border-top-width: 0.5px!important;
+	border-color: $uv-bordercolor!important;
+    border-top-style: solid;
+}
+
+.uv-border-left {
+	border-left-width: 0.5px!important;
+	border-color: $uv-bordercolor!important;
+    border-left-style: solid;
+}
+
+.uv-border-right {
+	border-right-width: 0.5px!important;
+	border-color: $uv-bordercolor!important;
+    border-right-style: solid;
+}
+
+.uv-border-bottom {
+	border-bottom-width: 0.5px!important;
+	border-color: $uv-bordercolor!important;
+    border-bottom-style: solid;
+}
+
+.uv-border-top-bottom {
+	border-top-width: 0.5px!important;
+	border-bottom-width: 0.5px!important;
+	border-color: $uv-bordercolor!important;
+    border-top-style: solid;
+    border-bottom-style: solid;
+}
+
+// 去除button的所有默认样式，让其表现跟普通的view、text元素一样
+.uv-reset-button {
+	padding: 0;
+	background-color: transparent;
+	/* #ifndef APP-PLUS */
+	font-size: inherit;
+	line-height: inherit;
+	color: inherit;
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	border-width: 0;
+	/* #endif */
+}
+
+/* #ifndef APP-NVUE */
+.uv-reset-button::after {
+   border: none;
+}
+/* #endif */
+
+.uv-hover-class {
+	opacity: 0.7;
+}
+
diff --git a/uni_modules/uv-ui-tools/libs/css/components.scss b/uni_modules/uv-ui-tools/libs/css/components.scss
new file mode 100644
index 0000000..81ce15d
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/css/components.scss
@@ -0,0 +1,23 @@
+@mixin flex($direction: row) {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: $direction;
+}
+
+/* #ifndef APP-NVUE */
+// 由于uvui是基于nvue环境进行开发的，此环境中普通元素默认为flex-direction: column;
+// 所以在非nvue中，需要对元素进行重置为flex-direction: column; 否则可能会表现异常
+$uvui-nvue-style: true !default;
+@if $uvui-nvue-style == true {
+	view, scroll-view, swiper-item {
+		display: flex;
+		flex-direction: column;
+		flex-shrink: 0;
+		flex-grow: 0;
+		flex-basis: auto;
+		align-items: stretch;
+		align-content: flex-start;
+	}
+}
+/* #endif */
diff --git a/uni_modules/uv-ui-tools/libs/css/variable.scss b/uni_modules/uv-ui-tools/libs/css/variable.scss
new file mode 100644
index 0000000..63903c9
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/css/variable.scss
@@ -0,0 +1,111 @@
+// 超出行数，自动显示行尾省略号，最多5行
+// 来自uvui的温馨提示：当您在控制台看到此报错，说明需要在App.vue的style标签加上【lang="scss"】
+@if variable-exists(show-lines) {
+	@for $i from 1 through 5 {
+		.uv-line-#{$i} {
+			/* #ifdef APP-NVUE */
+			// nvue下，可以直接使用lines属性，这是weex特有样式
+			lines: $i;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			flex: 1;
+			/* #endif */
+
+			/* #ifndef APP-NVUE */
+			// vue下，单行和多行显示省略号需要单独处理
+			@if $i == '1' {
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+			} @else {
+				display: -webkit-box!important;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				word-break: break-all;
+				-webkit-line-clamp: $i;
+				-webkit-box-orient: vertical!important;
+			}
+			/* #endif */
+		}
+	}
+}
+@if variable-exists(show-border) {
+	$uv-bordercolor: #dadbde;
+	@if variable-exists(uv-border-color) {
+		$uv-bordercolor: $uv-border-color;
+	}
+	// 此处加上!important并非随意乱用，而是因为目前*.nvue页面编译到H5时，
+	// App.vue的样式会被uni-app的view元素的自带border属性覆盖，导致无效
+	// 综上，这是uni-app的缺陷导致我们为了多端兼容，而必须要加上!important
+	// 移动端兼容性较好，直接使用0.5px去实现细边框，不使用伪元素形式实现
+	@if variable-exists(show-border-surround) {
+		.uv-border {
+			border-width: 0.5px!important;
+			border-color: $uv-bordercolor!important;
+			border-style: solid;
+		}
+	}
+	@if variable-exists(show-border-top) {
+		.uv-border-top {
+			border-top-width: 0.5px!important;
+			border-color: $uv-bordercolor!important;
+			border-top-style: solid;
+		}
+	}
+	@if variable-exists(show-border-left) {
+		.uv-border-left {
+			border-left-width: 0.5px!important;
+			border-color: $uv-bordercolor!important;
+			border-left-style: solid;
+		}
+	}
+	@if variable-exists(show-border-right) {
+		.uv-border-right {
+			border-right-width: 0.5px!important;
+			border-color: $uv-bordercolor!important;
+			border-right-style: solid;
+		}
+	}
+	@if variable-exists(show-border-bottom) {
+		.uv-border-bottom {
+			border-bottom-width: 0.5px!important;
+			border-color: $uv-bordercolor!important;
+				border-bottom-style: solid;
+		}
+	}
+	@if variable-exists(show-border-top-bottom) {
+		.uv-border-top-bottom {
+			border-top-width: 0.5px!important;
+			border-bottom-width: 0.5px!important;
+			border-color: $uv-bordercolor!important;
+			border-top-style: solid;
+			border-bottom-style: solid;
+		}
+	}
+}
+@if variable-exists(show-reset-button) {
+	// 去除button的所有默认样式，让其表现跟普通的view、text元素一样
+	.uv-reset-button {
+		padding: 0;
+		background-color: transparent;
+		/* #ifndef APP-PLUS */
+		font-size: inherit;
+		line-height: inherit;
+		color: inherit;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		border-width: 0;
+		/* #endif */
+	}
+
+	/* #ifndef APP-NVUE */
+	.uv-reset-button::after {
+		 border: none;
+	}
+	/* #endif */
+}
+@if variable-exists(show-hover) {
+	.uv-hover-class {
+		opacity: 0.7;
+	}
+}
diff --git a/uni_modules/uv-ui-tools/libs/css/vue.scss b/uni_modules/uv-ui-tools/libs/css/vue.scss
new file mode 100644
index 0000000..bdbefdd
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/css/vue.scss
@@ -0,0 +1,40 @@
+// 历遍生成4个方向的底部安全区
+@each $d in top, right, bottom, left {
+	.uv-safe-area-inset-#{$d} {
+		padding-#{$d}: 0;
+		padding-#{$d}: constant(safe-area-inset-#{$d});  
+		padding-#{$d}: env(safe-area-inset-#{$d});  
+	}
+}
+
+//提升H5端uni.toast()的层级，避免被uvui的modal等遮盖
+/* #ifdef H5 */
+uni-toast {
+    z-index: 10090;
+}
+uni-toast .uni-toast {
+   z-index: 10090;
+}
+/* #endif */
+
+// 隐藏scroll-view的滚动条
+::-webkit-scrollbar {
+    display: none;  
+    width: 0 !important;  
+    height: 0 !important;  
+    -webkit-appearance: none;  
+    background: transparent;  
+}
+
+$uvui-nvue-style: true !default;
+@if $uvui-nvue-style == false {
+	view, scroll-view, swiper-item {
+		display: flex;
+		flex-direction: column;
+		flex-shrink: 0;
+		flex-grow: 0;
+		flex-basis: auto;
+		align-items: stretch;
+		align-content: flex-start;
+	}
+}
diff --git a/uni_modules/uv-ui-tools/libs/function/colorGradient.js b/uni_modules/uv-ui-tools/libs/function/colorGradient.js
new file mode 100644
index 0000000..55c188f
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/colorGradient.js
@@ -0,0 +1,134 @@
+/**
+ * 求两个颜色之间的渐变值
+ * @param {string} startColor 开始的颜色
+ * @param {string} endColor 结束的颜色
+ * @param {number} step 颜色等分的份额
+ * */
+function colorGradient(startColor = 'rgb(0, 0, 0)', endColor = 'rgb(255, 255, 255)', step = 10) {
+    const startRGB = hexToRgb(startColor, false) // 转换为rgb数组模式
+    const startR = startRGB[0]
+    const startG = startRGB[1]
+    const startB = startRGB[2]
+
+    const endRGB = hexToRgb(endColor, false)
+    const endR = endRGB[0]
+    const endG = endRGB[1]
+    const endB = endRGB[2]
+
+    const sR = (endR - startR) / step // 总差值
+    const sG = (endG - startG) / step
+    const sB = (endB - startB) / step
+    const colorArr = []
+    for (let i = 0; i < step; i++) {
+        // 计算每一步的hex值
+        let hex = rgbToHex(`rgb(${Math.round((sR * i + startR))},${Math.round((sG * i + startG))},${Math.round((sB
+			* i + startB))})`)
+        // 确保第一个颜色值为startColor的值
+        if (i === 0) hex = rgbToHex(startColor)
+        // 确保最后一个颜色值为endColor的值
+        if (i === step - 1) hex = rgbToHex(endColor)
+        colorArr.push(hex)
+    }
+    return colorArr
+}
+
+// 将hex表示方式转换为rgb表示方式(这里返回rgb数组模式)
+function hexToRgb(sColor, str = true) {
+    const reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/
+    sColor = String(sColor).toLowerCase()
+    if (sColor && reg.test(sColor)) {
+        if (sColor.length === 4) {
+            let sColorNew = '#'
+            for (let i = 1; i < 4; i += 1) {
+                sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1))
+            }
+            sColor = sColorNew
+        }
+        // 处理六位的颜色值
+        const sColorChange = []
+        for (let i = 1; i < 7; i += 2) {
+            sColorChange.push(parseInt(`0x${sColor.slice(i, i + 2)}`))
+        }
+        if (!str) {
+            return sColorChange
+        }
+        return `rgb(${sColorChange[0]},${sColorChange[1]},${sColorChange[2]})`
+    } if (/^(rgb|RGB)/.test(sColor)) {
+        const arr = sColor.replace(/(?:\(|\)|rgb|RGB)*/g, '').split(',')
+        return arr.map((val) => Number(val))
+    }
+    return sColor
+}
+
+// 将rgb表示方式转换为hex表示方式
+function rgbToHex(rgb) {
+    const _this = rgb
+    const reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/
+    if (/^(rgb|RGB)/.test(_this)) {
+        const aColor = _this.replace(/(?:\(|\)|rgb|RGB)*/g, '').split(',')
+        let strHex = '#'
+        for (let i = 0; i < aColor.length; i++) {
+            let hex = Number(aColor[i]).toString(16)
+            hex = String(hex).length == 1 ? `${0}${hex}` : hex // 保证每个rgb的值为2位
+            if (hex === '0') {
+                hex += hex
+            }
+            strHex += hex
+        }
+        if (strHex.length !== 7) {
+            strHex = _this
+        }
+        return strHex
+    } if (reg.test(_this)) {
+        const aNum = _this.replace(/#/, '').split('')
+        if (aNum.length === 6) {
+            return _this
+        } if (aNum.length === 3) {
+            let numHex = '#'
+            for (let i = 0; i < aNum.length; i += 1) {
+                numHex += (aNum[i] + aNum[i])
+            }
+            return numHex
+        }
+    } else {
+        return _this
+    }
+}
+
+/**
+* JS颜色十六进制转换为rgb或rgba,返回的格式为 rgba（255，255，255，0.5）字符串
+* sHex为传入的十六进制的色值
+* alpha为rgba的透明度
+*/
+function colorToRgba(color, alpha) {
+    color = rgbToHex(color)
+    // 十六进制颜色值的正则表达式
+    const reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/
+    /* 16进制颜色转为RGB格式 */
+    let sColor = String(color).toLowerCase()
+    if (sColor && reg.test(sColor)) {
+        if (sColor.length === 4) {
+            let sColorNew = '#'
+            for (let i = 1; i < 4; i += 1) {
+                sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1))
+            }
+            sColor = sColorNew
+        }
+        // 处理六位的颜色值
+        const sColorChange = []
+        for (let i = 1; i < 7; i += 2) {
+            sColorChange.push(parseInt(`0x${sColor.slice(i, i + 2)}`))
+        }
+        // return sColorChange.join(',')
+        return `rgba(${sColorChange.join(',')},${alpha})`
+    }
+
+    return sColor
+}
+
+export {
+    colorGradient,
+    hexToRgb,
+    rgbToHex,
+    colorToRgba
+}
diff --git a/uni_modules/uv-ui-tools/libs/function/debounce.js b/uni_modules/uv-ui-tools/libs/function/debounce.js
new file mode 100644
index 0000000..ad3996b
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/debounce.js
@@ -0,0 +1,29 @@
+let timeout = null
+
+/**
+ * 防抖原理：一定时间内，只有最后一次操作，再过wait毫秒后才执行函数
+ *
+ * @param {Function} func 要执行的回调函数
+ * @param {Number} wait 延时的时间
+ * @param {Boolean} immediate 是否立即执行
+ * @return null
+ */
+function debounce(func, wait = 500, immediate = false) {
+    // 清除定时器
+    if (timeout !== null) clearTimeout(timeout)
+    // 立即执行，此类情况一般用不到
+    if (immediate) {
+        const callNow = !timeout
+        timeout = setTimeout(() => {
+            timeout = null
+        }, wait)
+        if (callNow) typeof func === 'function' && func()
+    } else {
+        // 设置定时器，当最后一次操作后，timeout不会再被清除，所以在延时wait毫秒后执行func回调方法
+        timeout = setTimeout(() => {
+            typeof func === 'function' && func()
+        }, wait)
+    }
+}
+
+export default debounce
diff --git a/uni_modules/uv-ui-tools/libs/function/digit.js b/uni_modules/uv-ui-tools/libs/function/digit.js
new file mode 100644
index 0000000..c8260a0
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/digit.js
@@ -0,0 +1,167 @@
+let _boundaryCheckingState = true; // 是否进行越界检查的全局开关
+
+/**
+ * 把错误的数据转正
+ * @private
+ * @example strip(0.09999999999999998)=0.1
+ */
+function strip(num, precision = 15) {
+  return +parseFloat(Number(num).toPrecision(precision));
+}
+
+/**
+ * Return digits length of a number
+ * @private
+ * @param {*number} num Input number
+ */
+function digitLength(num) {
+  // Get digit length of e
+  const eSplit = num.toString().split(/[eE]/);
+  const len = (eSplit[0].split('.')[1] || '').length - +(eSplit[1] || 0);
+  return len > 0 ? len : 0;
+}
+
+/**
+ * 把小数转成整数,如果是小数则放大成整数
+ * @private
+ * @param {*number} num 输入数
+ */
+function float2Fixed(num) {
+  if (num.toString().indexOf('e') === -1) {
+    return Number(num.toString().replace('.', ''));
+  }
+  const dLen = digitLength(num);
+  return dLen > 0 ? strip(Number(num) * Math.pow(10, dLen)) : Number(num);
+}
+
+/**
+ * 检测数字是否越界，如果越界给出提示
+ * @private
+ * @param {*number} num 输入数
+ */
+function checkBoundary(num) {
+  if (_boundaryCheckingState) {
+    if (num > Number.MAX_SAFE_INTEGER || num < Number.MIN_SAFE_INTEGER) {
+      console.warn(`${num} 超出了精度限制，结果可能不正确`);
+    }
+  }
+}
+
+/**
+ * 把递归操作扁平迭代化
+ * @param {number[]} arr 要操作的数字数组
+ * @param {function} operation 迭代操作
+ * @private
+ */
+function iteratorOperation(arr, operation) {
+  const [num1, num2, ...others] = arr;
+  let res = operation(num1, num2);
+
+  others.forEach((num) => {
+    res = operation(res, num);
+  });
+
+  return res;
+}
+
+/**
+ * 高精度乘法
+ * @export
+ */
+export function times(...nums) {
+  if (nums.length > 2) {
+    return iteratorOperation(nums, times);
+  }
+
+  const [num1, num2] = nums;
+  const num1Changed = float2Fixed(num1);
+  const num2Changed = float2Fixed(num2);
+  const baseNum = digitLength(num1) + digitLength(num2);
+  const leftValue = num1Changed * num2Changed;
+
+  checkBoundary(leftValue);
+
+  return leftValue / Math.pow(10, baseNum);
+}
+
+/**
+ * 高精度加法
+ * @export
+ */
+export function plus(...nums) {
+  if (nums.length > 2) {
+    return iteratorOperation(nums, plus);
+  }
+
+  const [num1, num2] = nums;
+  // 取最大的小数位
+  const baseNum = Math.pow(10, Math.max(digitLength(num1), digitLength(num2)));
+  // 把小数都转为整数然后再计算
+  return (times(num1, baseNum) + times(num2, baseNum)) / baseNum;
+}
+
+/**
+ * 高精度减法
+ * @export
+ */
+export function minus(...nums) {
+  if (nums.length > 2) {
+    return iteratorOperation(nums, minus);
+  }
+
+  const [num1, num2] = nums;
+  const baseNum = Math.pow(10, Math.max(digitLength(num1), digitLength(num2)));
+  return (times(num1, baseNum) - times(num2, baseNum)) / baseNum;
+}
+
+/**
+ * 高精度除法
+ * @export
+ */
+export function divide(...nums) {
+  if (nums.length > 2) {
+    return iteratorOperation(nums, divide);
+  }
+
+  const [num1, num2] = nums;
+  const num1Changed = float2Fixed(num1);
+  const num2Changed = float2Fixed(num2);
+  checkBoundary(num1Changed);
+  checkBoundary(num2Changed);
+  // 重要，这里必须用strip进行修正
+  return times(num1Changed / num2Changed, strip(Math.pow(10, digitLength(num2) - digitLength(num1))));
+}
+
+/**
+ * 四舍五入
+ * @export
+ */
+export function round(num, ratio) {
+  const base = Math.pow(10, ratio);
+  let result = divide(Math.round(Math.abs(times(num, base))), base);
+  if (num < 0 && result !== 0) {
+    result = times(result, -1);
+  }
+  // 位数不足则补0
+  return result;
+}
+
+/**
+ * 是否进行边界检查，默认开启
+ * @param flag 标记开关，true 为开启，false 为关闭，默认为 true
+ * @export
+ */
+export function enableBoundaryChecking(flag = true) {
+  _boundaryCheckingState = flag;
+}
+
+
+export default {
+  times,
+  plus,
+  minus,
+  divide,
+  round,
+  enableBoundaryChecking,
+};
+
diff --git a/uni_modules/uv-ui-tools/libs/function/index.js b/uni_modules/uv-ui-tools/libs/function/index.js
new file mode 100644
index 0000000..b35e0ab
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/index.js
@@ -0,0 +1,734 @@
+import { number, empty } from './test.js'
+import { round } from './digit.js'
+/**
+ * @description 如果value小于min，取min；如果value大于max，取max
+ * @param {number} min
+ * @param {number} max
+ * @param {number} value
+ */
+function range(min = 0, max = 0, value = 0) {
+	return Math.max(min, Math.min(max, Number(value)))
+}
+
+/**
+ * @description 用于获取用户传递值的px值  如果用户传递了"xxpx"或者"xxrpx"，取出其数值部分，如果是"xxxrpx"还需要用过uni.upx2px进行转换
+ * @param {number|string} value 用户传递值的px值
+ * @param {boolean} unit
+ * @returns {number|string}
+ */
+function getPx(value, unit = false) {
+	if (number(value)) {
+		return unit ? `${value}px` : Number(value)
+	}
+	// 如果带有rpx，先取出其数值部分，再转为px值
+	if (/(rpx|upx)$/.test(value)) {
+		return unit ? `${uni.upx2px(parseInt(value))}px` : Number(uni.upx2px(parseInt(value)))
+	}
+	return unit ? `${parseInt(value)}px` : parseInt(value)
+}
+
+/**
+ * @description 进行延时，以达到可以简写代码的目的 比如: await uni.$uv.sleep(20)将会阻塞20ms
+ * @param {number} value 堵塞时间 单位ms 毫秒
+ * @returns {Promise} 返回promise
+ */
+function sleep(value = 30) {
+	return new Promise((resolve) => {
+		setTimeout(() => {
+			resolve()
+		}, value)
+	})
+}
+/**
+ * @description 运行期判断平台
+ * @returns {string} 返回所在平台(小写)
+ * @link 运行期判断平台 https://uniapp.dcloud.io/frame?id=判断平台
+ */
+function os() {
+	return uni.getSystemInfoSync().platform.toLowerCase()
+}
+/**
+ * @description 获取系统信息同步接口
+ * @link 获取系统信息同步接口 https://uniapp.dcloud.io/api/system/info?id=getsysteminfosync
+ */
+function sys() {
+	return uni.getSystemInfoSync()
+}
+
+/**
+ * @description 取一个区间数
+ * @param {Number} min 最小值
+ * @param {Number} max 最大值
+ */
+function random(min, max) {
+	if (min >= 0 && max > 0 && max >= min) {
+		const gab = max - min + 1
+		return Math.floor(Math.random() * gab + min)
+	}
+	return 0
+}
+
+/**
+ * @param {Number} len uuid的长度
+ * @param {Boolean} firstU 将返回的首字母置为"u"
+ * @param {Nubmer} radix 生成uuid的基数(意味着返回的字符串都是这个基数),2-二进制,8-八进制,10-十进制,16-十六进制
+ */
+function guid(len = 32, firstU = true, radix = null) {
+	const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('')
+	const uuid = []
+	radix = radix || chars.length
+
+	if (len) {
+		// 如果指定uuid长度,只是取随机的字符,0|x为位运算,能去掉x的小数位,返回整数位
+		for (let i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix]
+	} else {
+		let r
+		// rfc4122标准要求返回的uuid中,某些位为固定的字符
+		uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-'
+		uuid[14] = '4'
+
+		for (let i = 0; i < 36; i++) {
+			if (!uuid[i]) {
+				r = 0 | Math.random() * 16
+				uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r]
+			}
+		}
+	}
+	// 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class
+	if (firstU) {
+		uuid.shift()
+		return `u${uuid.join('')}`
+	}
+	return uuid.join('')
+}
+
+/**
+* @description 获取父组件的参数，因为支付宝小程序不支持provide/inject的写法
+   this.$parent在非H5中，可以准确获取到父组件，但是在H5中，需要多次this.$parent.$parent.xxx
+   这里默认值等于undefined有它的含义，因为最顶层元素(组件)的$parent就是undefined，意味着不传name
+   值(默认为undefined)，就是查找最顶层的$parent
+*  @param {string|undefined} name 父组件的参数名
+*/
+function $parent(name = undefined) {
+	let parent = this.$parent
+	// 通过while历遍，这里主要是为了H5需要多层解析的问题
+	while (parent) {
+		// 父组件
+		if (parent.$options && parent.$options.name !== name) {
+			// 如果组件的name不相等，继续上一级寻找
+			parent = parent.$parent
+		} else {
+			return parent
+		}
+	}
+	return false
+}
+
+/**
+ * @description 样式转换
+ * 对象转字符串，或者字符串转对象
+ * @param {object | string} customStyle 需要转换的目标
+ * @param {String} target 转换的目的，object-转为对象，string-转为字符串
+ * @returns {object|string}
+ */
+function addStyle(customStyle, target = 'object') {
+	// 字符串转字符串，对象转对象情形，直接返回
+	if (empty(customStyle) || typeof(customStyle) === 'object' && target === 'object' || target === 'string' &&
+		typeof(customStyle) === 'string') {
+		return customStyle
+	}
+	// 字符串转对象
+	if (target === 'object') {
+		// 去除字符串样式中的两端空格(中间的空格不能去掉，比如padding: 20px 0如果去掉了就错了)，空格是无用的
+		customStyle = trim(customStyle)
+		// 根据";"将字符串转为数组形式
+		const styleArray = customStyle.split(';')
+		const style = {}
+		// 历遍数组，拼接成对象
+		for (let i = 0; i < styleArray.length; i++) {
+			// 'font-size:20px;color:red;'，如此最后字符串有";"的话，会导致styleArray最后一个元素为空字符串，这里需要过滤
+			if (styleArray[i]) {
+				const item = styleArray[i].split(':')
+				style[trim(item[0])] = trim(item[1])
+			}
+		}
+		return style
+	}
+	// 这里为对象转字符串形式
+	let string = ''
+	for (const i in customStyle) {
+		// 驼峰转为中划线的形式，否则css内联样式，无法识别驼峰样式属性名
+		const key = i.replace(/([A-Z])/g, '-$1').toLowerCase()
+		string += `${key}:${customStyle[i]};`
+	}
+	// 去除两端空格
+	return trim(string)
+}
+
+/**
+ * @description 添加单位，如果有rpx，upx，%，px等单位结尾或者值为auto，直接返回，否则加上px单位结尾
+ * @param {string|number} value 需要添加单位的值
+ * @param {string} unit 添加的单位名 比如px
+ */
+function addUnit(value = 'auto', unit = uni?.$uv?.config?.unit ? uni?.$uv?.config?.unit : 'px') {
+	value = String(value)
+	// 用uvui内置验证规则中的number判断是否为数值
+	return number(value) ? `${value}${unit}` : value
+}
+
+/**
+ * @description 深度克隆
+ * @param {object} obj 需要深度克隆的对象
+ * @param cache 缓存
+ * @returns {*} 克隆后的对象或者原值（不是对象）
+ */
+function deepClone(obj, cache = new WeakMap()) {
+	if (obj === null || typeof obj !== 'object') return obj;
+	if (cache.has(obj)) return cache.get(obj);
+	let clone;
+	if (obj instanceof Date) {
+		clone = new Date(obj.getTime());
+	} else if (obj instanceof RegExp) {
+		clone = new RegExp(obj);
+	} else if (obj instanceof Map) {
+		clone = new Map(Array.from(obj, ([key, value]) => [key, deepClone(value, cache)]));
+	} else if (obj instanceof Set) {
+		clone = new Set(Array.from(obj, value => deepClone(value, cache)));
+	} else if (Array.isArray(obj)) {
+		clone = obj.map(value => deepClone(value, cache));
+	} else if (Object.prototype.toString.call(obj) === '[object Object]') {
+		clone = Object.create(Object.getPrototypeOf(obj));
+		cache.set(obj, clone);
+		for (const [key, value] of Object.entries(obj)) {
+			clone[key] = deepClone(value, cache);
+		}
+	} else {
+		clone = Object.assign({}, obj);
+	}
+	cache.set(obj, clone);
+	return clone;
+}
+
+/**
+ * @description JS对象深度合并
+ * @param {object} target 需要拷贝的对象
+ * @param {object} source 拷贝的来源对象
+ * @returns {object|boolean} 深度合并后的对象或者false（入参有不是对象）
+ */
+function deepMerge(target = {}, source = {}) {
+	target = deepClone(target)
+	if (typeof target !== 'object' || target === null || typeof source !== 'object' || source === null) return target;
+	const merged = Array.isArray(target) ? target.slice() : Object.assign({}, target);
+	for (const prop in source) {
+		if (!source.hasOwnProperty(prop)) continue;
+		const sourceValue = source[prop];
+		const targetValue = merged[prop];
+		if (sourceValue instanceof Date) {
+			merged[prop] = new Date(sourceValue);
+		} else if (sourceValue instanceof RegExp) {
+			merged[prop] = new RegExp(sourceValue);
+		} else if (sourceValue instanceof Map) {
+			merged[prop] = new Map(sourceValue);
+		} else if (sourceValue instanceof Set) {
+			merged[prop] = new Set(sourceValue);
+		} else if (typeof sourceValue === 'object' && sourceValue !== null) {
+			merged[prop] = deepMerge(targetValue, sourceValue);
+		} else {
+			merged[prop] = sourceValue;
+		}
+	}
+	return merged;
+}
+
+/**
+ * @description error提示
+ * @param {*} err 错误内容
+ */
+function error(err) {
+	// 开发环境才提示，生产环境不会提示
+	if (process.env.NODE_ENV === 'development') {
+		console.error(`uvui提示：${err}`)
+	}
+}
+
+/**
+ * @description 打乱数组
+ * @param {array} array 需要打乱的数组
+ * @returns {array} 打乱后的数组
+ */
+function randomArray(array = []) {
+	// 原理是sort排序,Math.random()产生0<= x < 1之间的数,会导致x-0.05大于或者小于0
+	return array.sort(() => Math.random() - 0.5)
+}
+
+// padStart 的 polyfill，因为某些机型或情况，还无法支持es7的padStart，比如电脑版的微信小程序
+// 所以这里做一个兼容polyfill的兼容处理
+if (!String.prototype.padStart) {
+	// 为了方便表示这里 fillString 用了ES6 的默认参数，不影响理解
+	String.prototype.padStart = function(maxLength, fillString = ' ') {
+		if (Object.prototype.toString.call(fillString) !== '[object String]') {
+			throw new TypeError(
+				'fillString must be String'
+			)
+		}
+		const str = this
+		// 返回 String(str) 这里是为了使返回的值是字符串字面量，在控制台中更符合直觉
+		if (str.length >= maxLength) return String(str)
+
+		const fillLength = maxLength - str.length
+		let times = Math.ceil(fillLength / fillString.length)
+		while (times >>= 1) {
+			fillString += fillString
+			if (times === 1) {
+				fillString += fillString
+			}
+		}
+		return fillString.slice(0, fillLength) + str
+	}
+}
+
+/**
+ * @description 格式化时间
+ * @param {String|Number} dateTime 需要格式化的时间戳
+ * @param {String} fmt 格式化规则 yyyy:mm:dd|yyyy:mm|yyyy年mm月dd日|yyyy年mm月dd日 hh时MM分等,可自定义组合 默认yyyy-mm-dd
+ * @returns {string} 返回格式化后的字符串
+ */
+function timeFormat(dateTime = null, formatStr = 'yyyy-mm-dd') {
+	let date
+	// 若传入时间为假值，则取当前时间
+	if (!dateTime) {
+		date = new Date()
+	}
+	// 若为unix秒时间戳，则转为毫秒时间戳（逻辑有点奇怪，但不敢改，以保证历史兼容）
+	else if (/^\d{10}$/.test(dateTime?.toString().trim())) {
+		date = new Date(dateTime * 1000)
+	}
+	// 若用户传入字符串格式时间戳，new Date无法解析，需做兼容
+	else if (typeof dateTime === 'string' && /^\d+$/.test(dateTime.trim())) {
+		date = new Date(Number(dateTime))
+	}
+	// 处理平台性差异，在Safari/Webkit中，new Date仅支持/作为分割符的字符串时间
+	// 处理 '2022-07-10 01:02:03'，跳过 '2022-07-10T01:02:03'
+	else if (typeof dateTime === 'string' && dateTime.includes('-') && !dateTime.includes('T')) {
+		date = new Date(dateTime.replace(/-/g, '/'))
+	}
+	// 其他都认为符合 RFC 2822 规范
+	else {
+		date = new Date(dateTime)
+	}
+
+	const timeSource = {
+		'y': date.getFullYear().toString(), // 年
+		'm': (date.getMonth() + 1).toString().padStart(2, '0'), // 月
+		'd': date.getDate().toString().padStart(2, '0'), // 日
+		'h': date.getHours().toString().padStart(2, '0'), // 时
+		'M': date.getMinutes().toString().padStart(2, '0'), // 分
+		's': date.getSeconds().toString().padStart(2, '0') // 秒
+		// 有其他格式化字符需求可以继续添加，必须转化成字符串
+	}
+
+	for (const key in timeSource) {
+		const [ret] = new RegExp(`${key}+`).exec(formatStr) || []
+		if (ret) {
+			// 年可能只需展示两位
+			const beginIndex = key === 'y' && ret.length === 2 ? 2 : 0
+			formatStr = formatStr.replace(ret, timeSource[key].slice(beginIndex))
+		}
+	}
+
+	return formatStr
+}
+
+/**
+ * @description 时间戳转为多久之前
+ * @param {String|Number} timestamp 时间戳
+ * @param {String|Boolean} format
+ * 格式化规则如果为时间格式字符串，超出一定时间范围，返回固定的时间格式；
+ * 如果为布尔值false，无论什么时间，都返回多久以前的格式
+ * @returns {string} 转化后的内容
+ */
+function timeFrom(timestamp = null, format = 'yyyy-mm-dd') {
+	if (timestamp == null) timestamp = Number(new Date())
+	timestamp = parseInt(timestamp)
+	// 判断用户输入的时间戳是秒还是毫秒,一般前端js获取的时间戳是毫秒(13位),后端传过来的为秒(10位)
+	if (timestamp.toString().length == 10) timestamp *= 1000
+	let timer = (new Date()).getTime() - timestamp
+	timer = parseInt(timer / 1000)
+	// 如果小于5分钟,则返回"刚刚",其他以此类推
+	let tips = ''
+	switch (true) {
+		case timer < 300:
+			tips = '刚刚'
+			break
+		case timer >= 300 && timer < 3600:
+			tips = `${parseInt(timer / 60)}分钟前`
+			break
+		case timer >= 3600 && timer < 86400:
+			tips = `${parseInt(timer / 3600)}小时前`
+			break
+		case timer >= 86400 && timer < 2592000:
+			tips = `${parseInt(timer / 86400)}天前`
+			break
+		default:
+			// 如果format为false，则无论什么时间戳，都显示xx之前
+			if (format === false) {
+				if (timer >= 2592000 && timer < 365 * 86400) {
+					tips = `${parseInt(timer / (86400 * 30))}个月前`
+				} else {
+					tips = `${parseInt(timer / (86400 * 365))}年前`
+				}
+			} else {
+				tips = timeFormat(timestamp, format)
+			}
+	}
+	return tips
+}
+
+/**
+ * @description 去除空格
+ * @param String str 需要去除空格的字符串
+ * @param String pos both(左右)|left|right|all 默认both
+ */
+function trim(str, pos = 'both') {
+	str = String(str)
+	if (pos == 'both') {
+		return str.replace(/^\s+|\s+$/g, '')
+	}
+	if (pos == 'left') {
+		return str.replace(/^\s*/, '')
+	}
+	if (pos == 'right') {
+		return str.replace(/(\s*$)/g, '')
+	}
+	if (pos == 'all') {
+		return str.replace(/\s+/g, '')
+	}
+	return str
+}
+
+/**
+ * @description 对象转url参数
+ * @param {object} data,对象
+ * @param {Boolean} isPrefix,是否自动加上"?"
+ * @param {string} arrayFormat 规则 indices|brackets|repeat|comma
+ */
+function queryParams(data = {}, isPrefix = true, arrayFormat = 'brackets') {
+	const prefix = isPrefix ? '?' : ''
+	const _result = []
+	if (['indices', 'brackets', 'repeat', 'comma'].indexOf(arrayFormat) == -1) arrayFormat = 'brackets'
+	for (const key in data) {
+		const value = data[key]
+		// 去掉为空的参数
+		if (['', undefined, null].indexOf(value) >= 0) {
+			continue
+		}
+		// 如果值为数组，另行处理
+		if (value.constructor === Array) {
+			// e.g. {ids: [1, 2, 3]}
+			switch (arrayFormat) {
+				case 'indices':
+					// 结果: ids[0]=1&ids[1]=2&ids[2]=3
+					for (let i = 0; i < value.length; i++) {
+						_result.push(`${key}[${i}]=${value[i]}`)
+					}
+					break
+				case 'brackets':
+					// 结果: ids[]=1&ids[]=2&ids[]=3
+					value.forEach((_value) => {
+						_result.push(`${key}[]=${_value}`)
+					})
+					break
+				case 'repeat':
+					// 结果: ids=1&ids=2&ids=3
+					value.forEach((_value) => {
+						_result.push(`${key}=${_value}`)
+					})
+					break
+				case 'comma':
+					// 结果: ids=1,2,3
+					let commaStr = ''
+					value.forEach((_value) => {
+						commaStr += (commaStr ? ',' : '') + _value
+					})
+					_result.push(`${key}=${commaStr}`)
+					break
+				default:
+					value.forEach((_value) => {
+						_result.push(`${key}[]=${_value}`)
+					})
+			}
+		} else {
+			_result.push(`${key}=${value}`)
+		}
+	}
+	return _result.length ? prefix + _result.join('&') : ''
+}
+
+/**
+ * 显示消息提示框
+ * @param {String} title 提示的内容，长度与 icon 取值有关。
+ * @param {Number} duration 提示的延迟时间，单位毫秒，默认：2000
+ */
+function toast(title, duration = 2000) {
+	uni.showToast({
+		title: String(title),
+		icon: 'none',
+		duration
+	})
+}
+
+/**
+ * @description 根据主题type值,获取对应的图标
+ * @param {String} type 主题名称,primary|info|error|warning|success
+ * @param {boolean} fill 是否使用fill填充实体的图标
+ */
+function type2icon(type = 'success', fill = false) {
+	// 如果非预置值,默认为success
+	if (['primary', 'info', 'error', 'warning', 'success'].indexOf(type) == -1) type = 'success'
+	let iconName = ''
+	// 目前(2019-12-12),info和primary使用同一个图标
+	switch (type) {
+		case 'primary':
+			iconName = 'info-circle'
+			break
+		case 'info':
+			iconName = 'info-circle'
+			break
+		case 'error':
+			iconName = 'close-circle'
+			break
+		case 'warning':
+			iconName = 'error-circle'
+			break
+		case 'success':
+			iconName = 'checkmark-circle'
+			break
+		default:
+			iconName = 'checkmark-circle'
+	}
+	// 是否是实体类型,加上-fill,在icon组件库中,实体的类名是后面加-fill的
+	if (fill) iconName += '-fill'
+	return iconName
+}
+
+/**
+ * @description 数字格式化
+ * @param {number|string} number 要格式化的数字
+ * @param {number} decimals 保留几位小数
+ * @param {string} decimalPoint 小数点符号
+ * @param {string} thousandsSeparator 千分位符号
+ * @returns {string} 格式化后的数字
+ */
+function priceFormat(number, decimals = 0, decimalPoint = '.', thousandsSeparator = ',') {
+	number = (`${number}`).replace(/[^0-9+-Ee.]/g, '')
+	const n = !isFinite(+number) ? 0 : +number
+	const prec = !isFinite(+decimals) ? 0 : Math.abs(decimals)
+	const sep = (typeof thousandsSeparator === 'undefined') ? ',' : thousandsSeparator
+	const dec = (typeof decimalPoint === 'undefined') ? '.' : decimalPoint
+	let s = ''
+
+	s = (prec ? round(n, prec) + '' : `${Math.round(n)}`).split('.')
+	const re = /(-?\d+)(\d{3})/
+	while (re.test(s[0])) {
+		s[0] = s[0].replace(re, `$1${sep}$2`)
+	}
+
+	if ((s[1] || '').length < prec) {
+		s[1] = s[1] || ''
+		s[1] += new Array(prec - s[1].length + 1).join('0')
+	}
+	return s.join(dec)
+}
+
+/**
+ * @description 获取duration值
+ * 如果带有ms或者s直接返回，如果大于一定值，认为是ms单位，小于一定值，认为是s单位
+ * 比如以30位阈值，那么300大于30，可以理解为用户想要的是300ms，而不是想花300s去执行一个动画
+ * @param {String|number} value 比如: "1s"|"100ms"|1|100
+ * @param {boolean} unit  提示: 如果是false 默认返回number
+ * @return {string|number}
+ */
+function getDuration(value, unit = true) {
+	const valueNum = parseInt(value)
+	if (unit) {
+		if (/s$/.test(value)) return value
+		return value > 30 ? `${value}ms` : `${value}s`
+	}
+	if (/ms$/.test(value)) return valueNum
+	if (/s$/.test(value)) return valueNum > 30 ? valueNum : valueNum * 1000
+	return valueNum
+}
+
+/**
+ * @description 日期的月或日补零操作
+ * @param {String} value 需要补零的值
+ */
+function padZero(value) {
+	return `00${value}`.slice(-2)
+}
+
+/**
+ * @description 在uv-form的子组件内容发生变化，或者失去焦点时，尝试通知uv-form执行校验方法
+ * @param {*} instance
+ * @param {*} event
+ */
+function formValidate(instance, event) {
+	const formItem = $parent.call(instance, 'uv-form-item')
+	const form = $parent.call(instance, 'uv-form')
+	// 如果发生变化的input或者textarea等，其父组件中有uv-form-item或者uv-form等，就执行form的validate方法
+	// 同时将form-item的pros传递给form，让其进行精确对象验证
+	if (formItem && form) {
+		form.validateField(formItem.prop, () => {}, event)
+	}
+}
+
+/**
+ * @description 获取某个对象下的属性，用于通过类似'a.b.c'的形式去获取一个对象的的属性的形式
+ * @param {object} obj 对象
+ * @param {string} key 需要获取的属性字段
+ * @returns {*}
+ */
+function getProperty(obj, key) {
+	if (!obj) {
+		return
+	}
+	if (typeof key !== 'string' || key === '') {
+		return ''
+	}
+	if (key.indexOf('.') !== -1) {
+		const keys = key.split('.')
+		let firstObj = obj[keys[0]] || {}
+
+		for (let i = 1; i < keys.length; i++) {
+			if (firstObj) {
+				firstObj = firstObj[keys[i]]
+			}
+		}
+		return firstObj
+	}
+	return obj[key]
+}
+
+/**
+ * @description 设置对象的属性值，如果'a.b.c'的形式进行设置
+ * @param {object} obj 对象
+ * @param {string} key 需要设置的属性
+ * @param {string} value 设置的值
+ */
+function setProperty(obj, key, value) {
+	if (!obj) {
+		return
+	}
+	// 递归赋值
+	const inFn = function(_obj, keys, v) {
+		// 最后一个属性key
+		if (keys.length === 1) {
+			_obj[keys[0]] = v
+			return
+		}
+		// 0~length-1个key
+		while (keys.length > 1) {
+			const k = keys[0]
+			if (!_obj[k] || (typeof _obj[k] !== 'object')) {
+				_obj[k] = {}
+			}
+			const key = keys.shift()
+			// 自调用判断是否存在属性，不存在则自动创建对象
+			inFn(_obj[k], keys, v)
+		}
+	}
+
+	if (typeof key !== 'string' || key === '') {
+
+	} else if (key.indexOf('.') !== -1) { // 支持多层级赋值操作
+		const keys = key.split('.')
+		inFn(obj, keys, value)
+	} else {
+		obj[key] = value
+	}
+}
+
+/**
+ * @description 获取当前页面路径
+ */
+function page() {
+	const pages = getCurrentPages();
+	const route = pages[pages.length - 1]?.route;
+	// 某些特殊情况下(比如页面进行redirectTo时的一些时机)，pages可能为空数组
+	return `/${route ? route : ''}`
+}
+
+/**
+ * @description 获取当前路由栈实例数组
+ */
+function pages() {
+	const pages = getCurrentPages()
+	return pages
+}
+
+/**
+ * 获取页面历史栈指定层实例
+ * @param back {number} [0] - 0或者负数，表示获取历史栈的哪一层，0表示获取当前页面实例，-1 表示获取上一个页面实例。默认0。
+ */
+function getHistoryPage(back = 0) {
+	const pages = getCurrentPages()
+	const len = pages.length
+	return pages[len - 1 + back]
+}
+
+
+
+/**
+ * @description 修改uvui内置属性值
+ * @param {object} props 修改内置props属性
+ * @param {object} config 修改内置config属性
+ * @param {object} color 修改内置color属性
+ * @param {object} zIndex 修改内置zIndex属性
+ */
+function setConfig({
+	props = {},
+	config = {},
+	color = {},
+	zIndex = {}
+}) {
+	const {
+		deepMerge,
+	} = uni.$uv
+	uni.$uv.config = deepMerge(uni.$uv.config, config)
+	uni.$uv.props = deepMerge(uni.$uv.props, props)
+	uni.$uv.color = deepMerge(uni.$uv.color, color)
+	uni.$uv.zIndex = deepMerge(uni.$uv.zIndex, zIndex)
+}
+
+export {
+	range,
+	getPx,
+	sleep,
+	os,
+	sys,
+	random,
+	guid,
+	$parent,
+	addStyle,
+	addUnit,
+	deepClone,
+	deepMerge,
+	error,
+	randomArray,
+	timeFormat,
+	timeFrom,
+	trim,
+	queryParams,
+	toast,
+	type2icon,
+	priceFormat,
+	getDuration,
+	padZero,
+	formValidate,
+	getProperty,
+	setProperty,
+	page,
+	pages,
+	getHistoryPage,
+	setConfig
+}
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/libs/function/platform.js b/uni_modules/uv-ui-tools/libs/function/platform.js
new file mode 100644
index 0000000..d6b926e
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/platform.js
@@ -0,0 +1,75 @@
+/**
+ * 注意：
+ * 此部分内容，在vue-cli模式下，需要在vue.config.js加入如下内容才有效：
+ * module.exports = {
+ *     transpileDependencies: ['uview-v2']
+ * }
+ */
+
+let platform = 'none'
+
+// #ifdef VUE3
+platform = 'vue3'
+// #endif
+
+// #ifdef VUE2
+platform = 'vue2'
+// #endif
+
+// #ifdef APP-PLUS
+platform = 'plus'
+// #endif
+
+// #ifdef APP-NVUE
+platform = 'nvue'
+// #endif
+
+// #ifdef H5
+platform = 'h5'
+// #endif
+
+// #ifdef MP-WEIXIN
+platform = 'weixin'
+// #endif
+
+// #ifdef MP-ALIPAY
+platform = 'alipay'
+// #endif
+
+// #ifdef MP-BAIDU
+platform = 'baidu'
+// #endif
+
+// #ifdef MP-TOUTIAO
+platform = 'toutiao'
+// #endif
+
+// #ifdef MP-QQ
+platform = 'qq'
+// #endif
+
+// #ifdef MP-KUAISHOU
+platform = 'kuaishou'
+// #endif
+
+// #ifdef MP-360
+platform = '360'
+// #endif
+
+// #ifdef MP
+platform = 'mp'
+// #endif
+
+// #ifdef QUICKAPP-WEBVIEW
+platform = 'quickapp-webview'
+// #endif
+
+// #ifdef QUICKAPP-WEBVIEW-HUAWEI
+platform = 'quickapp-webview-huawei'
+// #endif
+
+// #ifdef QUICKAPP-WEBVIEW-UNION
+platform = 'quckapp-webview-union'
+// #endif
+
+export default platform
diff --git a/uni_modules/uv-ui-tools/libs/function/test.js b/uni_modules/uv-ui-tools/libs/function/test.js
new file mode 100644
index 0000000..7c8b747
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/test.js
@@ -0,0 +1,287 @@
+/**
+ * 验证电子邮箱格式
+ */
+function email(value) {
+    return /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/.test(value)
+}
+
+/**
+ * 验证手机格式
+ */
+function mobile(value) {
+    return /^1([3589]\d|4[5-9]|6[1-2,4-7]|7[0-8])\d{8}$/.test(value)
+}
+
+/**
+ * 验证URL格式
+ */
+function url(value) {
+    return /^((https|http|ftp|rtsp|mms):\/\/)(([0-9a-zA-Z_!~*'().&=+$%-]+: )?[0-9a-zA-Z_!~*'().&=+$%-]+@)?(([0-9]{1,3}.){3}[0-9]{1,3}|([0-9a-zA-Z_!~*'()-]+.)*([0-9a-zA-Z][0-9a-zA-Z-]{0,61})?[0-9a-zA-Z].[a-zA-Z]{2,6})(:[0-9]{1,4})?((\/?)|(\/[0-9a-zA-Z_!~*'().;?:@&=+$,%#-]+)+\/?)$/
+        .test(value)
+}
+
+/**
+ * 验证日期格式
+ */
+function date(value) {
+    if (!value) return false
+    // 判断是否数值或者字符串数值(意味着为时间戳)，转为数值，否则new Date无法识别字符串时间戳
+    if (number(value)) value = +value
+    return !/Invalid|NaN/.test(new Date(value).toString())
+}
+
+/**
+ * 验证ISO类型的日期格式
+ */
+function dateISO(value) {
+    return /^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test(value)
+}
+
+/**
+ * 验证十进制数字
+ */
+function number(value) {
+    return /^[\+-]?(\d+\.?\d*|\.\d+|\d\.\d+e\+\d+)$/.test(value)
+}
+
+/**
+ * 验证字符串
+ */
+function string(value) {
+    return typeof value === 'string'
+}
+
+/**
+ * 验证整数
+ */
+function digits(value) {
+    return /^\d+$/.test(value)
+}
+
+/**
+ * 验证身份证号码
+ */
+function idCard(value) {
+    return /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(
+        value
+    )
+}
+
+/**
+ * 是否车牌号
+ */
+function carNo(value) {
+    // 新能源车牌
+    const xreg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF]$)|([DF][A-HJ-NP-Z0-9][0-9]{4}$))/
+    // 旧车牌
+    const creg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1}$/
+    if (value.length === 7) {
+        return creg.test(value)
+    } if (value.length === 8) {
+        return xreg.test(value)
+    }
+    return false
+}
+
+/**
+ * 金额,只允许2位小数
+ */
+function amount(value) {
+    // 金额，只允许保留两位小数
+    return /^[1-9]\d*(,\d{3})*(\.\d{1,2})?$|^0\.\d{1,2}$/.test(value)
+}
+
+/**
+ * 中文
+ */
+function chinese(value) {
+    const reg = /^[\u4e00-\u9fa5]+$/gi
+    return reg.test(value)
+}
+
+/**
+ * 只能输入字母
+ */
+function letter(value) {
+    return /^[a-zA-Z]*$/.test(value)
+}
+
+/**
+ * 只能是字母或者数字
+ */
+function enOrNum(value) {
+    // 英文或者数字
+    const reg = /^[0-9a-zA-Z]*$/g
+    return reg.test(value)
+}
+
+/**
+ * 验证是否包含某个值
+ */
+function contains(value, param) {
+    return value.indexOf(param) >= 0
+}
+
+/**
+ * 验证一个值范围[min, max]
+ */
+function range(value, param) {
+    return value >= param[0] && value <= param[1]
+}
+
+/**
+ * 验证一个长度范围[min, max]
+ */
+function rangeLength(value, param) {
+    return value.length >= param[0] && value.length <= param[1]
+}
+
+/**
+ * 是否固定电话
+ */
+function landline(value) {
+    const reg = /^\d{3,4}-\d{7,8}(-\d{3,4})?$/
+    return reg.test(value)
+}
+
+/**
+ * 判断是否为空
+ */
+function empty(value) {
+    switch (typeof value) {
+    case 'undefined':
+        return true
+    case 'string':
+        if (value.replace(/(^[ \t\n\r]*)|([ \t\n\r]*$)/g, '').length == 0) return true
+        break
+    case 'boolean':
+        if (!value) return true
+        break
+    case 'number':
+        if (value === 0 || isNaN(value)) return true
+        break
+    case 'object':
+        if (value === null || value.length === 0) return true
+        for (const i in value) {
+            return false
+        }
+        return true
+    }
+    return false
+}
+
+/**
+ * 是否json字符串
+ */
+function jsonString(value) {
+    if (typeof value === 'string') {
+        try {
+            const obj = JSON.parse(value)
+            if (typeof obj === 'object' && obj) {
+                return true
+            }
+            return false
+        } catch (e) {
+            return false
+        }
+    }
+    return false
+}
+
+/**
+ * 是否数组
+ */
+function array(value) {
+    if (typeof Array.isArray === 'function') {
+        return Array.isArray(value)
+    }
+    return Object.prototype.toString.call(value) === '[object Array]'
+}
+
+/**
+ * 是否对象
+ */
+function object(value) {
+    return Object.prototype.toString.call(value) === '[object Object]'
+}
+
+/**
+ * 是否短信验证码
+ */
+function code(value, len = 6) {
+    return new RegExp(`^\\d{${len}}$`).test(value)
+}
+
+/**
+ * 是否函数方法
+ * @param {Object} value
+ */
+function func(value) {
+    return typeof value === 'function'
+}
+
+/**
+ * 是否promise对象
+ * @param {Object} value
+ */
+function promise(value) {
+    return object(value) && func(value.then) && func(value.catch)
+}
+
+/** 是否图片格式
+ * @param {Object} value
+ */
+function image(value) {
+    const newValue = value.split('?')[0]
+    const IMAGE_REGEXP = /\.(jpeg|jpg|gif|png|svg|webp|jfif|bmp|dpg)/i
+    return IMAGE_REGEXP.test(newValue)
+}
+
+/**
+ * 是否视频格式
+ * @param {Object} value
+ */
+function video(value) {
+    const VIDEO_REGEXP = /\.(mp4|mpg|mpeg|dat|asf|avi|rm|rmvb|mov|wmv|flv|mkv|m3u8)/i
+    return VIDEO_REGEXP.test(value)
+}
+
+/**
+ * 是否为正则对象
+ * @param {Object}
+ * @return {Boolean}
+ */
+function regExp(o) {
+    return o && Object.prototype.toString.call(o) === '[object RegExp]'
+}
+
+export {
+    email,
+    mobile,
+    url,
+    date,
+    dateISO,
+    number,
+    digits,
+    idCard,
+    carNo,
+    amount,
+    chinese,
+    letter,
+    enOrNum,
+    contains,
+    range,
+    rangeLength,
+    empty,
+    jsonString,
+    landline,
+    object,
+    array,
+    code,
+    func,
+    promise,
+    video,
+    image,
+    regExp,
+    string
+}
diff --git a/uni_modules/uv-ui-tools/libs/function/throttle.js b/uni_modules/uv-ui-tools/libs/function/throttle.js
new file mode 100644
index 0000000..2f33611
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/throttle.js
@@ -0,0 +1,30 @@
+let timer; let
+    flag
+/**
+ * 节流原理：在一定时间内，只能触发一次
+ *
+ * @param {Function} func 要执行的回调函数
+ * @param {Number} wait 延时的时间
+ * @param {Boolean} immediate 是否立即执行
+ * @return null
+ */
+function throttle(func, wait = 500, immediate = true) {
+    if (immediate) {
+        if (!flag) {
+            flag = true
+            // 如果是立即执行，则在wait毫秒内开始时执行
+            typeof func === 'function' && func()
+            timer = setTimeout(() => {
+                flag = false
+            }, wait)
+        }
+    } else if (!flag) {
+        flag = true
+        // 如果是非立即执行，则在wait毫秒内的结束处执行
+        timer = setTimeout(() => {
+            flag = false
+            typeof func === 'function' && func()
+        }, wait)
+    }
+}
+export default throttle
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/adapters/index.js b/uni_modules/uv-ui-tools/libs/luch-request/adapters/index.js
new file mode 100644
index 0000000..31a5cfc
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/adapters/index.js
@@ -0,0 +1,132 @@
+import buildURL from '../helpers/buildURL'
+import buildFullPath from '../core/buildFullPath'
+import settle from '../core/settle'
+import {isUndefined} from "../utils"
+
+/**
+ * 返回可选值存在的配置
+ * @param {Array} keys - 可选值数组
+ * @param {Object} config2 - 配置
+ * @return {{}} - 存在的配置项
+ */
+const mergeKeys = (keys, config2) => {
+  let config = {}
+  keys.forEach(prop => {
+    if (!isUndefined(config2[prop])) {
+      config[prop] = config2[prop]
+    }
+  })
+  return config
+}
+export default (config) => {
+  return new Promise((resolve, reject) => {
+    let fullPath = buildURL(buildFullPath(config.baseURL, config.url), config.params, config.paramsSerializer)
+    const _config = {
+      url: fullPath,
+      header: config.header,
+      complete: (response) => {
+        config.fullPath = fullPath
+        response.config = config
+        response.rawData = response.data
+        try {
+          let jsonParseHandle = false
+          const forcedJSONParsingType = typeof config.forcedJSONParsing
+          if (forcedJSONParsingType === 'boolean') {
+            jsonParseHandle = config.forcedJSONParsing
+          } else if (forcedJSONParsingType === 'object') {
+            const includesMethod = config.forcedJSONParsing.include || []
+            jsonParseHandle = includesMethod.includes(config.method)
+          }
+
+          // 对可能字符串不是json 的情况容错
+          if (jsonParseHandle && typeof response.data === 'string') {
+            response.data = JSON.parse(response.data)
+          }
+          // eslint-disable-next-line no-empty
+        } catch (e) {
+        }
+        settle(resolve, reject, response)
+      }
+    }
+    let requestTask
+    if (config.method === 'UPLOAD') {
+      delete _config.header['content-type']
+      delete _config.header['Content-Type']
+      let otherConfig = {
+        // #ifdef MP-ALIPAY
+        fileType: config.fileType,
+        // #endif
+        filePath: config.filePath,
+        name: config.name
+      }
+      const optionalKeys = [
+        // #ifdef APP-PLUS || H5
+        'files',
+        // #endif
+        // #ifdef H5
+        'file',
+        // #endif
+        // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+        'timeout',
+        // #endif
+        'formData'
+      ]
+      requestTask = uni.uploadFile({..._config, ...otherConfig, ...mergeKeys(optionalKeys, config)})
+    } else if (config.method === 'DOWNLOAD') {
+      const optionalKeys = [
+        // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+        'timeout',
+        // #endif
+        // #ifdef MP
+        'filePath',
+        // #endif
+      ]
+      requestTask = uni.downloadFile({..._config, ...mergeKeys(optionalKeys, config)})
+    } else {
+      const optionalKeys = [
+        'data',
+        'method',
+        // #ifdef H5 || APP-PLUS || MP-ALIPAY || MP-WEIXIN
+        'timeout',
+        // #endif
+        'dataType',
+        // #ifndef MP-ALIPAY
+        'responseType',
+        // #endif
+        // #ifdef APP-PLUS
+        'sslVerify',
+        // #endif
+        // #ifdef H5
+        'withCredentials',
+        // #endif
+        // #ifdef APP-PLUS
+        'firstIpv4',
+        // #endif
+        // #ifdef MP-WEIXIN
+        'enableHttp2',
+        'enableQuic',
+        // #endif
+        // #ifdef MP-TOUTIAO || MP-WEIXIN
+        'enableCache',
+        // #endif
+        // #ifdef MP-WEIXIN
+        'enableHttpDNS',
+        'httpDNSServiceId',
+        'enableChunked',
+        'forceCellularNetwork',
+        // #endif
+        // #ifdef MP-ALIPAY
+        'enableCookie',
+        // #endif
+        // #ifdef MP-BAIDU
+        'cloudCache',
+        'defer'
+        // #endif
+      ]
+      requestTask = uni.request({..._config, ...mergeKeys(optionalKeys, config)})
+    }
+    if (config.getTask) {
+      config.getTask(requestTask, config)
+    }
+  })
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/InterceptorManager.js b/uni_modules/uv-ui-tools/libs/luch-request/core/InterceptorManager.js
new file mode 100644
index 0000000..3ea0d5e
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/InterceptorManager.js
@@ -0,0 +1,51 @@
+'use strict'
+
+
+function InterceptorManager() {
+  this.handlers = []
+}
+
+/**
+ * Add a new interceptor to the stack
+ *
+ * @param {Function} fulfilled The function to handle `then` for a `Promise`
+ * @param {Function} rejected The function to handle `reject` for a `Promise`
+ *
+ * @return {Number} An ID used to remove interceptor later
+ */
+InterceptorManager.prototype.use = function use(fulfilled, rejected) {
+  this.handlers.push({
+    fulfilled: fulfilled,
+    rejected: rejected
+  })
+  return this.handlers.length - 1
+}
+
+/**
+ * Remove an interceptor from the stack
+ *
+ * @param {Number} id The ID that was returned by `use`
+ */
+InterceptorManager.prototype.eject = function eject(id) {
+  if (this.handlers[id]) {
+    this.handlers[id] = null
+  }
+}
+
+/**
+ * Iterate over all the registered interceptors
+ *
+ * This method is particularly useful for skipping over any
+ * interceptors that may have become `null` calling `eject`.
+ *
+ * @param {Function} fn The function to call for each interceptor
+ */
+InterceptorManager.prototype.forEach = function forEach(fn) {
+  this.handlers.forEach(h => {
+    if (h !== null) {
+      fn(h)
+    }
+  })
+}
+
+export default InterceptorManager
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/Request.js b/uni_modules/uv-ui-tools/libs/luch-request/core/Request.js
new file mode 100644
index 0000000..96c89a8
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/Request.js
@@ -0,0 +1,201 @@
+/**
+ * @Class Request
+ * @description luch-request http请求插件
+ * @Author lu-ch
+ * @Email webwork.s@qq.com
+ * 文档: https://www.quanzhan.co/luch-request/
+ * github: https://github.com/lei-mu/luch-request
+ * DCloud: http://ext.dcloud.net.cn/plugin?id=392
+ */
+
+
+import dispatchRequest from './dispatchRequest'
+import InterceptorManager from './InterceptorManager'
+import mergeConfig from './mergeConfig'
+import defaults from './defaults'
+import { isPlainObject } from '../utils'
+import clone from '../utils/clone'
+
+export default class Request {
+  /**
+   * @param {Object} arg - 全局配置
+   * @param {String} arg.baseURL - 全局根路径
+   * @param {Object} arg.header - 全局header
+   * @param {String} arg.method = [GET|POST|PUT|DELETE|CONNECT|HEAD|OPTIONS|TRACE] - 全局默认请求方式
+   * @param {String} arg.dataType = [json] - 全局默认的dataType
+   * @param {String} arg.responseType = [text|arraybuffer] - 全局默认的responseType。支付宝小程序不支持
+   * @param {Object} arg.custom - 全局默认的自定义参数
+   * @param {Number} arg.timeout - 全局默认的超时时间，单位 ms。默认60000。H5(HBuilderX 2.9.9+)、APP(HBuilderX 2.9.9+)、微信小程序（2.10.0）、支付宝小程序
+   * @param {Boolean} arg.sslVerify - 全局默认的是否验证 ssl 证书。默认true.仅App安卓端支持（HBuilderX 2.3.3+）
+   * @param {Boolean} arg.withCredentials - 全局默认的跨域请求时是否携带凭证（cookies）。默认false。仅H5支持（HBuilderX 2.6.15+）
+   * @param {Boolean} arg.firstIpv4 - 全DNS解析时优先使用ipv4。默认false。仅 App-Android 支持 (HBuilderX 2.8.0+)
+   * @param {Function(statusCode):Boolean} arg.validateStatus - 全局默认的自定义验证器。默认statusCode >= 200 && statusCode < 300
+   */
+  constructor(arg = {}) {
+    if (!isPlainObject(arg)) {
+      arg = {}
+      console.warn('设置全局参数必须接收一个Object')
+    }
+    this.config = clone({...defaults, ...arg})
+    this.interceptors = {
+      request: new InterceptorManager(),
+      response: new InterceptorManager()
+    }
+  }
+
+  /**
+   * @Function
+   * @param {Request~setConfigCallback} f - 设置全局默认配置
+   */
+  setConfig(f) {
+    this.config = f(this.config)
+  }
+
+  middleware(config) {
+    config = mergeConfig(this.config, config)
+    let chain = [dispatchRequest, undefined]
+    let promise = Promise.resolve(config)
+
+    this.interceptors.request.forEach(function unshiftRequestInterceptors(interceptor) {
+      chain.unshift(interceptor.fulfilled, interceptor.rejected)
+    })
+
+    this.interceptors.response.forEach(function pushResponseInterceptors(interceptor) {
+      chain.push(interceptor.fulfilled, interceptor.rejected)
+    })
+
+    while (chain.length) {
+      promise = promise.then(chain.shift(), chain.shift())
+    }
+
+    return promise
+  }
+
+  /**
+   * @Function
+   * @param {Object} config - 请求配置项
+   * @prop {String} options.url - 请求路径
+   * @prop {Object} options.data - 请求参数
+   * @prop {Object} [options.responseType = config.responseType] [text|arraybuffer] - 响应的数据类型
+   * @prop {Object} [options.dataType = config.dataType] - 如果设为 json，会尝试对返回的数据做一次 JSON.parse
+   * @prop {Object} [options.header = config.header] - 请求header
+   * @prop {Object} [options.method = config.method] - 请求方法
+   * @returns {Promise<unknown>}
+   */
+  request(config = {}) {
+    return this.middleware(config)
+  }
+
+  get(url, options = {}) {
+    return this.middleware({
+      url,
+      method: 'GET',
+      ...options
+    })
+  }
+
+  post(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'POST',
+      ...options
+    })
+  }
+
+  // #ifndef MP-ALIPAY || MP-KUAISHOU || MP-JD
+  put(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'PUT',
+      ...options
+    })
+  }
+
+  // #endif
+
+  // #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-BAIDU
+  delete(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'DELETE',
+      ...options
+    })
+  }
+
+  // #endif
+
+  // #ifdef H5 || MP-WEIXIN
+  connect(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'CONNECT',
+      ...options
+    })
+  }
+
+  // #endif
+
+  // #ifdef  H5 || MP-WEIXIN || MP-BAIDU
+  head(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'HEAD',
+      ...options
+    })
+  }
+
+  // #endif
+
+  // #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-BAIDU
+  options(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'OPTIONS',
+      ...options
+    })
+  }
+
+  // #endif
+
+  // #ifdef H5 || MP-WEIXIN
+  trace(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'TRACE',
+      ...options
+    })
+  }
+
+  // #endif
+
+  upload(url, config = {}) {
+    config.url = url
+    config.method = 'UPLOAD'
+    return this.middleware(config)
+  }
+
+  download(url, config = {}) {
+    config.url = url
+    config.method = 'DOWNLOAD'
+    return this.middleware(config)
+  }
+
+  get version () {
+    return '3.1.0'
+  }
+}
+
+
+/**
+ * setConfig回调
+ * @return {Object} - 返回操作后的config
+ * @callback Request~setConfigCallback
+ * @param {Object} config - 全局默认config
+ */
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/buildFullPath.js b/uni_modules/uv-ui-tools/libs/luch-request/core/buildFullPath.js
new file mode 100644
index 0000000..f2852f4
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/buildFullPath.js
@@ -0,0 +1,20 @@
+'use strict'
+
+import isAbsoluteURL from '../helpers/isAbsoluteURL'
+import combineURLs from '../helpers/combineURLs'
+
+/**
+ * Creates a new URL by combining the baseURL with the requestedURL,
+ * only when the requestedURL is not already an absolute URL.
+ * If the requestURL is absolute, this function returns the requestedURL untouched.
+ *
+ * @param {string} baseURL The base URL
+ * @param {string} requestedURL Absolute or relative URL to combine
+ * @returns {string} The combined full path
+ */
+export default function buildFullPath(baseURL, requestedURL) {
+  if (baseURL && !isAbsoluteURL(requestedURL)) {
+    return combineURLs(baseURL, requestedURL)
+  }
+  return requestedURL
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/defaults.js b/uni_modules/uv-ui-tools/libs/luch-request/core/defaults.js
new file mode 100644
index 0000000..db74609
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/defaults.js
@@ -0,0 +1,33 @@
+/**
+ * 默认的全局配置
+ */
+
+
+export default {
+  baseURL: '',
+  header: {},
+  method: 'GET',
+  dataType: 'json',
+  paramsSerializer: null,
+  // #ifndef MP-ALIPAY
+  responseType: 'text',
+  // #endif
+  custom: {},
+  // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+  timeout: 60000,
+  // #endif
+  // #ifdef APP-PLUS
+  sslVerify: true,
+  // #endif
+  // #ifdef H5
+  withCredentials: false,
+  // #endif
+  // #ifdef APP-PLUS
+  firstIpv4: false,
+  // #endif
+  validateStatus: function validateStatus(status) {
+    return status >= 200 && status < 300
+  },
+  // 是否尝试将响应数据json化
+  forcedJSONParsing: true
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/dispatchRequest.js b/uni_modules/uv-ui-tools/libs/luch-request/core/dispatchRequest.js
new file mode 100644
index 0000000..c5f2c85
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/dispatchRequest.js
@@ -0,0 +1,6 @@
+import adapter from '../adapters/index'
+
+
+export default (config) => {
+  return adapter(config)
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/mergeConfig.js b/uni_modules/uv-ui-tools/libs/luch-request/core/mergeConfig.js
new file mode 100644
index 0000000..99c8ecd
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/mergeConfig.js
@@ -0,0 +1,126 @@
+import {deepMerge, isUndefined} from '../utils'
+
+/**
+ * 合并局部配置优先的配置，如果局部有该配置项则用局部，如果全局有该配置项则用全局
+ * @param {Array} keys - 配置项
+ * @param {Object} globalsConfig - 当前的全局配置
+ * @param {Object} config2 - 局部配置
+ * @return {{}}
+ */
+const mergeKeys = (keys, globalsConfig, config2) => {
+  let config = {}
+  keys.forEach(prop => {
+    if (!isUndefined(config2[prop])) {
+      config[prop] = config2[prop]
+    } else if (!isUndefined(globalsConfig[prop])) {
+      config[prop] = globalsConfig[prop]
+    }
+  })
+  return config
+}
+/**
+ *
+ * @param globalsConfig - 当前实例的全局配置
+ * @param config2 - 当前的局部配置
+ * @return - 合并后的配置
+ */
+export default (globalsConfig, config2 = {}) => {
+  const method = config2.method || globalsConfig.method || 'GET'
+  let config = {
+    baseURL: config2.baseURL || globalsConfig.baseURL || '',
+    method: method,
+    url: config2.url || '',
+    params: config2.params || {},
+    custom: {...(globalsConfig.custom || {}), ...(config2.custom || {})},
+    header: deepMerge(globalsConfig.header || {}, config2.header || {})
+  }
+  const defaultToConfig2Keys = ['getTask', 'validateStatus', 'paramsSerializer', 'forcedJSONParsing']
+  config = {...config, ...mergeKeys(defaultToConfig2Keys, globalsConfig, config2)}
+
+  // eslint-disable-next-line no-empty
+  if (method === 'DOWNLOAD') {
+    const downloadKeys = [
+      // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+      'timeout',
+      // #endif
+      // #ifdef MP
+      'filePath',
+      // #endif
+    ]
+    config = {...config, ...mergeKeys(downloadKeys, globalsConfig, config2)}
+  } else if (method === 'UPLOAD') {
+    delete config.header['content-type']
+    delete config.header['Content-Type']
+    const uploadKeys = [
+      // #ifdef APP-PLUS || H5
+      'files',
+      // #endif
+      // #ifdef MP-ALIPAY
+      'fileType',
+      // #endif
+      // #ifdef H5
+      'file',
+      // #endif
+      'filePath',
+      'name',
+      // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+      'timeout',
+      // #endif
+      'formData',
+    ]
+    uploadKeys.forEach(prop => {
+      if (!isUndefined(config2[prop])) {
+        config[prop] = config2[prop]
+      }
+    })
+    // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+    if (isUndefined(config.timeout) && !isUndefined(globalsConfig.timeout)) {
+      config['timeout'] = globalsConfig['timeout']
+    }
+    // #endif
+  } else {
+    const defaultsKeys = [
+      'data',
+      // #ifdef H5 || APP-PLUS || MP-ALIPAY || MP-WEIXIN
+      'timeout',
+      // #endif
+      'dataType',
+      // #ifndef MP-ALIPAY
+      'responseType',
+      // #endif
+      // #ifdef APP-PLUS
+      'sslVerify',
+      // #endif
+      // #ifdef H5
+      'withCredentials',
+      // #endif
+      // #ifdef APP-PLUS
+      'firstIpv4',
+      // #endif
+      // #ifdef MP-WEIXIN
+      'enableHttp2',
+      'enableQuic',
+      // #endif
+      // #ifdef MP-TOUTIAO || MP-WEIXIN
+      'enableCache',
+      // #endif
+      // #ifdef MP-WEIXIN
+      'enableHttpDNS',
+      'httpDNSServiceId',
+      'enableChunked',
+      'forceCellularNetwork',
+      // #endif
+      // #ifdef MP-ALIPAY
+      'enableCookie',
+      // #endif
+      // #ifdef MP-BAIDU
+      'cloudCache',
+      'defer'
+      // #endif
+
+    ]
+    config = {...config, ...mergeKeys(defaultsKeys, globalsConfig, config2)}
+  }
+
+  return config
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/settle.js b/uni_modules/uv-ui-tools/libs/luch-request/core/settle.js
new file mode 100644
index 0000000..b2f1659
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/settle.js
@@ -0,0 +1,16 @@
+/**
+ * Resolve or reject a Promise based on response status.
+ *
+ * @param {Function} resolve A function that resolves the promise.
+ * @param {Function} reject A function that rejects the promise.
+ * @param {object} response The response.
+ */
+export default function settle(resolve, reject, response) {
+  const validateStatus = response.config.validateStatus
+  const status = response.statusCode
+  if (status && (!validateStatus || validateStatus(status))) {
+    resolve(response)
+  } else {
+    reject(response)
+  }
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/helpers/buildURL.js b/uni_modules/uv-ui-tools/libs/luch-request/helpers/buildURL.js
new file mode 100644
index 0000000..e90b908
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/helpers/buildURL.js
@@ -0,0 +1,64 @@
+'use strict'
+
+import * as utils from './../utils'
+
+function encode(val) {
+  return encodeURIComponent(val).replace(/%40/gi, '@').replace(/%3A/gi, ':').replace(/%24/g, '$').replace(/%2C/gi, ',').replace(/%20/g, '+').replace(/%5B/gi, '[').replace(/%5D/gi, ']')
+}
+
+/**
+ * Build a URL by appending params to the end
+ *
+ * @param {string} url The base of the url (e.g., http://www.google.com)
+ * @param {object} [params] The params to be appended
+ * @returns {string} The formatted url
+ */
+export default function buildURL(url, params, paramsSerializer) {
+  /*eslint no-param-reassign:0*/
+  if (!params) {
+    return url
+  }
+
+  var serializedParams
+  if (paramsSerializer) {
+    serializedParams = paramsSerializer(params)
+  } else if (utils.isURLSearchParams(params)) {
+    serializedParams = params.toString()
+  } else {
+    var parts = []
+
+    utils.forEach(params, function serialize(val, key) {
+      if (val === null || typeof val === 'undefined') {
+        return
+      }
+
+      if (utils.isArray(val)) {
+        key = key + '[]'
+      } else {
+        val = [val]
+      }
+
+      utils.forEach(val, function parseValue(v) {
+        if (utils.isDate(v)) {
+          v = v.toISOString()
+        } else if (utils.isObject(v)) {
+          v = JSON.stringify(v)
+        }
+        parts.push(encode(key) + '=' + encode(v))
+      })
+    })
+
+    serializedParams = parts.join('&')
+  }
+
+  if (serializedParams) {
+    var hashmarkIndex = url.indexOf('#')
+    if (hashmarkIndex !== -1) {
+      url = url.slice(0, hashmarkIndex)
+    }
+
+    url += (url.indexOf('?') === -1 ? '?' : '&') + serializedParams
+  }
+
+  return url
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/helpers/combineURLs.js b/uni_modules/uv-ui-tools/libs/luch-request/helpers/combineURLs.js
new file mode 100644
index 0000000..7b9d1ef
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/helpers/combineURLs.js
@@ -0,0 +1,14 @@
+'use strict'
+
+/**
+ * Creates a new URL by combining the specified URLs
+ *
+ * @param {string} baseURL The base URL
+ * @param {string} relativeURL The relative URL
+ * @returns {string} The combined URL
+ */
+export default function combineURLs(baseURL, relativeURL) {
+  return relativeURL
+    ? baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '')
+    : baseURL
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/helpers/isAbsoluteURL.js b/uni_modules/uv-ui-tools/libs/luch-request/helpers/isAbsoluteURL.js
new file mode 100644
index 0000000..2a82517
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/helpers/isAbsoluteURL.js
@@ -0,0 +1,14 @@
+'use strict'
+
+/**
+ * Determines whether the specified URL is absolute
+ *
+ * @param {string} url The URL to test
+ * @returns {boolean} True if the specified URL is absolute, otherwise false
+ */
+export default function isAbsoluteURL(url) {
+  // A URL is considered absolute if it begins with "<scheme>://" or "//" (protocol-relative URL).
+  // RFC 3986 defines scheme name as a sequence of characters beginning with a letter and followed
+  // by any combination of letters, digits, plus, period, or hyphen.
+  return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(url)
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/index.d.ts b/uni_modules/uv-ui-tools/libs/luch-request/index.d.ts
new file mode 100644
index 0000000..62d3fb9
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/index.d.ts
@@ -0,0 +1,197 @@
+export type HttpTask = UniApp.RequestTask | UniApp.UploadTask | UniApp.DownloadTask;
+
+export type HttpRequestTask = UniApp.RequestTask;
+
+export type HttpUploadTask = UniApp.UploadTask;
+
+export type HttpDownloadTask = UniApp.DownloadTask;
+
+export type HttpMethod =
+    "GET"
+    | "POST"
+    | "PUT"
+    | "DELETE"
+    | "CONNECT"
+    | "HEAD"
+    | "OPTIONS"
+    | "TRACE"
+    | "UPLOAD"
+    | "DOWNLOAD";
+
+export type HttpRequestHeader = Record<string, string>;
+
+export type HttpParams = Record<string, any>;
+
+export type HttpData = Record<string, any>;
+
+export type HttpResponseType = 'arraybuffer' | 'text';
+
+export type HttpCustom = Record<string, any>;
+
+export type HttpFileType = 'image' | 'video' | 'audio';
+
+export type HttpFormData = Record<string, any>;
+
+export type HttpResponseHeader = Record<string, string> & {
+    "set-cookie"?: string[]
+};
+
+export interface HttpRequestConfig<T = HttpTask> {
+    /** @desc 请求服务器接口地址 */
+    url?: string;
+    /** @desc 请求方式，默认为 GET */
+    method?: HttpMethod;
+    /** @desc 请求基地址 */
+    baseURL?: string;
+    /** @desc 请求头信息，不能设置 Referer，App、H5 端会自动带上 cookie，且 H5 端不可手动修改 */
+    header?: HttpRequestHeader;
+    /** @desc 请求查询参数，自动拼接为查询字符串 */
+    params?: HttpParams;
+    /** @desc 请求体参数 */
+    data?: HttpData;
+    /** @desc 超时时间，单位 ms，默认为 60000，仅 H5 (HBuilderX 2.9.9+)、APP (HBuilderX 2.9.9+)、微信小程序 (2.10.0)、支付宝小程序支持 */
+    timeout?: number;
+    /** @desc 跨域请求时是否携带凭证 (cookies)，默认为 false，仅 H5 (HBuilderX 2.6.15+) 支持 */
+    withCredentials?: boolean;
+    /** @desc 设置响应的数据类型，支付宝小程序不支持 */
+    responseType?: HttpResponseType;
+    /** @desc 全局自定义验证器 */
+    validateStatus?: ((statusCode: number) => boolean) | null;
+
+
+    /** params 参数自定义处理 */
+    paramsSerializer?: (params: AnyObject) => string | void;
+
+    /** @desc 默认为 json，如果设为 json，会尝试对返回的数据做一次 JSON.parse */
+    dataType?: string;
+    /** @desc DNS 解析时是否优先使用 ipv4，默认为 false，仅 App-Android (HBuilderX 2.8.0+) 支持 */
+    firstIpv4?: boolean;
+    /** @desc 是否验证 SSL 证书，默认为 true，仅 App-Android (HBuilderX 2.3.3+) 支持 */
+    sslVerify?: boolean;
+
+    /** @desc 开启 http2;微信小程序 */
+    enableHttp2?: boolean;
+
+    /** @desc 开启 quic；微信小程序 */
+    enableQuic?: boolean;
+    /** @desc 开启 cache;微信小程序、字节跳动小程序 2.31.0+ */
+    enableCache?: boolean;
+    /** @desc 开启 httpDNS;微信小程序 */
+    enableHttpDNS?: boolean;
+    /** @desc httpDNS 服务商；微信小程序 */
+    httpDNSServiceId?: string;
+    /** @desc 开启 transfer-encoding chunked;微信小程序 */
+    enableChunked?: boolean;
+    /** @desc wifi下使用移动网络发送请求;微信小程序 */
+    forceCellularNetwork?: boolean;
+    /** @desc 开启后可在headers中编辑cookie;支付宝小程序 10.2.33+ */
+    enableCookie?: boolean;
+    /** @desc 是否开启云加速;百度小程序 3.310.11+ */
+    cloudCache?: boolean | object;
+    /** @desc 控制当前请求是否延时至首屏内容渲染后发送；百度小程序 3.310.11+ */
+    defer?: boolean;
+
+    /** @desc 自定义参数 */
+    custom?: HttpCustom;
+
+    /** @desc 返回当前请求的 task 和 options，不要在这里修改 options */
+    getTask?: (task: T, options: HttpRequestConfig<T>) => void;
+
+    /** @desc 需要上传的文件列表，使用 files 时，filePath 和 name 不生效，仅支持 App、H5 (2.6.15+) */
+    files?: { name?: string; file?: File; uri: string; }[];
+    /** @desc 文件类型，仅支付宝小程序支持且为必填项 */
+    fileType?: HttpFileType;
+    /** @desc 要上传的文件对象，仅 H5 (2.6.15+) 支持 */
+    file?: File;
+    /** @desc 要上传文件资源的路径，使用 files 时，filePath 和 name 不生效 */
+    filePath?: string;
+    /** @desc 文件对应的 key，开发者在服务器端通过这个 key 可以获取到文件二进制内容，使用 files 时，filePath 和 name 不生效 */
+    name?: string;
+    /** @desc 请求中其他额外的 form data */
+    formData?: HttpFormData;
+}
+
+export interface HttpResponse<T = any, D = HttpTask> {
+    data: T;
+    statusCode: number;
+    header: HttpResponseHeader;
+    config: HttpRequestConfig<D>;
+    cookies: string[];
+    errMsg: string;
+    rawData: any;
+}
+
+export interface HttpUploadResponse<T = any, D = HttpTask> {
+    data: T;
+    statusCode: number;
+    config: HttpRequestConfig<D>;
+    errMsg: string;
+    rawData: any;
+}
+
+export interface HttpDownloadResponse extends HttpResponse {
+    tempFilePath: string;
+    apFilePath?: string;
+    filePath?: string;
+    fileContent?: string;
+}
+
+export interface HttpError<T = any, D = HttpTask> {
+    data?: T;
+    statusCode?: number;
+    header?: HttpResponseHeader;
+    config: HttpRequestConfig<D>;
+    cookies?: string[];
+    errMsg: string;
+}
+
+export interface HttpPromise<T = any> extends Promise<HttpResponse<T>> {
+}
+
+export interface HttpInterceptorManager<V, E = V> {
+    use(onFulfilled?: (value: V) => V | Promise<V>, onRejected?: (error: E) => T | Promise<E>): void;
+
+    eject(id: number): void;
+}
+
+export abstract class HttpRequestAbstract {
+    constructor(config?: HttpRequestConfig);
+
+    interceptors: {
+        request: HttpInterceptorManager<HttpRequestConfig>;
+        response: HttpInterceptorManager<HttpResponse, HttpError>;
+    }
+
+    request<T = any, R = HttpResponse<T>, D = HttpRequestTask>(config: HttpRequestConfig<D>): Promise<R>;
+
+    get<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, config?: HttpRequestConfig<D>): Promise<R>;
+
+    delete<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    head<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    options<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    post<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    put<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    config: HttpRequestConfig;
+
+    setConfig<D = HttpTask>(onSend: (config: HttpRequestConfig<D>) => HttpRequestConfig<D>): void;
+
+    connect<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    trace<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    upload<T = any, R = HttpUploadResponse<T>, D = HttpUploadTask>(url: string, config?: HttpRequestConfig<D>): Promise<R>;
+
+    download<T = any, R = HttpDownloadResponse<T>, D = HttpDownloadTask>(url: string, config?: HttpRequestConfig<D>): Promise<R>;
+
+    middleware<T = any, R = HttpResponse<T>, D = HttpTask>(config: HttpRequestConfig<D>): Promise<R>;
+}
+
+declare class HttpRequest extends HttpRequestAbstract {
+}
+
+export default HttpRequest;
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/index.js b/uni_modules/uv-ui-tools/libs/luch-request/index.js
new file mode 100644
index 0000000..d8fe348
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/index.js
@@ -0,0 +1,2 @@
+import Request from './core/Request'
+export default Request
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/utils.js b/uni_modules/uv-ui-tools/libs/luch-request/utils.js
new file mode 100644
index 0000000..0b5bf21
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/utils.js
@@ -0,0 +1,135 @@
+'use strict'
+
+// utils is a library of generic helper functions non-specific to axios
+
+var toString = Object.prototype.toString
+
+/**
+ * Determine if a value is an Array
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an Array, otherwise false
+ */
+export function isArray (val) {
+  return toString.call(val) === '[object Array]'
+}
+
+
+/**
+ * Determine if a value is an Object
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an Object, otherwise false
+ */
+export function isObject (val) {
+  return val !== null && typeof val === 'object'
+}
+
+/**
+ * Determine if a value is a Date
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Date, otherwise false
+ */
+export function isDate (val) {
+  return toString.call(val) === '[object Date]'
+}
+
+/**
+ * Determine if a value is a URLSearchParams object
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a URLSearchParams object, otherwise false
+ */
+export function isURLSearchParams (val) {
+  return typeof URLSearchParams !== 'undefined' && val instanceof URLSearchParams
+}
+
+
+/**
+ * Iterate over an Array or an Object invoking a function for each item.
+ *
+ * If `obj` is an Array callback will be called passing
+ * the value, index, and complete array for each item.
+ *
+ * If 'obj' is an Object callback will be called passing
+ * the value, key, and complete object for each property.
+ *
+ * @param {Object|Array} obj The object to iterate
+ * @param {Function} fn The callback to invoke for each item
+ */
+export function forEach (obj, fn) {
+  // Don't bother if no value provided
+  if (obj === null || typeof obj === 'undefined') {
+    return
+  }
+
+  // Force an array if not already something iterable
+  if (typeof obj !== 'object') {
+    /*eslint no-param-reassign:0*/
+    obj = [obj]
+  }
+
+  if (isArray(obj)) {
+    // Iterate over array values
+    for (var i = 0, l = obj.length; i < l; i++) {
+      fn.call(null, obj[i], i, obj)
+    }
+  } else {
+    // Iterate over object keys
+    for (var key in obj) {
+      if (Object.prototype.hasOwnProperty.call(obj, key)) {
+        fn.call(null, obj[key], key, obj)
+      }
+    }
+  }
+}
+
+/**
+ * 是否为boolean 值
+ * @param val
+ * @returns {boolean}
+ */
+export function isBoolean(val) {
+  return typeof val === 'boolean'
+}
+
+/**
+ * 是否为真正的对象{} new Object
+ * @param {any} obj - 检测的对象
+ * @returns {boolean}
+ */
+export function isPlainObject(obj) {
+  return Object.prototype.toString.call(obj) === '[object Object]'
+}
+
+
+
+/**
+ * Function equal to merge with the difference being that no reference
+ * to original objects is kept.
+ *
+ * @see merge
+ * @param {Object} obj1 Object to merge
+ * @returns {Object} Result of all merge properties
+ */
+export function deepMerge(/* obj1, obj2, obj3, ... */) {
+  let result = {}
+  function assignValue(val, key) {
+    if (typeof result[key] === 'object' && typeof val === 'object') {
+      result[key] = deepMerge(result[key], val)
+    } else if (typeof val === 'object') {
+      result[key] = deepMerge({}, val)
+    } else {
+      result[key] = val
+    }
+  }
+  for (let i = 0, l = arguments.length; i < l; i++) {
+    forEach(arguments[i], assignValue)
+  }
+  return result
+}
+
+export function isUndefined (val) {
+  return typeof val === 'undefined'
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/utils/clone.js b/uni_modules/uv-ui-tools/libs/luch-request/utils/clone.js
new file mode 100644
index 0000000..2fee704
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/utils/clone.js
@@ -0,0 +1,264 @@
+/* eslint-disable */
+var clone = (function() {
+  'use strict';
+
+  function _instanceof(obj, type) {
+    return type != null && obj instanceof type;
+  }
+
+  var nativeMap;
+  try {
+    nativeMap = Map;
+  } catch(_) {
+    // maybe a reference error because no `Map`. Give it a dummy value that no
+    // value will ever be an instanceof.
+    nativeMap = function() {};
+  }
+
+  var nativeSet;
+  try {
+    nativeSet = Set;
+  } catch(_) {
+    nativeSet = function() {};
+  }
+
+  var nativePromise;
+  try {
+    nativePromise = Promise;
+  } catch(_) {
+    nativePromise = function() {};
+  }
+
+  /**
+   * Clones (copies) an Object using deep copying.
+   *
+   * This function supports circular references by default, but if you are certain
+   * there are no circular references in your object, you can save some CPU time
+   * by calling clone(obj, false).
+   *
+   * Caution: if `circular` is false and `parent` contains circular references,
+   * your program may enter an infinite loop and crash.
+   *
+   * @param `parent` - the object to be cloned
+   * @param `circular` - set to true if the object to be cloned may contain
+   *    circular references. (optional - true by default)
+   * @param `depth` - set to a number if the object is only to be cloned to
+   *    a particular depth. (optional - defaults to Infinity)
+   * @param `prototype` - sets the prototype to be used when cloning an object.
+   *    (optional - defaults to parent prototype).
+   * @param `includeNonEnumerable` - set to true if the non-enumerable properties
+   *    should be cloned as well. Non-enumerable properties on the prototype
+   *    chain will be ignored. (optional - false by default)
+   */
+  function clone(parent, circular, depth, prototype, includeNonEnumerable) {
+    if (typeof circular === 'object') {
+      depth = circular.depth;
+      prototype = circular.prototype;
+      includeNonEnumerable = circular.includeNonEnumerable;
+      circular = circular.circular;
+    }
+    // maintain two arrays for circular references, where corresponding parents
+    // and children have the same index
+    var allParents = [];
+    var allChildren = [];
+
+    var useBuffer = typeof Buffer != 'undefined';
+
+    if (typeof circular == 'undefined')
+      circular = true;
+
+    if (typeof depth == 'undefined')
+      depth = Infinity;
+
+    // recurse this function so we don't reset allParents and allChildren
+    function _clone(parent, depth) {
+      // cloning null always returns null
+      if (parent === null)
+        return null;
+
+      if (depth === 0)
+        return parent;
+
+      var child;
+      var proto;
+      if (typeof parent != 'object') {
+        return parent;
+      }
+
+      if (_instanceof(parent, nativeMap)) {
+        child = new nativeMap();
+      } else if (_instanceof(parent, nativeSet)) {
+        child = new nativeSet();
+      } else if (_instanceof(parent, nativePromise)) {
+        child = new nativePromise(function (resolve, reject) {
+          parent.then(function(value) {
+            resolve(_clone(value, depth - 1));
+          }, function(err) {
+            reject(_clone(err, depth - 1));
+          });
+        });
+      } else if (clone.__isArray(parent)) {
+        child = [];
+      } else if (clone.__isRegExp(parent)) {
+        child = new RegExp(parent.source, __getRegExpFlags(parent));
+        if (parent.lastIndex) child.lastIndex = parent.lastIndex;
+      } else if (clone.__isDate(parent)) {
+        child = new Date(parent.getTime());
+      } else if (useBuffer && Buffer.isBuffer(parent)) {
+        if (Buffer.from) {
+          // Node.js >= 5.10.0
+          child = Buffer.from(parent);
+        } else {
+          // Older Node.js versions
+          child = new Buffer(parent.length);
+          parent.copy(child);
+        }
+        return child;
+      } else if (_instanceof(parent, Error)) {
+        child = Object.create(parent);
+      } else {
+        if (typeof prototype == 'undefined') {
+          proto = Object.getPrototypeOf(parent);
+          child = Object.create(proto);
+        }
+        else {
+          child = Object.create(prototype);
+          proto = prototype;
+        }
+      }
+
+      if (circular) {
+        var index = allParents.indexOf(parent);
+
+        if (index != -1) {
+          return allChildren[index];
+        }
+        allParents.push(parent);
+        allChildren.push(child);
+      }
+
+      if (_instanceof(parent, nativeMap)) {
+        parent.forEach(function(value, key) {
+          var keyChild = _clone(key, depth - 1);
+          var valueChild = _clone(value, depth - 1);
+          child.set(keyChild, valueChild);
+        });
+      }
+      if (_instanceof(parent, nativeSet)) {
+        parent.forEach(function(value) {
+          var entryChild = _clone(value, depth - 1);
+          child.add(entryChild);
+        });
+      }
+
+      for (var i in parent) {
+        var attrs = Object.getOwnPropertyDescriptor(parent, i);
+        if (attrs) {
+          child[i] = _clone(parent[i], depth - 1);
+        }
+
+        try {
+          var objProperty = Object.getOwnPropertyDescriptor(parent, i);
+          if (objProperty.set === 'undefined') {
+            // no setter defined. Skip cloning this property
+            continue;
+          }
+          child[i] = _clone(parent[i], depth - 1);
+        } catch(e){
+          if (e instanceof TypeError) {
+            // when in strict mode, TypeError will be thrown if child[i] property only has a getter
+            // we can't do anything about this, other than inform the user that this property cannot be set.
+            continue
+          } else if (e instanceof ReferenceError) {
+            //this may happen in non strict mode
+            continue
+          }
+        }
+
+      }
+
+      if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(parent);
+        for (var i = 0; i < symbols.length; i++) {
+          // Don't need to worry about cloning a symbol because it is a primitive,
+          // like a number or string.
+          var symbol = symbols[i];
+          var descriptor = Object.getOwnPropertyDescriptor(parent, symbol);
+          if (descriptor && !descriptor.enumerable && !includeNonEnumerable) {
+            continue;
+          }
+          child[symbol] = _clone(parent[symbol], depth - 1);
+          Object.defineProperty(child, symbol, descriptor);
+        }
+      }
+
+      if (includeNonEnumerable) {
+        var allPropertyNames = Object.getOwnPropertyNames(parent);
+        for (var i = 0; i < allPropertyNames.length; i++) {
+          var propertyName = allPropertyNames[i];
+          var descriptor = Object.getOwnPropertyDescriptor(parent, propertyName);
+          if (descriptor && descriptor.enumerable) {
+            continue;
+          }
+          child[propertyName] = _clone(parent[propertyName], depth - 1);
+          Object.defineProperty(child, propertyName, descriptor);
+        }
+      }
+
+      return child;
+    }
+
+    return _clone(parent, depth);
+  }
+
+  /**
+   * Simple flat clone using prototype, accepts only objects, usefull for property
+   * override on FLAT configuration object (no nested props).
+   *
+   * USE WITH CAUTION! This may not behave as you wish if you do not know how this
+   * works.
+   */
+  clone.clonePrototype = function clonePrototype(parent) {
+    if (parent === null)
+      return null;
+
+    var c = function () {};
+    c.prototype = parent;
+    return new c();
+  };
+
+// private utility functions
+
+  function __objToStr(o) {
+    return Object.prototype.toString.call(o);
+  }
+  clone.__objToStr = __objToStr;
+
+  function __isDate(o) {
+    return typeof o === 'object' && __objToStr(o) === '[object Date]';
+  }
+  clone.__isDate = __isDate;
+
+  function __isArray(o) {
+    return typeof o === 'object' && __objToStr(o) === '[object Array]';
+  }
+  clone.__isArray = __isArray;
+
+  function __isRegExp(o) {
+    return typeof o === 'object' && __objToStr(o) === '[object RegExp]';
+  }
+  clone.__isRegExp = __isRegExp;
+
+  function __getRegExpFlags(re) {
+    var flags = '';
+    if (re.global) flags += 'g';
+    if (re.ignoreCase) flags += 'i';
+    if (re.multiline) flags += 'm';
+    return flags;
+  }
+  clone.__getRegExpFlags = __getRegExpFlags;
+
+  return clone;
+})();
+
+export default clone
diff --git a/uni_modules/uv-ui-tools/libs/mixin/button.js b/uni_modules/uv-ui-tools/libs/mixin/button.js
new file mode 100644
index 0000000..0c019c2
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/mixin/button.js
@@ -0,0 +1,13 @@
+export default {
+    props: {
+        lang: String,
+        sessionFrom: String,
+        sendMessageTitle: String,
+        sendMessagePath: String,
+        sendMessageImg: String,
+        showMessageCard: Boolean,
+        appParameter: String,
+        formType: String,
+        openType: String
+    }
+}
diff --git a/uni_modules/uv-ui-tools/libs/mixin/mixin.js b/uni_modules/uv-ui-tools/libs/mixin/mixin.js
new file mode 100644
index 0000000..0dd3b03
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/mixin/mixin.js
@@ -0,0 +1,172 @@
+import * as index from '../function/index.js';
+import * as test from '../function/test.js';
+import route from '../util/route.js';
+import debounce from '../function/debounce.js';
+import throttle from '../function/throttle.js';
+export default {
+	// 定义每个组件都可能需要用到的外部样式以及类名
+	props: {
+		// 每个组件都有的父组件传递的样式，可以为字符串或者对象形式
+		customStyle: {
+			type: [Object, String],
+			default: () => ({})
+		},
+		customClass: {
+			type: String,
+			default: ''
+		},
+		// 跳转的页面路径
+		url: {
+			type: String,
+			default: ''
+		},
+		// 页面跳转的类型
+		linkType: {
+			type: String,
+			default: 'navigateTo'
+		}
+	},
+	data() {
+		return {}
+	},
+	onLoad() {
+		// getRect挂载到$uv上，因为这方法需要使用in(this)，所以无法把它独立成一个单独的文件导出
+		this.$uv.getRect = this.$uvGetRect
+	},
+	created() {
+		// 组件当中，只有created声明周期，为了能在组件使用，故也在created中将方法挂载到$uv
+		this.$uv.getRect = this.$uvGetRect
+	},
+	computed: {
+		$uv() {
+			return {
+				...index,
+				test,
+				route,
+				debounce,
+				throttle,
+				unit: uni?.$uv?.config?.unit
+			}
+		},
+		/**
+		 * 生成bem规则类名
+		 * 由于微信小程序，H5，nvue之间绑定class的差异，无法通过:class="[bem()]"的形式进行同用
+		 * 故采用如下折中做法，最后返回的是数组（一般平台）或字符串（支付宝和字节跳动平台），类似['a', 'b', 'c']或'a b c'的形式
+		 * @param {String} name 组件名称
+		 * @param {Array} fixed 一直会存在的类名
+		 * @param {Array} change 会根据变量值为true或者false而出现或者隐藏的类名
+		 * @returns {Array|string}
+		 */
+		bem() {
+			return function(name, fixed, change) {
+				// 类名前缀
+				const prefix = `uv-${name}--`
+				const classes = {}
+				if (fixed) {
+					fixed.map((item) => {
+						// 这里的类名，会一直存在
+						classes[prefix + this[item]] = true
+					})
+				}
+				if (change) {
+					change.map((item) => {
+						// 这里的类名，会根据this[item]的值为true或者false，而进行添加或者移除某一个类
+						this[item] ? (classes[prefix + item] = this[item]) : (delete classes[prefix + item])
+					})
+				}
+				return Object.keys(classes)
+					// 支付宝，头条小程序无法动态绑定一个数组类名，否则解析出来的结果会带有","，而导致失效
+					// #ifdef MP-ALIPAY || MP-TOUTIAO || MP-LARK || MP-BAIDU
+					.join(' ')
+				// #endif
+			}
+		}
+	},
+	methods: {
+		// 跳转某一个页面
+		openPage(urlKey = 'url') {
+			const url = this[urlKey]
+			if (url) {
+				// 执行类似uni.navigateTo的方法
+				uni[this.linkType]({
+					url
+				})
+			}
+		},
+		// 查询节点信息
+		// 目前此方法在支付宝小程序中无法获取组件跟接点的尺寸，为支付宝的bug(2020-07-21)
+		// 解决办法为在组件根部再套一个没有任何作用的view元素
+		$uvGetRect(selector, all) {
+			return new Promise((resolve) => {
+				uni.createSelectorQuery()
+					.in(this)[all ? 'selectAll' : 'select'](selector)
+					.boundingClientRect((rect) => {
+						if (all && Array.isArray(rect) && rect.length) {
+							resolve(rect)
+						}
+						if (!all && rect) {
+							resolve(rect)
+						}
+					})
+					.exec()
+			})
+		},
+		getParentData(parentName = '') {
+			// 避免在created中去定义parent变量
+			if (!this.parent) this.parent = {}
+			// 这里的本质原理是，通过获取父组件实例(也即类似uv-radio的父组件uv-radio-group的this)
+			// 将父组件this中对应的参数，赋值给本组件(uv-radio的this)的parentData对象中对应的属性
+			// 之所以需要这么做，是因为所有端中，头条小程序不支持通过this.parent.xxx去监听父组件参数的变化
+			// 此处并不会自动更新子组件的数据，而是依赖父组件uv-radio-group去监听data的变化，手动调用更新子组件的方法去重新获取
+			this.parent = this.$uv.$parent.call(this, parentName)
+			if (this.parent.children) {
+				// 如果父组件的children不存在本组件的实例，才将本实例添加到父组件的children中
+				this.parent.children.indexOf(this) === -1 && this.parent.children.push(this)
+			}
+			if (this.parent && this.parentData) {
+				// 历遍parentData中的属性，将parent中的同名属性赋值给parentData
+				Object.keys(this.parentData).map((key) => {
+					this.parentData[key] = this.parent[key]
+				})
+			}
+		},
+		// 阻止事件冒泡
+		preventEvent(e) {
+			e && typeof(e.stopPropagation) === 'function' && e.stopPropagation()
+		},
+		// 空操作
+		noop(e) {
+			this.preventEvent(e)
+		}
+	},
+	onReachBottom() {
+		uni.$emit('uvOnReachBottom')
+	},
+	beforeDestroy() {
+		// 判断当前页面是否存在parent和chldren，一般在checkbox和checkbox-group父子联动的场景会有此情况
+		// 组件销毁时，移除子组件在父组件children数组中的实例，释放资源，避免数据混乱
+		if (this.parent && test.array(this.parent.children)) {
+			// 组件销毁时，移除父组件中的children数组中对应的实例
+			const childrenList = this.parent.children
+			childrenList.map((child, index) => {
+				// 如果相等，则移除
+				if (child === this) {
+					childrenList.splice(index, 1)
+				}
+			})
+		}
+	},
+	// 兼容vue3
+	unmounted() {
+		if (this.parent && test.array(this.parent.children)) {
+			// 组件销毁时，移除父组件中的children数组中对应的实例
+			const childrenList = this.parent.children
+			childrenList.map((child, index) => {
+				// 如果相等，则移除
+				if (child === this) {
+					childrenList.splice(index, 1)
+				}
+			})
+		}
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js b/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js
new file mode 100644
index 0000000..90b6903
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js
@@ -0,0 +1,8 @@
+export default {
+    // #ifdef MP-WEIXIN
+    // 将自定义节点设置成虚拟的（去掉自定义组件包裹层），更加接近Vue组件的表现，能更好的使用flex属性
+    options: {
+        virtualHost: true
+    }
+    // #endif
+}
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/libs/mixin/mpShare.js b/uni_modules/uv-ui-tools/libs/mixin/mpShare.js
new file mode 100644
index 0000000..c9695a0
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/mixin/mpShare.js
@@ -0,0 +1,13 @@
+export default {
+	onLoad() {
+	    // 设置默认的转发参数
+	    uni.$uv.mpShare = {
+	        title: '', // 默认为小程序名称
+	        path: '', // 默认为当前页面路径
+	        imageUrl: '' // 默认为当前页面的截图
+	    }
+	},
+	onShareAppMessage() {
+	    return uni.$uv.mpShare
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/libs/mixin/openType.js b/uni_modules/uv-ui-tools/libs/mixin/openType.js
new file mode 100644
index 0000000..1b94b7e
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/mixin/openType.js
@@ -0,0 +1,47 @@
+export default {
+    props: {
+        openType: String
+    },
+		emits: ['getphonenumber','getuserinfo','error','opensetting','launchapp','contact','chooseavatar','addgroupapp','chooseaddress','subscribe','login','im'],
+    methods: {
+        onGetPhoneNumber(event) {
+            this.$emit('getphonenumber', event.detail)
+        },
+        onGetUserInfo(event) {
+            this.$emit('getuserinfo', event.detail)
+        },
+        onError(event) {
+            this.$emit('error', event.detail)
+        },
+        onOpenSetting(event) {
+            this.$emit('opensetting', event.detail)
+        },
+        onLaunchApp(event) {
+            this.$emit('launchapp', event.detail)
+        },
+        onContact(event) {
+            this.$emit('contact', event.detail)
+        },
+        onChooseavatar(event) {
+            this.$emit('chooseavatar', event.detail)
+        },
+        onAgreeprivacyauthorization(event) {
+            this.$emit('agreeprivacyauthorization', event.detail)
+        },
+        onAddgroupapp(event) {
+            this.$emit('addgroupapp', event.detail)
+        },
+        onChooseaddress(event) {
+            this.$emit('chooseaddress', event.detail)
+        },
+        onSubscribe(event) {
+            this.$emit('subscribe', event.detail)
+        },
+        onLogin(event) {
+            this.$emit('login', event.detail)
+        },
+        onIm(event) {
+            this.$emit('im', event.detail)
+        }
+    }
+}
diff --git a/uni_modules/uv-ui-tools/libs/mixin/touch.js b/uni_modules/uv-ui-tools/libs/mixin/touch.js
new file mode 100644
index 0000000..0ecbd88
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/mixin/touch.js
@@ -0,0 +1,59 @@
+const MIN_DISTANCE = 10
+
+function getDirection(x, y) {
+    if (x > y && x > MIN_DISTANCE) {
+        return 'horizontal'
+    }
+    if (y > x && y > MIN_DISTANCE) {
+        return 'vertical'
+    }
+    return ''
+}
+
+export default {
+    methods: {
+        getTouchPoint(e) {
+            if (!e) {
+                return {
+                    x: 0,
+                    y: 0
+                }
+            } if (e.touches && e.touches[0]) {
+                return {
+                    x: e.touches[0].pageX,
+                    y: e.touches[0].pageY
+                }
+            } if (e.changedTouches && e.changedTouches[0]) {
+                return {
+                    x: e.changedTouches[0].pageX,
+                    y: e.changedTouches[0].pageY
+                }
+            }
+            return {
+                x: e.clientX || 0,
+                y: e.clientY || 0
+            }
+        },
+        resetTouchStatus() {
+            this.direction = ''
+            this.deltaX = 0
+            this.deltaY = 0
+            this.offsetX = 0
+            this.offsetY = 0
+        },
+        touchStart(event) {
+            this.resetTouchStatus()
+            const touch = this.getTouchPoint(event)
+            this.startX = touch.x
+            this.startY = touch.y
+        },
+        touchMove(event) {
+            const touch = this.getTouchPoint(event)
+            this.deltaX = touch.x - this.startX
+            this.deltaY = touch.y - this.startY
+            this.offsetX = Math.abs(this.deltaX)
+            this.offsetY = Math.abs(this.deltaY)
+            this.direction =				this.direction || getDirection(this.offsetX, this.offsetY)
+        }
+    }
+}
diff --git a/uni_modules/uv-ui-tools/libs/util/dayjs.js b/uni_modules/uv-ui-tools/libs/util/dayjs.js
new file mode 100644
index 0000000..c84ab68
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/util/dayjs.js
@@ -0,0 +1,216 @@
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+
+var require_dayjs_min = __commonJS({
+  "uvuidayjs"(exports, module) {
+    !function(t, e) {
+      "object" == typeof exports && "undefined" != typeof module ? module.exports = e() : "function" == typeof define && define.amd ? define(e) : (t = "undefined" != typeof globalThis ? globalThis : t || self).dayjs = e();
+    }(exports, function() {
+      "use strict";
+      var t = 1e3, e = 6e4, n = 36e5, r = "millisecond", i = "second", s = "minute", u = "hour", a = "day", o = "week", f = "month", h = "quarter", c = "year", d = "date", l = "Invalid Date", $ = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/, y = /\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g, M = { name: "en", weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"), ordinal: function(t2) {
+        var e2 = ["th", "st", "nd", "rd"], n2 = t2 % 100;
+        return "[" + t2 + (e2[(n2 - 20) % 10] || e2[n2] || e2[0]) + "]";
+      } }, m = function(t2, e2, n2) {
+        var r2 = String(t2);
+        return !r2 || r2.length >= e2 ? t2 : "" + Array(e2 + 1 - r2.length).join(n2) + t2;
+      }, v = { s: m, z: function(t2) {
+        var e2 = -t2.utcOffset(), n2 = Math.abs(e2), r2 = Math.floor(n2 / 60), i2 = n2 % 60;
+        return (e2 <= 0 ? "+" : "-") + m(r2, 2, "0") + ":" + m(i2, 2, "0");
+      }, m: function t2(e2, n2) {
+        if (e2.date() < n2.date())
+          return -t2(n2, e2);
+        var r2 = 12 * (n2.year() - e2.year()) + (n2.month() - e2.month()), i2 = e2.clone().add(r2, f), s2 = n2 - i2 < 0, u2 = e2.clone().add(r2 + (s2 ? -1 : 1), f);
+        return +(-(r2 + (n2 - i2) / (s2 ? i2 - u2 : u2 - i2)) || 0);
+      }, a: function(t2) {
+        return t2 < 0 ? Math.ceil(t2) || 0 : Math.floor(t2);
+      }, p: function(t2) {
+        return { M: f, y: c, w: o, d: a, D: d, h: u, m: s, s: i, ms: r, Q: h }[t2] || String(t2 || "").toLowerCase().replace(/s$/, "");
+      }, u: function(t2) {
+        return void 0 === t2;
+      } }, g = "en", D = {};
+      D[g] = M;
+      var p = function(t2) {
+        return t2 instanceof _;
+      }, S = function t2(e2, n2, r2) {
+        var i2;
+        if (!e2)
+          return g;
+        if ("string" == typeof e2) {
+          var s2 = e2.toLowerCase();
+          D[s2] && (i2 = s2), n2 && (D[s2] = n2, i2 = s2);
+          var u2 = e2.split("-");
+          if (!i2 && u2.length > 1)
+            return t2(u2[0]);
+        } else {
+          var a2 = e2.name;
+          D[a2] = e2, i2 = a2;
+        }
+        return !r2 && i2 && (g = i2), i2 || !r2 && g;
+      }, w = function(t2, e2) {
+        if (p(t2))
+          return t2.clone();
+        var n2 = "object" == typeof e2 ? e2 : {};
+        return n2.date = t2, n2.args = arguments, new _(n2);
+      }, O = v;
+      O.l = S, O.i = p, O.w = function(t2, e2) {
+        return w(t2, { locale: e2.$L, utc: e2.$u, x: e2.$x, $offset: e2.$offset });
+      };
+      var _ = function() {
+        function M2(t2) {
+          this.$L = S(t2.locale, null, true), this.parse(t2);
+        }
+        var m2 = M2.prototype;
+        return m2.parse = function(t2) {
+          this.$d = function(t3) {
+            var e2 = t3.date, n2 = t3.utc;
+            if (null === e2)
+              return new Date(NaN);
+            if (O.u(e2))
+              return new Date();
+            if (e2 instanceof Date)
+              return new Date(e2);
+            if ("string" == typeof e2 && !/Z$/i.test(e2)) {
+              var r2 = e2.match($);
+              if (r2) {
+                var i2 = r2[2] - 1 || 0, s2 = (r2[7] || "0").substring(0, 3);
+                return n2 ? new Date(Date.UTC(r2[1], i2, r2[3] || 1, r2[4] || 0, r2[5] || 0, r2[6] || 0, s2)) : new Date(r2[1], i2, r2[3] || 1, r2[4] || 0, r2[5] || 0, r2[6] || 0, s2);
+              }
+            }
+            return new Date(e2);
+          }(t2), this.$x = t2.x || {}, this.init();
+        }, m2.init = function() {
+          var t2 = this.$d;
+          this.$y = t2.getFullYear(), this.$M = t2.getMonth(), this.$D = t2.getDate(), this.$W = t2.getDay(), this.$H = t2.getHours(), this.$m = t2.getMinutes(), this.$s = t2.getSeconds(), this.$ms = t2.getMilliseconds();
+        }, m2.$utils = function() {
+          return O;
+        }, m2.isValid = function() {
+          return !(this.$d.toString() === l);
+        }, m2.isSame = function(t2, e2) {
+          var n2 = w(t2);
+          return this.startOf(e2) <= n2 && n2 <= this.endOf(e2);
+        }, m2.isAfter = function(t2, e2) {
+          return w(t2) < this.startOf(e2);
+        }, m2.isBefore = function(t2, e2) {
+          return this.endOf(e2) < w(t2);
+        }, m2.$g = function(t2, e2, n2) {
+          return O.u(t2) ? this[e2] : this.set(n2, t2);
+        }, m2.unix = function() {
+          return Math.floor(this.valueOf() / 1e3);
+        }, m2.valueOf = function() {
+          return this.$d.getTime();
+        }, m2.startOf = function(t2, e2) {
+          var n2 = this, r2 = !!O.u(e2) || e2, h2 = O.p(t2), l2 = function(t3, e3) {
+            var i2 = O.w(n2.$u ? Date.UTC(n2.$y, e3, t3) : new Date(n2.$y, e3, t3), n2);
+            return r2 ? i2 : i2.endOf(a);
+          }, $2 = function(t3, e3) {
+            return O.w(n2.toDate()[t3].apply(n2.toDate("s"), (r2 ? [0, 0, 0, 0] : [23, 59, 59, 999]).slice(e3)), n2);
+          }, y2 = this.$W, M3 = this.$M, m3 = this.$D, v2 = "set" + (this.$u ? "UTC" : "");
+          switch (h2) {
+            case c:
+              return r2 ? l2(1, 0) : l2(31, 11);
+            case f:
+              return r2 ? l2(1, M3) : l2(0, M3 + 1);
+            case o:
+              var g2 = this.$locale().weekStart || 0, D2 = (y2 < g2 ? y2 + 7 : y2) - g2;
+              return l2(r2 ? m3 - D2 : m3 + (6 - D2), M3);
+            case a:
+            case d:
+              return $2(v2 + "Hours", 0);
+            case u:
+              return $2(v2 + "Minutes", 1);
+            case s:
+              return $2(v2 + "Seconds", 2);
+            case i:
+              return $2(v2 + "Milliseconds", 3);
+            default:
+              return this.clone();
+          }
+        }, m2.endOf = function(t2) {
+          return this.startOf(t2, false);
+        }, m2.$set = function(t2, e2) {
+          var n2, o2 = O.p(t2), h2 = "set" + (this.$u ? "UTC" : ""), l2 = (n2 = {}, n2[a] = h2 + "Date", n2[d] = h2 + "Date", n2[f] = h2 + "Month", n2[c] = h2 + "FullYear", n2[u] = h2 + "Hours", n2[s] = h2 + "Minutes", n2[i] = h2 + "Seconds", n2[r] = h2 + "Milliseconds", n2)[o2], $2 = o2 === a ? this.$D + (e2 - this.$W) : e2;
+          if (o2 === f || o2 === c) {
+            var y2 = this.clone().set(d, 1);
+            y2.$d[l2]($2), y2.init(), this.$d = y2.set(d, Math.min(this.$D, y2.daysInMonth())).$d;
+          } else
+            l2 && this.$d[l2]($2);
+          return this.init(), this;
+        }, m2.set = function(t2, e2) {
+          return this.clone().$set(t2, e2);
+        }, m2.get = function(t2) {
+          return this[O.p(t2)]();
+        }, m2.add = function(r2, h2) {
+          var d2, l2 = this;
+          r2 = Number(r2);
+          var $2 = O.p(h2), y2 = function(t2) {
+            var e2 = w(l2);
+            return O.w(e2.date(e2.date() + Math.round(t2 * r2)), l2);
+          };
+          if ($2 === f)
+            return this.set(f, this.$M + r2);
+          if ($2 === c)
+            return this.set(c, this.$y + r2);
+          if ($2 === a)
+            return y2(1);
+          if ($2 === o)
+            return y2(7);
+          var M3 = (d2 = {}, d2[s] = e, d2[u] = n, d2[i] = t, d2)[$2] || 1, m3 = this.$d.getTime() + r2 * M3;
+          return O.w(m3, this);
+        }, m2.subtract = function(t2, e2) {
+          return this.add(-1 * t2, e2);
+        }, m2.format = function(t2) {
+          var e2 = this, n2 = this.$locale();
+          if (!this.isValid())
+            return n2.invalidDate || l;
+          var r2 = t2 || "YYYY-MM-DDTHH:mm:ssZ", i2 = O.z(this), s2 = this.$H, u2 = this.$m, a2 = this.$M, o2 = n2.weekdays, f2 = n2.months, h2 = function(t3, n3, i3, s3) {
+            return t3 && (t3[n3] || t3(e2, r2)) || i3[n3].slice(0, s3);
+          }, c2 = function(t3) {
+            return O.s(s2 % 12 || 12, t3, "0");
+          }, d2 = n2.meridiem || function(t3, e3, n3) {
+            var r3 = t3 < 12 ? "AM" : "PM";
+            return n3 ? r3.toLowerCase() : r3;
+          }, $2 = { YY: String(this.$y).slice(-2), YYYY: this.$y, M: a2 + 1, MM: O.s(a2 + 1, 2, "0"), MMM: h2(n2.monthsShort, a2, f2, 3), MMMM: h2(f2, a2), D: this.$D, DD: O.s(this.$D, 2, "0"), d: String(this.$W), dd: h2(n2.weekdaysMin, this.$W, o2, 2), ddd: h2(n2.weekdaysShort, this.$W, o2, 3), dddd: o2[this.$W], H: String(s2), HH: O.s(s2, 2, "0"), h: c2(1), hh: c2(2), a: d2(s2, u2, true), A: d2(s2, u2, false), m: String(u2), mm: O.s(u2, 2, "0"), s: String(this.$s), ss: O.s(this.$s, 2, "0"), SSS: O.s(this.$ms, 3, "0"), Z: i2 };
+          return r2.replace(y, function(t3, e3) {
+            return e3 || $2[t3] || i2.replace(":", "");
+          });
+        }, m2.utcOffset = function() {
+          return 15 * -Math.round(this.$d.getTimezoneOffset() / 15);
+        }, m2.diff = function(r2, d2, l2) {
+          var $2, y2 = O.p(d2), M3 = w(r2), m3 = (M3.utcOffset() - this.utcOffset()) * e, v2 = this - M3, g2 = O.m(this, M3);
+          return g2 = ($2 = {}, $2[c] = g2 / 12, $2[f] = g2, $2[h] = g2 / 3, $2[o] = (v2 - m3) / 6048e5, $2[a] = (v2 - m3) / 864e5, $2[u] = v2 / n, $2[s] = v2 / e, $2[i] = v2 / t, $2)[y2] || v2, l2 ? g2 : O.a(g2);
+        }, m2.daysInMonth = function() {
+          return this.endOf(f).$D;
+        }, m2.$locale = function() {
+          return D[this.$L];
+        }, m2.locale = function(t2, e2) {
+          if (!t2)
+            return this.$L;
+          var n2 = this.clone(), r2 = S(t2, e2, true);
+          return r2 && (n2.$L = r2), n2;
+        }, m2.clone = function() {
+          return O.w(this.$d, this);
+        }, m2.toDate = function() {
+          return new Date(this.valueOf());
+        }, m2.toJSON = function() {
+          return this.isValid() ? this.toISOString() : null;
+        }, m2.toISOString = function() {
+          return this.$d.toISOString();
+        }, m2.toString = function() {
+          return this.$d.toUTCString();
+        }, M2;
+      }(), T = _.prototype;
+      return w.prototype = T, [["$ms", r], ["$s", i], ["$m", s], ["$H", u], ["$W", a], ["$M", f], ["$y", c], ["$D", d]].forEach(function(t2) {
+        T[t2[1]] = function(e2) {
+          return this.$g(e2, t2[0], t2[1]);
+        };
+      }), w.extend = function(t2, e2) {
+        return t2.$i || (t2(e2, _, w), t2.$i = true), w;
+      }, w.locale = S, w.isDayjs = p, w.unix = function(t2) {
+        return w(1e3 * t2);
+      }, w.en = D[g], w.Ls = D, w.p = {}, w;
+    });
+  }
+});
+export default require_dayjs_min();
diff --git a/uni_modules/uv-ui-tools/libs/util/route.js b/uni_modules/uv-ui-tools/libs/util/route.js
new file mode 100644
index 0000000..80c0afd
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/util/route.js
@@ -0,0 +1,126 @@
+/**
+ * 路由跳转方法，该方法相对于直接使用uni.xxx的好处是使用更加简单快捷
+ * 并且带有路由拦截功能
+ */
+import { queryParams, deepMerge, page } from '@/uni_modules/uv-ui-tools/libs/function/index.js'
+class Router {
+	constructor() {
+		// 原始属性定义
+		this.config = {
+			type: 'navigateTo',
+			url: '',
+			delta: 1, // navigateBack页面后退时,回退的层数
+			params: {}, // 传递的参数
+			animationType: 'pop-in', // 窗口动画,只在APP有效
+			animationDuration: 300, // 窗口动画持续时间,单位毫秒,只在APP有效
+			intercept: false ,// 是否需要拦截
+			events: {} // 页面间通信接口，用于监听被打开页面发送到当前页面的数据。hbuilderx 2.8.9+ 开始支持。
+		}
+		// 因为route方法是需要对外赋值给另外的对象使用，同时route内部有使用this，会导致route失去上下文
+		// 这里在构造函数中进行this绑定
+		this.route = this.route.bind(this)
+	}
+
+	// 判断url前面是否有"/"，如果没有则加上，否则无法跳转
+	addRootPath(url) {
+		return url[0] === '/' ? url : `/${url}`
+	}
+
+	// 整合路由参数
+	mixinParam(url, params) {
+		url = url && this.addRootPath(url)
+
+		// 使用正则匹配，主要依据是判断是否有"/","?","="等，如“/page/index/index?name=mary"
+		// 如果有url中有get参数，转换后无需带上"?"
+		let query = ''
+		if (/.*\/.*\?.*=.*/.test(url)) {
+			// object对象转为get类型的参数
+			query = queryParams(params, false)
+			// 因为已有get参数,所以后面拼接的参数需要带上"&"隔开
+			return url += `&${query}`
+		}
+		// 直接拼接参数，因为此处url中没有后面的query参数，也就没有"?/&"之类的符号
+		query = queryParams(params)
+		return url += query
+	}
+
+	// 对外的方法名称
+	async route(options = {}, params = {}) {
+		// 合并用户的配置和内部的默认配置
+		let mergeConfig = {}
+
+		if (typeof options === 'string') {
+			// 如果options为字符串，则为route(url, params)的形式
+			mergeConfig.url = this.mixinParam(options, params)
+			mergeConfig.type = 'navigateTo'
+		} else {
+			mergeConfig = deepMerge(this.config, options)
+			// 否则正常使用mergeConfig中的url和params进行拼接
+			mergeConfig.url = this.mixinParam(options.url, options.params)
+		}
+		// 如果本次跳转的路径和本页面路径一致，不执行跳转，防止用户快速点击跳转按钮，造成多次跳转同一个页面的问题
+		if (mergeConfig.url === page()) return
+
+		if (params.intercept) {
+			mergeConfig.intercept = params.intercept
+		}
+		// params参数也带给拦截器
+		mergeConfig.params = params
+		// 合并内外部参数
+		mergeConfig = deepMerge(this.config, mergeConfig)
+		// 判断用户是否定义了拦截器
+		if (typeof mergeConfig.intercept === 'function') {
+			// 定一个promise，根据用户执行resolve(true)或者resolve(false)来决定是否进行路由跳转
+			const isNext = await new Promise((resolve, reject) => {
+				mergeConfig.intercept(mergeConfig, resolve)
+			})
+			// 如果isNext为true，则执行路由跳转
+			isNext && this.openPage(mergeConfig)
+		} else {
+			this.openPage(mergeConfig)
+		}
+	}
+
+	// 执行路由跳转
+	openPage(config) {
+		// 解构参数
+		const {
+			url,
+			type,
+			delta,
+			animationType,
+			animationDuration,
+			events
+		} = config
+		if (config.type == 'navigateTo' || config.type == 'to') {
+			uni.navigateTo({
+				url,
+				animationType,
+				animationDuration,
+				events
+			})
+		}
+		if (config.type == 'redirectTo' || config.type == 'redirect') {
+			uni.redirectTo({
+				url
+			})
+		}
+		if (config.type == 'switchTab' || config.type == 'tab') {
+			uni.switchTab({
+				url
+			})
+		}
+		if (config.type == 'reLaunch' || config.type == 'launch') {
+			uni.reLaunch({
+				url
+			})
+		}
+		if (config.type == 'navigateBack' || config.type == 'back') {
+			uni.navigateBack({
+				delta
+			})
+		}
+	}
+}
+
+export default (new Router()).route
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/package.json b/uni_modules/uv-ui-tools/package.json
new file mode 100644
index 0000000..2d940f6
--- /dev/null
+++ b/uni_modules/uv-ui-tools/package.json
@@ -0,0 +1,81 @@
+{
+  "id": "uv-ui-tools",
+  "displayName": "uv-ui-tools 工具集 全面兼容vue3+2、app、h5、小程序等多端",
+  "version": "1.1.25",
+  "description": "uv-ui-tools，集成工具库，强大的Http请求封装，清晰的文档说明，开箱即用。方便使用，可以全局使用",
+  "keywords": [
+    "uv-ui-tools,uv-ui组件库,工具集,uvui,uView2.x"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "插件不采集任何数据",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y",
+          "钉钉": "y",
+          "快手": "y",
+          "飞书": "y",
+          "京东": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/readme.md b/uni_modules/uv-ui-tools/readme.md
new file mode 100644
index 0000000..79a7df5
--- /dev/null
+++ b/uni_modules/uv-ui-tools/readme.md
@@ -0,0 +1,23 @@
+## uv-ui-tools 工具集
+
+> **组件名：uv-ui-tools**
+
+uv-ui工具集成，包括网络Http请求、便捷工具、节流防抖、对象操作、时间格式化、路由跳转、全局唯一标识符、规则校验等等。
+
+该组件推荐配合[uv-ui组件库](https://www.uvui.cn/components/intro.html)使用，单独下载也可以在自己项目中使用，需要做相应的配置，可查看文档。强烈推荐使用[uv-ui组件库](https://www.uvui.cn/components/intro.html)，导入组件都会自动导入`uv-ui-tools`。需要在自己的项目中使用请参考[扩展配置](https://www.uvui.cn/components/setting.html)。
+
+uv-ui破釜沉舟之兼容vue3+2、app、h5、多端小程序的uni-app生态框架，大部分组件基于uView2.x，在经过改进后全面支持vue3，部分组件做了进一步的优化，修复大量BUG，支持单独导入，方便开发者选择导入需要的组件。开箱即用，灵活配置。
+
+# <a href="https://www.uvui.cn/js/intro.html" target="_blank">查看文档</a>
+
+## [下载完整示例项目](https://ext.dcloud.net.cn/plugin?name=uv-ui) <small>（请不要 下载插件ZIP）</small>
+
+### [更多插件，请关注uv-ui组件库](https://ext.dcloud.net.cn/plugin?name=uv-ui)
+
+<a href="https://ext.dcloud.net.cn/plugin?name=uv-ui" target="_blank">
+
+![image](https://mp-a667b617-c5f1-4a2d-9a54-683a67cff588.cdn.bspapp.com/uv-ui/banner.png)
+
+</a>
+
+#### 如使用过程中有任何问题反馈，或者您对uv-ui有一些好的建议，欢迎加入uv-ui官方交流群：<a href="https://www.uvui.cn/components/addQQGroup.html" target="_blank">官方QQ群</a>
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/theme.scss b/uni_modules/uv-ui-tools/theme.scss
new file mode 100644
index 0000000..cfaae92
--- /dev/null
+++ b/uni_modules/uv-ui-tools/theme.scss
@@ -0,0 +1,43 @@
+// 此文件为uvUI的主题变量，这些变量目前只能通过uni.scss引入才有效，另外由于
+// uni.scss中引入的样式会同时混入到全局样式文件和单独每一个页面的样式中，造成微信程序包太大，
+// 故uni.scss只建议放scss变量名相关样式，其他的样式可以通过main.js或者App.vue引入
+
+$uv-main-color: #303133;
+$uv-content-color: #606266;
+$uv-tips-color: #909193;
+$uv-light-color: #c0c4cc;
+$uv-border-color: #dadbde;
+$uv-bg-color: #f3f4f6;
+$uv-disabled-color: #c8c9cc;
+
+$uv-primary: #3c9cff;
+$uv-primary-dark: #398ade;
+$uv-primary-disabled: #9acafc;
+$uv-primary-light: #ecf5ff;
+
+$uv-warning: #f9ae3d;
+$uv-warning-dark: #f1a532;
+$uv-warning-disabled: #f9d39b;
+$uv-warning-light: #fdf6ec;
+
+$uv-success: #5ac725;
+$uv-success-dark: #53c21d;
+$uv-success-disabled: #a9e08f;
+$uv-success-light: #f5fff0;
+
+$uv-error: #f56c6c;
+$uv-error-dark: #e45656;
+$uv-error-disabled: #f7b2b2;
+$uv-error-light: #fef0f0;
+
+$uv-info: #909399;
+$uv-info-dark: #767a82;
+$uv-info-disabled: #c4c6c9;
+$uv-info-light: #f4f4f5;
+
+@mixin flex($direction: row) {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: $direction;
+}
\ No newline at end of file
diff --git a/uni_modules/wmf-code/README.md b/uni_modules/wmf-code/README.md
new file mode 100644
index 0000000..231b420
--- /dev/null
+++ b/uni_modules/wmf-code/README.md
@@ -0,0 +1,84 @@
+<a href="https://meet-ui.com" target="_blank">
+    <h1 align="center">文档地址</h1>
+</a>
+<h1 align="center">https://meet-ui.com/#/</h1>
+<p align="center">为了能够第一时间解决问题，为了不影响各位在项目中使用特此提供微信群交流</p>
+<center>
+<img src="https://img.lovewmf.com/2022-10-19.png"/>
+<img src="https://img.lovewmf.com/2022-05-10.png"/>
+</center>
+
+# 温馨提示
+
+如果使用cli创建的应用请在`vue.config.js`里面添加如下配置
+```
+module.exports = {
+    transpileDependencies: [
+		/[/\\]node_modules[/\\](.+?)?@uni-ui(.*)[/\\]code-plugs/,
+		/[/\\]node_modules[/\\](.+?)?@uni-ui(.*)[/\\]code-ui/
+    ]
+}
+```
+# 微信小程序特别说明
+
+如果在弹窗里面使用，并且弹窗有动画 当弹窗显示的时候二维码会发生偏移或抖动
+因为微信小程序的canvas在真机预览渲染的是原生组件并不是 h5的canavas 所以在开发工具里面没问题但是真机会有问题
+
+解决方案：
+
+	1. 如果是使用uView组件的弹窗 请关闭动画
+	2. 如果是使用uni-popup组件 关闭动画无效 因为uni的弹窗动画关闭 其实是动画时长为0并且是包含在uni-transition详情请查看uni-popup代码
+
+## 如果是使用uni_modules而非Npm
+
+在`pages.json`里面配置如下
+
+```js
+"easycom": {
+	"^w-(.*)": "@/uni_modules/wmf-code/components/w-$1/w-$1.vue"//二维码条形码的配置 如果是uni_modules
+},
+"pages": [
+  //...
+]
+```
+
+## 如果是使用npm而非uni_modules
+
+在`pages.json`里面配置如下
+
+```js
+"easycom": {
+	"^w-(.*)": "@uni-ui/code-ui/components/w-$1/index.vue"//二维码条形码的配置 如果是npm方式使用
+},
+"pages": [
+  //...
+]
+```
+
+## 条形码支持添加文字
+
+<img src="https://img.lovewmf.com/WeChat315bd9b33217fabb1beaaa0d65421bee.png" style="margin-bottom: 10px;" />
+<img src="https://img.lovewmf.com/WeChat9e319e9cd08e96369c09099f2863bff5.png" style="margin-bottom: 10px;" />
+
+<center>
+<figure>
+<img src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/07d4381cff624fc79ab28cdd1bf3cc6a~tplv-k3u1fbpfcp-watermark.image" style="margin-bottom: 10px;" />
+<img src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/71d7c20e8c91495c81d245ccfc83d7e7~tplv-k3u1fbpfcp-watermark.image" style="margin-bottom: 10px;" />
+</figure>
+</center>
+
+# 
+<center>
+<figure>
+<img src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/bfe9eb88cea44007b2627bb640343dcc~tplv-k3u1fbpfcp-watermark.image" style="margin-bottom: 10px;" />
+<img src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/b625254802404a9b84bd699e67b03db4~tplv-k3u1fbpfcp-watermark.image" style="margin-bottom: 10px;" />
+</figure>
+</center>
+
+# 
+<center>
+<figure>
+<img src="https://p9-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/f84328d92b104edbad4c34a8665b4c72~tplv-k3u1fbpfcp-watermark.image" style="margin-bottom: 10px;" />
+<img src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/c1548ccd6c944bbe90ef288817077b8c~tplv-k3u1fbpfcp-watermark.image" style="margin-bottom: 10px;" />
+</figure>
+</center>
diff --git a/uni_modules/wmf-code/changelog.md b/uni_modules/wmf-code/changelog.md
new file mode 100644
index 0000000..7d21184
--- /dev/null
+++ b/uni_modules/wmf-code/changelog.md
@@ -0,0 +1,108 @@
+## 1.6.2（2022-10-24）
+* 修复已知问题
+## 1.6.1（2022-10-19）
+* 支付宝小程序适配问题
+* 修改文档 
+## 1.6.0（2022-07-27）
+* 修改条形码bug
+## 1.5.9（2022-07-26）
+* 修复条形码保存图片部分黑底问题
+## 1.5.8（2022-07-26）
+* 修复支付宝小程序图片保存缺失问题
+## 1.5.7（2022-07-09）
+* 修复条形码保存缺失问题
+## 1.5.6（2022-07-01）
+修改引入错误
+## 1.5.5（2022-07-01）
+* 修复vue3无法通过ref获取保存图片方法
+## 1.5.4（2022-06-01）
+* 条形码支持添加文字
+## 1.5.3（2022-05-31）
+* 修复二维码有时候无法识别问题
+* 建议使用npm方式
+## 1.5.2（2022-05-31）
+修改条形码垂直方向生成图片 参数互换
+## 1.5.1（2022-05-31）
+条形码增加垂直方向 默认水平方向
+## 1.5.0（2022-05-30）
+修改uni_modules引入错误
+## 1.4.9（2022-05-25）
+支持vue3
+## 1.4.8（2021-12-06）
+* 百度小程序不支持canvas的arcTo方法 如果在百度小程序中不支持的全部默认值
+* 小程序平台绘制文字不支持渐变 取color数组第一个
+## 1.4.7（2021-12-05）
+* 修复已知问题
+## 1.4.5（2021-12-05）
+* 修复已知问题
+## 1.4.4（2021-11-30）
+*  level默认值修改为2
+## 1.4.3（2021-11-30）
+* 修复引用js_sdk引用路径
+## 1.4.2（2021-11-29）
+* 修复设置画布大小时没有带单位px导致显示不全
+## 1.4.1（2021-11-29）
+1. 修复在高分辨率屏幕上支付宝小程序显示模糊问题
+2. 修复保存相册图片模糊问题
+## 1.4.0（2021-11-23）
+1.  使用TS重构
+2.  新增二维码文字绘制
+3.  新增二维码padding
+4.  新增二维码中间图片圆角 圆形
+5.  新增长按事件
+6.  二维码边框支持透明
+7.  颜色最多支持10中颜色渐变
+## 1.3.7（2021-11-08）
+修改引入
+## 1.3.6（2021-11-02）
+修改引用路径
+## 1.3.5（2021-10-19）
+canvas 增加 type="2d"
+## 1.3.4（2021-10-14）
+1. 修改百度小程序修改参数无法重新渲染问题
+2. 修改纯中文无法识别问题
+## 1.3.3（2021-09-04）
+修改uni_module引用路径
+## 1.3.2（2021-09-03）
+* 【重要】多个条形码或者二维码同时渲染
+* 增加示例
+## 1.3.1（2021-08-31）
+uni_modules支持组件方式
+## 1.3.0（2021-08-31）
+支持纯文字以及文字数字 字母的混合
+## 1.2.9（2021-08-30）
+新增二维码创建成功回调方法中返回生成的二维码图片
+## 1.2.8（2021-08-20）
+支持vue3
+## 1.2.7（2021-08-20）
+修改版本号
+## 1.2.6（2021-06-28）
+1. 修改自定义组件时微信小程序无法显示二维码的问题
+2. 统一二维码的大小单位为rpx
+## 1.2.5（2021-06-25）
+二维码logo大小增加默认值：30
+## 1.2.4（2021-06-24）
+1. nvue 二维码支持渐变色
+## 1.2.3（2021-06-23）
+1. 修改app不支持颜色渐变问题
+2. 修改判断方式Object.prototype.toString.call()
+## 1.2.2（2021-06-23）
+修改插件描述
+## 1.2.1（2021-06-23）
+修改return 错误
+## 1.1.2（2021-06-23）
+修改文档
+## 1.1.1（2021-06-23）
+ 二维码支持渐变色
+## 1.0.8（2021-06-22）
+兼容nvue
+## 1.0.7（2021-06-09）
+1. 修改保存二维码图片的方法名以及传参方式
+2. 修改微信小程序保存二维码时显示为黑色
+3. 二维码增加参数
+## 1.0.6（2021-06-04）
+修改 description说明
+## 1.0.5（2021-06-04）
+修改文档展示名称
+## 1.0.4（2021-06-04）
+修改符合uni_modules规范
diff --git a/uni_modules/wmf-code/common/helper.js b/uni_modules/wmf-code/common/helper.js
new file mode 100644
index 0000000..b150cd7
--- /dev/null
+++ b/uni_modules/wmf-code/common/helper.js
@@ -0,0 +1,105 @@
+// 判断arr是否为一个数组，返回一个bool值
+function isArray(arr) {
+	return Object.prototype.toString.call(arr) === '[object Array]';
+}
+// 深度克隆
+function deepClone(obj) {
+	// 对常见的“非”值，直接返回原来值
+	if ([null, undefined, NaN, false].includes(obj)) return obj;
+	if (typeof obj !== "object" && typeof obj !== 'function') {
+		//原始类型直接返回
+		return obj;
+	}
+	var o = isArray(obj) ? [] : {};
+	for (let i in obj) {
+		if (obj.hasOwnProperty(i)) {
+			o[i] = typeof obj[i] === "object" ? deepClone(obj[i]) : obj[i];
+		}
+	}
+	return o;
+}
+
+function getUUid(len = 32, firstU = true, radix = null) {
+	let chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
+	let uuid = [];
+	radix = radix || chars.length;
+
+	if (len) {
+		// 如果指定uuid长度,只是取随机的字符,0|x为位运算,能去掉x的小数位,返回整数位
+		for (let i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix];
+	} else {
+		let r;
+		// rfc4122标准要求返回的uuid中,某些位为固定的字符
+		uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
+		uuid[14] = '4';
+
+		for (let i = 0; i < 36; i++) {
+			if (!uuid[i]) {
+				r = 0 | Math.random() * 16;
+				uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
+			}
+		}
+	}
+	// 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class
+	if (firstU) {
+		uuid.shift();
+		return 'u' + uuid.join('');
+	} else {
+		return uuid.join('');
+	}
+}
+function platform () {
+	let val = null;
+	// #ifdef  VUE3
+	val = 'VUE3'
+	// #endif
+	// #ifdef  APP-PLUS
+	val = 'APP-PLUS'
+	// #endif
+	// #ifdef  APP-PLUS-NVUE || APP-NVUE
+	val = 'NVUE'
+	// #endif
+	// #ifdef  H5
+	val = 'H5'
+	// #endif
+	// #ifdef  MP-WEIXIN
+	val = 'MP-WEIXIN'
+	// #endif
+	// #ifdef  MP-ALIPAY
+	val = 'MP-ALIPAY'
+	// #endif
+	// #ifdef  MP-BAIDU
+	val = 'MP-BAIDU'
+	// #endif
+	// #ifdef  MP-TOUTIAO
+	val = 'MP-TOUTIAO'
+	// #endif
+	// #ifdef  MP-LARK
+	val = 'MP-LARK'
+	// #endif
+	// #ifdef  MP-TOUTIAO
+	val = 'MP-QQ'
+	// #endif
+	// #ifdef  MP-KUAISHOU
+	val = 'MP-KUAISHOU'
+	// #endif
+	// #ifdef  MP-360
+	val = 'MP-360'
+	// #endif
+	// #ifdef  QUICKAPP-WEBVIEW
+	val = 'QUICKAPP-WEBVIEW'
+	// #endif
+	// #ifdef  QUICKAPP-WEBVIEW-UNION
+	val = 'QUICKAPP-WEBVIEW-UNION'
+	// #endif
+	// #ifdef  QUICKAPP-WEBVIEW-HUAWEI
+	val = 'QUICKAPP-WEBVIEW-HUAWEI'
+	// #endif
+	return val;
+
+}
+export {
+	deepClone,
+	getUUid,
+	platform
+};
diff --git a/uni_modules/wmf-code/components/w-barcode/w-barcode.vue b/uni_modules/wmf-code/components/w-barcode/w-barcode.vue
new file mode 100644
index 0000000..3661053
--- /dev/null
+++ b/uni_modules/wmf-code/components/w-barcode/w-barcode.vue
@@ -0,0 +1,203 @@
+<template>
+	<view @longtap.stop="longtap">
+		<canvas 
+			:width="info.orient == 'vertical' ? info.destHeight : info.destWidth " 
+			:height="info.orient == 'vertical' ? info.destWidth : info.destHeight" 
+			:canvas-id="item.id" 
+			:id="item.id" 
+			:style="{width:info.orient == 'vertical' ? info.height : info.width,height: info.orient == 'vertical' ? info.width : info.height}" 
+			v-for="item in info.listCode" 
+			:key="item.id"
+			@error="handleError"></canvas>
+	</view>
+</template>
+ <!-- #ifdef  VUE3 -->
+<script setup name="WBarcode">
+	import { 
+		reactive,
+		watch,
+		onMounted,
+		nextTick,
+		getCurrentInstance,
+		defineExpose
+	} from 'vue';
+	import { 
+		BarCode, 
+		GetImg,
+		GetPixelRatio,
+		GetPx ,
+	} from '../../js_sdk/index.js';
+	import { 
+		getUUid, 
+		deepClone,
+		platform,
+	} from '../../common/helper.js'
+	//定义props
+	const props = defineProps({
+	    options:{
+	    	type: Object,
+	    	required: true,
+	    	default: () =>{
+	    	  	return {}
+	    	}
+	    }
+	});
+	const emits = defineEmits(['generate','press','error'])
+	const opt = props.options;
+	const that = getCurrentInstance();
+	const HSize = opt.text ? opt.text.size || 40 +  opt.text.padding || 20 : 0;
+	let info = reactive({
+		id: getUUid(),
+		destWidth: GetPixelRatio() * GetPx(opt.width) + 'px',
+		destHeight: GetPixelRatio() * GetPx(opt.height + HSize) + 'px',
+		width: GetPx(opt.width) + 'px',
+		height: GetPx(opt.height + HSize) + 'px',
+		orient: opt.orient || 'horizontal',
+		listCode: []
+	})
+	onMounted(()=>{
+		SpecialTreatment(opt);
+		nextTick(()=>{
+			generateCode(opt)
+		})
+	});
+	watch(()=>props.options,(val)=>{
+		SpecialTreatment(val);
+		const HSize = val.text ? val.text.size || 40 +  val.text.padding || 20 : 0;
+		info.destWidth= GetPixelRatio() * GetPx(val.width) + 'px',
+		info.destHeight= GetPixelRatio() * GetPx(val.height + HSize) + 'px',
+		info.orient = val.orient || 'horizontal',
+		info.width= GetPx(val.width) + 'px',
+		info.height= GetPx(val.height + HSize) + 'px',
+		setTimeout(()=>{
+			generateCode(val)
+		},100)
+	},{ deep: true })
+	const generateCode = (val)=> {
+		try{
+			const parameter = {...val,orient: info.orient,source: platform(),id: info.id,ctx: that};
+			BarCode(parameter,(res)=>{
+		  		emits('generate',res)
+		  	})
+		}catch(err){console.warn(err)}
+	}
+	const GetCodeImg = async ()=> {
+		try{
+		  	return await GetImg({id: info.id,source: platform(),width: opt.orient == 'vertical' ? opt.height : opt.width,height: opt.orient == 'vertical' ? opt.width : opt.height,ctx: that});
+		}catch(e){console.warn(e)}
+	};
+	const SpecialTreatment = (val) => {//渲染多个canvas特殊处理
+		let obj = deepClone(val);
+		obj.id = info.id;
+		info.listCode = [obj];
+	};
+	// 长按事件
+	const longtap = (e)=>{
+		emits('press',e)
+	}
+	// canvas创建错误 触发
+	const handleError = (e)=>{
+		emits('error',e.detail)
+	}
+	defineExpose({
+	    GetCodeImg
+	})
+
+</script>
+<!-- #endif -->
+
+<!-- #ifndef VUE3 -->
+<script>
+	import { BarCode, GetImg,GetPixelRatio,GetPx } from '../../js_sdk/index.js';
+	import { getUUid, deepClone,platform } from '../../common/helper.js'
+	export default {
+		name: 'WBarcode',
+		props:{
+			options:{
+				type: Object,
+				required: true,
+				default: () =>{
+					return {
+						
+					}
+				}
+			}
+		},
+		data () {
+			return {
+				info:{
+					destHeight: 0,
+					destWidth: 0,
+					width: 0,
+					height: 0,
+					listCode: [],
+					orient: 'horizontal'
+				},
+				id: getUUid()
+			}
+		},
+		mounted() {
+			const HSize = this.options.text ? ((this.options.text.size || 40) + ( this.options.text.padding || 20)) : 0;
+			this.info.height = GetPx(this.options.height + HSize) + 'px';
+			this.info.orient = this.options.orient || 'horizontal';
+			this.info.width = GetPx(this.options.width) + 'px';
+			this.info.destHeight = GetPx(this.options.height + HSize) * GetPixelRatio() + 'px';
+			this.info.destWidth = GetPx(this.options.width) * GetPixelRatio() + 'px';
+			this.SpecialTreatment(this.options)
+			this.$nextTick(()=>{
+				this.generateCode();
+			})
+		},
+		watch: {
+			options:{
+				deep: true,
+				handler (val) {
+					const HSize = val.text ? val.text.size || 40 +  val.text.padding || 20 : 0;
+					this.info.height = GetPx(val.height + HSize) + 'px';
+					this.info.width = GetPx(val.width) + 'px';
+					this.info.destHeight = GetPx(val.height + HSize) * GetPixelRatio() + 'px';
+					this.info.destWidth = GetPx(val.width) * GetPixelRatio() + 'px';
+					this.info.orient = val.orient || 'horizontal'
+					this.SpecialTreatment(val)
+					setTimeout(()=>{// h5平台动态改变canvas大小
+						this.generateCode();
+					},100)
+				}
+			}
+		},
+		methods: {
+			longtap (e){
+				this.$emit('press',e)
+			},
+			handleError (e) {//当发生错误时触发 error 事件，字节跳动小程序与飞书小程序不支持
+				this.$emit('error',e.detail)
+			},
+			SpecialTreatment (val) {//微信小程序渲染多个canvas特殊处理
+				let obj = deepClone(val);
+				obj.id = this.id;
+				this.info.listCode = [obj]
+			},
+			generateCode () {
+				try{
+					const parameter = {...this.options,orient: this.info.orient,source: platform(),id: this.id,ctx: this};
+					BarCode(parameter,(res)=>{
+						this.$emit('generate',res)
+					})
+				}catch(err){console.log(err)}
+			},
+			async GetCodeImg (){
+				try{
+					const pars = {
+						id: this.id,
+						source: platform(),
+						width: this.options.orient == 'vertical' ? this.info.height : this.info.width,
+						height: this.options.orient == 'vertical' ? this.info.width : this.info.height,
+						ctx: this,
+					}
+					return  await GetImg(pars);
+				}catch(e){console.warn(e)}
+			}
+		}
+	}
+</script>
+<!-- #endif -->
diff --git a/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue b/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue
new file mode 100644
index 0000000..5753bb7
--- /dev/null
+++ b/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue
@@ -0,0 +1,175 @@
+<template>
+	<view @longtap.stop="longtap">
+		<canvas 
+			:width="info.destWidth" 
+			:height="info.destHeight" 
+			:canvas-id="item.id" 
+			:id="item.id" 
+			:style="{width:info.width,height: info.height}" 
+			v-for="item in info.listCode" 
+			:key="item.id" 
+			@error="handleError"></canvas>
+	</view>
+</template>
+ <!-- #ifdef  VUE3 -->
+<script setup name="WQrcode">
+	import {reactive, watch,onMounted,nextTick,getCurrentInstance ,defineExpose } from 'vue';
+	import { QRCode, GetImg,GetPixelRatio,GetPx } from '@/uni_modules/wmf-code/js_sdk/index.js';
+	import { getUUid, deepClone,platform } from '../../common/helper.js'
+	//定义props
+	const props = defineProps({
+	    options:{
+	    	type: Object,
+	    	required: true,
+	    	default: () =>{
+	    	  	return {}
+	    	}
+	    }
+	});
+	const emits = defineEmits(['generate','press','error'])
+	const opt = props.options;
+	const that = getCurrentInstance();
+	const SIZE = GetPx(opt.size);
+	let info = reactive({
+		destHeight: SIZE * GetPixelRatio() + 'px',
+		destWidth: SIZE * GetPixelRatio() + 'px',
+		width: SIZE + 'px',
+		height: SIZE + 'px',
+		listCode:[],
+		id: getUUid(),  
+	})
+	onMounted(()=>{
+		SpecialTreatment(opt);
+		nextTick(()=>{
+			generateCode(opt)
+		})
+	});
+	watch(()=>props.options,(val)=>{
+		SpecialTreatment(val);
+		const SIZE_Dynamic = GetPx(val.size);
+		info.destWidth= GetPixelRatio() * SIZE_Dynamic + 'px',
+		info.destHeight= GetPixelRatio() * SIZE_Dynamic + 'px',
+		info.width= SIZE_Dynamic + 'px',
+		info.height= SIZE_Dynamic + 'px',
+			setTimeout(()=>{
+				generateCode(val)
+		},50)
+	},{ deep: true })
+	const SpecialTreatment =(val)=> {//渲染多个canvas特殊处理
+		let obj = deepClone(val);
+		obj.id = info.id;
+		info.listCode = [obj]
+	};
+	const generateCode = (val)=>{
+		try{
+			const parameter = {...val,source: platform(),id: info.id,ctx: that};
+			QRCode(parameter,(res)=>{
+			   	emits('generate',res)
+			})
+		}catch(err){console.warn(err)}
+	};
+	const GetCodeImg = async ()=> {
+		try{
+		   	return await GetImg({id: info.id,source: platform(),width: opt.width,height: opt.height,ctx: that});
+		}catch(e){console.warn(e)}
+	};
+	// 长按事件
+	const longtap = (e)=>{
+		emits('press',e)
+	}
+	// canvas创建错误 触发
+	const handleError = (e)=>{
+		emits('error',e.detail)
+	}
+	defineExpose({
+	    GetCodeImg
+	})
+</script>
+<!-- #endif -->
+
+<!-- #ifndef VUE3 -->
+<script>
+	import { QRCode, GetImg,GetPixelRatio,GetPx } from '@/uni_modules/wmf-code/js_sdk/index.js';
+	import { getUUid, deepClone,platform } from '../../common/helper.js'
+	export default {
+		name: 'WQrcode',
+		props:{
+			options:{
+				type: Object,
+				required: true,
+				default: () =>{
+					return {
+						
+					}
+				}
+			}
+		},
+		data () {
+			return {
+				info:{
+					destHeight: 0,
+					destWidth: 0,
+					width: 0,
+					height: 0,
+					listCode:[],
+				},
+				destHeight: 0,
+				destWidth: 0,
+				width: 0,
+				height: 0,
+				listCode:[],
+				id: getUUid(),
+			}
+		},
+		mounted() {
+			this.info.height = this.info.width = GetPx(this.options.size) + 'px';
+			this.info.destHeight = this.info.destWidth = GetPx(this.options.size) * GetPixelRatio() + 'px';
+			this.SpecialTreatment(this.options)
+			this.$nextTick(()=>{
+				this.generateCode();
+			})
+		},
+		watch: {
+			options:{
+				deep: true,
+				handler (val) {
+					this.info.height = this.info.width = GetPx(val.size) + 'px';
+					this.info.destHeight = this.info.destWidth = GetPx(val.size) * GetPixelRatio() + 'px';
+					this.SpecialTreatment(val)
+					setTimeout(()=>{// h5平台动态改变canvas大小
+						this.generateCode();
+					},50)
+				}
+			}
+		},
+		methods: {
+			longtap (e){// 长按事件
+				this.$emit('press',e);
+			},
+			handleError (e) {//当发生错误时触发 error 事件，字节跳动小程序与飞书小程序不支持
+				this.$emit('error',e.detail)
+			},
+			SpecialTreatment (val) {//微信小程序渲染多个canvas特殊处理
+					let obj = deepClone(val);
+					obj.id = this.id;
+					this.info.listCode = [obj]
+			},
+			// 生成二维码
+			generateCode () {
+				try{
+					const parameter = {...this.options,source: platform(),id: this.id,ctx: this};
+					QRCode(parameter,(res)=>{
+						this.$emit('generate',res)
+					})
+				}catch(err){console.warn(err)}
+			},
+			// 获取二维码图片
+			async GetCodeImg (){
+				try{
+					return  await GetImg({id: this.id,source: platform(),width: this.options.size,height: this.options.size,ctx: this});
+				}catch(e){console.warn(e)}
+			}
+		}
+	}
+</script>
+<!-- #endif -->
\ No newline at end of file
diff --git a/uni_modules/wmf-code/js_sdk/index.js b/uni_modules/wmf-code/js_sdk/index.js
new file mode 100644
index 0000000..026287b
--- /dev/null
+++ b/uni_modules/wmf-code/js_sdk/index.js
@@ -0,0 +1 @@
+var __assign=function(){return(__assign=Object.assign||function(t){for(var e,i=1,r=arguments.length;i<r;i++)for(var o in e=arguments[i])Object.prototype.hasOwnProperty.call(e,o)&&(t[o]=e[o]);return t}).apply(this,arguments)};function __awaiter(t,n,h,a){return new(h=h||Promise)(function(i,e){function r(t){try{s(a.next(t))}catch(t){e(t)}}function o(t){try{s(a.throw(t))}catch(t){e(t)}}function s(t){var e;t.done?i(t.value):((e=t.value)instanceof h?e:new h(function(t){t(e)})).then(r,o)}s((a=a.apply(t,n||[])).next())})}function __generator(i,r){var o,s,n,h={label:0,sent:function(){if(1&n[0])throw n[1];return n[1]},trys:[],ops:[]},t={next:e(0),throw:e(1),return:e(2)};return"function"==typeof Symbol&&(t[Symbol.iterator]=function(){return this}),t;function e(e){return function(t){return function(e){if(o)throw new TypeError("Generator is already executing.");for(;h;)try{if(o=1,s&&(n=2&e[0]?s.return:e[0]?s.throw||((n=s.return)&&n.call(s),0):s.next)&&!(n=n.call(s,e[1])).done)return n;switch(s=0,(e=n?[2&e[0],n.value]:e)[0]){case 0:case 1:n=e;break;case 4:return h.label++,{value:e[1],done:!1};case 5:h.label++,s=e[1],e=[0];continue;case 7:e=h.ops.pop(),h.trys.pop();continue;default:if(!(n=0<(n=h.trys).length&&n[n.length-1])&&(6===e[0]||2===e[0])){h=0;continue}if(3===e[0]&&(!n||e[1]>n[0]&&e[1]<n[3])){h.label=e[1];break}if(6===e[0]&&h.label<n[1]){h.label=n[1],n=e;break}if(n&&h.label<n[2]){h.label=n[2],h.ops.push(e);break}n[2]&&h.ops.pop(),h.trys.pop();continue}e=r.call(i,h)}catch(t){e=[6,t],s=0}finally{o=n=0}if(5&e[0])throw e[1];return{value:e[0]?e[1]:void 0,done:!0}}([e,t])}}}var ADELTA=[0,11,15,19,23,27,31,16,18,20,22,24,26,28,20,22,24,24,26,28,28,22,24,24,26,26,28,28,24,24,26,26,26,28,28,24,26,26,26,28,28],VPAT=[3220,1468,2713,1235,3062,1890,2119,1549,2344,2936,1117,2583,1330,2470,1667,2249,2028,3780,481,4011,142,3098,831,3445,592,2517,1776,2234,1951,2827,1070,2660,1345,3177],fmtword=[30660,29427,32170,30877,26159,25368,27713,26998,21522,20773,24188,23371,17913,16590,20375,19104,13663,12392,16177,14854,9396,8579,11994,11245,5769,5054,7399,6608,1890,597,3340,2107],ECBLOCKS=[1,0,19,7,1,0,16,10,1,0,13,13,1,0,9,17,1,0,34,10,1,0,28,16,1,0,22,22,1,0,16,28,1,0,55,15,1,0,44,26,2,0,17,18,2,0,13,22,1,0,80,20,2,0,32,18,2,0,24,26,4,0,9,16,1,0,108,26,2,0,43,24,2,2,15,18,2,2,11,22,2,0,68,18,4,0,27,16,4,0,19,24,4,0,15,28,2,0,78,20,4,0,31,18,2,4,14,18,4,1,13,26,2,0,97,24,2,2,38,22,4,2,18,22,4,2,14,26,2,0,116,30,3,2,36,22,4,4,16,20,4,4,12,24,2,2,68,18,4,1,43,26,6,2,19,24,6,2,15,28,4,0,81,20,1,4,50,30,4,4,22,28,3,8,12,24,2,2,92,24,6,2,36,22,4,6,20,26,7,4,14,28,4,0,107,26,8,1,37,22,8,4,20,24,12,4,11,22,3,1,115,30,4,5,40,24,11,5,16,20,11,5,12,24,5,1,87,22,5,5,41,24,5,7,24,30,11,7,12,24,5,1,98,24,7,3,45,28,15,2,19,24,3,13,15,30,1,5,107,28,10,1,46,28,1,15,22,28,2,17,14,28,5,1,120,30,9,4,43,26,17,1,22,28,2,19,14,28,3,4,113,28,3,11,44,26,17,4,21,26,9,16,13,26,3,5,107,28,3,13,41,26,15,5,24,30,15,10,15,28,4,4,116,28,17,0,42,26,17,6,22,28,19,6,16,30,2,7,111,28,17,0,46,28,7,16,24,30,34,0,13,24,4,5,121,30,4,14,47,28,11,14,24,30,16,14,15,30,6,4,117,30,6,14,45,28,11,16,24,30,30,2,16,30,8,4,106,26,8,13,47,28,7,22,24,30,22,13,15,30,10,2,114,28,19,4,46,28,28,6,22,28,33,4,16,30,8,4,122,30,22,3,45,28,8,26,23,30,12,28,15,30,3,10,117,30,3,23,45,28,4,31,24,30,11,31,15,30,7,7,116,30,21,7,45,28,1,37,23,30,19,26,15,30,5,10,115,30,19,10,47,28,15,25,24,30,23,25,15,30,13,3,115,30,2,29,46,28,42,1,24,30,23,28,15,30,17,0,115,30,10,23,46,28,10,35,24,30,19,35,15,30,17,1,115,30,14,21,46,28,29,19,24,30,11,46,15,30,13,6,115,30,14,23,46,28,44,7,24,30,59,1,16,30,12,7,121,30,12,26,47,28,39,14,24,30,22,41,15,30,6,14,121,30,6,34,47,28,46,10,24,30,2,64,15,30,17,4,122,30,29,14,46,28,49,10,24,30,24,46,15,30,4,18,122,30,13,32,46,28,48,14,24,30,42,32,15,30,20,4,117,30,40,7,47,28,43,22,24,30,10,67,15,30,19,6,118,30,18,31,47,28,34,34,24,30,20,61,15,30],GLOG=[255,0,1,25,2,50,26,198,3,223,51,238,27,104,199,75,4,100,224,14,52,141,239,129,28,193,105,248,200,8,76,113,5,138,101,47,225,36,15,33,53,147,142,218,240,18,130,69,29,181,194,125,106,39,249,185,201,154,9,120,77,228,114,166,6,191,139,98,102,221,48,253,226,152,37,179,16,145,34,136,54,208,148,206,143,150,219,189,241,210,19,92,131,56,70,64,30,66,182,163,195,72,126,110,107,58,40,84,250,133,186,61,202,94,155,159,10,21,121,43,78,212,229,172,115,243,167,87,7,112,192,247,140,128,99,13,103,74,222,237,49,197,254,24,227,165,153,119,38,184,180,124,17,68,146,217,35,32,137,46,55,63,209,91,149,188,207,205,144,135,151,178,220,252,190,97,242,86,211,171,20,42,93,158,132,60,57,83,71,109,65,162,31,45,67,216,183,123,164,118,196,23,73,236,127,12,111,246,108,161,59,82,41,157,85,170,251,96,134,177,187,204,62,90,203,89,95,176,156,169,160,81,11,245,22,235,122,117,44,215,79,174,213,233,230,231,173,232,116,214,244,234,168,80,88,175],GEXP=[1,2,4,8,16,32,64,128,29,58,116,232,205,135,19,38,76,152,45,90,180,117,234,201,143,3,6,12,24,48,96,192,157,39,78,156,37,74,148,53,106,212,181,119,238,193,159,35,70,140,5,10,20,40,80,160,93,186,105,210,185,111,222,161,95,190,97,194,153,47,94,188,101,202,137,15,30,60,120,240,253,231,211,187,107,214,177,127,254,225,223,163,91,182,113,226,217,175,67,134,17,34,68,136,13,26,52,104,208,189,103,206,129,31,62,124,248,237,199,147,59,118,236,197,151,51,102,204,133,23,46,92,184,109,218,169,79,158,33,66,132,21,42,84,168,77,154,41,82,164,85,170,73,146,57,114,228,213,183,115,230,209,191,99,198,145,63,126,252,229,215,179,123,246,241,255,227,219,171,75,150,49,98,196,149,55,110,220,165,87,174,65,130,25,50,100,200,141,7,14,28,56,112,224,221,167,83,166,81,162,89,178,121,242,249,239,195,155,43,86,172,69,138,9,18,36,72,144,61,122,244,245,247,243,251,235,203,139,11,22,44,88,176,125,250,233,207,131,27,54,108,216,173,71,142,0],PATTERNS=[[2,1,2,2,2,2,0,0],[2,2,2,1,2,2,0,0],[2,2,2,2,2,1,0,0],[1,2,1,2,2,3,0,0],[1,2,1,3,2,2,0,0],[1,3,1,2,2,2,0,0],[1,2,2,2,1,3,0,0],[1,2,2,3,1,2,0,0],[1,3,2,2,1,2,0,0],[2,2,1,2,1,3,0,0],[2,2,1,3,1,2,0,0],[2,3,1,2,1,2,0,0],[1,1,2,2,3,2,0,0],[1,2,2,1,3,2,0,0],[1,2,2,2,3,1,0,0],[1,1,3,2,2,2,0,0],[1,2,3,1,2,2,0,0],[1,2,3,2,2,1,0,0],[2,2,3,2,1,1,0,0],[2,2,1,1,3,2,0,0],[2,2,1,2,3,1,0,0],[2,1,3,2,1,2,0,0],[2,2,3,1,1,2,0,0],[3,1,2,1,3,1,0,0],[3,1,1,2,2,2,0,0],[3,2,1,1,2,2,0,0],[3,2,1,2,2,1,0,0],[3,1,2,2,1,2,0,0],[3,2,2,1,1,2,0,0],[3,2,2,2,1,1,0,0],[2,1,2,1,2,3,0,0],[2,1,2,3,2,1,0,0],[2,3,2,1,2,1,0,0],[1,1,1,3,2,3,0,0],[1,3,1,1,2,3,0,0],[1,3,1,3,2,1,0,0],[1,1,2,3,1,3,0,0],[1,3,2,1,1,3,0,0],[1,3,2,3,1,1,0,0],[2,1,1,3,1,3,0,0],[2,3,1,1,1,3,0,0],[2,3,1,3,1,1,0,0],[1,1,2,1,3,3,0,0],[1,1,2,3,3,1,0,0],[1,3,2,1,3,1,0,0],[1,1,3,1,2,3,0,0],[1,1,3,3,2,1,0,0],[1,3,3,1,2,1,0,0],[3,1,3,1,2,1,0,0],[2,1,1,3,3,1,0,0],[2,3,1,1,3,1,0,0],[2,1,3,1,1,3,0,0],[2,1,3,3,1,1,0,0],[2,1,3,1,3,1,0,0],[3,1,1,1,2,3,0,0],[3,1,1,3,2,1,0,0],[3,3,1,1,2,1,0,0],[3,1,2,1,1,3,0,0],[3,1,2,3,1,1,0,0],[3,3,2,1,1,1,0,0],[3,1,4,1,1,1,0,0],[2,2,1,4,1,1,0,0],[4,3,1,1,1,1,0,0],[1,1,1,2,2,4,0,0],[1,1,1,4,2,2,0,0],[1,2,1,1,2,4,0,0],[1,2,1,4,2,1,0,0],[1,4,1,1,2,2,0,0],[1,4,1,2,2,1,0,0],[1,1,2,2,1,4,0,0],[1,1,2,4,1,2,0,0],[1,2,2,1,1,4,0,0],[1,2,2,4,1,1,0,0],[1,4,2,1,1,2,0,0],[1,4,2,2,1,1,0,0],[2,4,1,2,1,1,0,0],[2,2,1,1,1,4,0,0],[4,1,3,1,1,1,0,0],[2,4,1,1,1,2,0,0],[1,3,4,1,1,1,0,0],[1,1,1,2,4,2,0,0],[1,2,1,1,4,2,0,0],[1,2,1,2,4,1,0,0],[1,1,4,2,1,2,0,0],[1,2,4,1,1,2,0,0],[1,2,4,2,1,1,0,0],[4,1,1,2,1,2,0,0],[4,2,1,1,1,2,0,0],[4,2,1,2,1,1,0,0],[2,1,2,1,4,1,0,0],[2,1,4,1,2,1,0,0],[4,1,2,1,2,1,0,0],[1,1,1,1,4,3,0,0],[1,1,1,3,4,1,0,0],[1,3,1,1,4,1,0,0],[1,1,4,1,1,3,0,0],[1,1,4,3,1,1,0,0],[4,1,1,1,1,3,0,0],[4,1,1,3,1,1,0,0],[1,1,3,1,4,1,0,0],[1,1,4,1,3,1,0,0],[3,1,1,1,4,1,0,0],[4,1,1,1,3,1,0,0],[2,1,1,4,1,2,0,0],[2,1,1,2,1,4,0,0],[2,1,1,2,3,2,0,0],[2,3,3,1,1,1,2,0]],UNIT_CONVERSION=function(t){return uni.upx2px(Number(t))},getPixelRatio=function(t){return uni.getSystemInfoSync()[t||"pixelRatio"]},getTimeDate=function(){var t=new Date;return t.toLocaleDateString().replace(/\//g,"-")+" "+t.toTimeString().slice(0,8)},GETSIZE={"MP-ALIPAY":function(t){return UNIT_CONVERSION(t)*getPixelRatio()},"MP-WEIXIN":function(t){return UNIT_CONVERSION(t)},"MP-BAIDU":function(t){return UNIT_CONVERSION(t)},"MP-TOUTIAO":function(t){return UNIT_CONVERSION(t)},"MP-QQ":function(t){return UNIT_CONVERSION(t)},"MP-LARK":function(t){return UNIT_CONVERSION(t)},"MP-KUAISHOU":function(t){return UNIT_CONVERSION(t)},"MP-360":function(t){return UNIT_CONVERSION(t)},"QUICKAPP-WEBVIEW":function(t){return UNIT_CONVERSION(t)},"QUICKAPP-WEBVIEW-UNION":function(t){return UNIT_CONVERSION(t)},"QUICKAPP-WEBVIEW-HUAWEI":function(t){return UNIT_CONVERSION(t)},MP:function(t){return UNIT_CONVERSION(t)},"APP-PLUS":function(t){return UNIT_CONVERSION(t)},NVUE:function(t){return UNIT_CONVERSION(t)},H5:function(t){return UNIT_CONVERSION(t)},none:function(t){return UNIT_CONVERSION(t)}},UtF16TO8=function(t){for(var e,i=t.toString(),r="",o=0;o<i.length;o++)1<=(e=i.charCodeAt(o))&&e<=127?r+=i.charAt(o):(2047<e?(r+=String.fromCharCode(224|e>>12&15),r+=String.fromCharCode(128|e>>6&63)):r+=String.fromCharCode(192|e>>6&31),r+=String.fromCharCode(128|e>>0&63));return r},SaveCodeImg=function(t){var i=UNIT_CONVERSION(Number(t.width)),r=UNIT_CONVERSION(Number(t.height)),e=getPixelRatio("pixelRatio"),o=i*e,s=r*e;return"MP-ALIPAY"==t.source&&(i=o,r=s),new Promise(function(e){"[object String]"==Object.prototype.toString.call(t.id)?uni.canvasToTempFilePath({canvasId:t.id,width:i,height:r,destWidth:o,destHeight:s,fileType:t.type||"jpg",quality:t.quality||1,complete:function(t){e(t)}},t.ctx):"[object Object]"==Object.prototype.toString.call(t.id)&&t.id.toTempFilePath(0,0,i,r,o,s,t.type||"png",1,function(t){e(t)})})},SetGradient=function(t,e,i,r){i=t.createLinearGradient(0,0,e,i);return 1===r.length&&(i.addColorStop(0,r[0]),i.addColorStop(1,r[0])),2===r.length&&(i.addColorStop(0,r[0]),i.addColorStop(1,r[1])),3===r.length&&(i.addColorStop(0,r[0]),i.addColorStop(.5,r[1]),i.addColorStop(1,r[2])),4===r.length&&(i.addColorStop(0,r[0]),i.addColorStop(.35,r[1]),i.addColorStop(.7,r[2]),i.addColorStop(1,r[3])),5===r.length&&(i.addColorStop(0,r[0]),i.addColorStop(.35,r[1]),i.addColorStop(.6,r[2]),i.addColorStop(.8,r[3]),i.addColorStop(1,r[4])),6===r.length&&(i.addColorStop(0,r[0]),i.addColorStop(.25,r[1]),i.addColorStop(.45,r[2]),i.addColorStop(.65,r[3]),i.addColorStop(.85,r[4]),i.addColorStop(1,r[5])),7===r.length&&(i.addColorStop(0,r[0]),i.addColorStop(.15,r[1]),i.addColorStop(.35,r[2]),i.addColorStop(.45,r[3]),i.addColorStop(.65,r[4]),i.addColorStop(.85,r[5]),i.addColorStop(1,r[6])),8===r.length&&(i.addColorStop(0,r[0]),i.addColorStop(.1,r[1]),i.addColorStop(.25,r[2]),i.addColorStop(.45,r[3]),i.addColorStop(.65,r[4]),i.addColorStop(.85,r[5]),i.addColorStop(.9,r[6]),i.addColorStop(1,r[7])),9===r.length&&(i.addColorStop(0,r[0]),i.addColorStop(.2,r[1]),i.addColorStop(.3,r[2]),i.addColorStop(.5,r[3]),i.addColorStop(.6,r[4]),i.addColorStop(.7,r[5]),i.addColorStop(.8,r[6]),i.addColorStop(.9,r[7]),i.addColorStop(1,r[8])),10<=r.length&&(i.addColorStop(0,r[0]),i.addColorStop(.1,r[1]),i.addColorStop(.2,r[2]),i.addColorStop(.3,r[3]),i.addColorStop(.4,r[4]),i.addColorStop(.5,r[5]),i.addColorStop(.6,r[6]),i.addColorStop(.7,r[7]),i.addColorStop(.85,r[8]),i.addColorStop(1,r[9])),i},QRCodeInit=function(){function t(t){void 0===t&&(t=2),this.strinbuf=[],this.eccbuf=[],this.qrframe=[],this.framask=[],this.rlens=[],this.genpoly=[],this.ecclevel=2,this.N1=3,this.N2=3,this.N3=40,this.N4=10,this.neccblk2=0,this.width=0,this.neccblk1=0,this.datablkw=0,this.eccblkwid=0,this.ecclevel=t}return t.prototype.setmask=function(t,e){var i=null;e<t&&(i=t,t=e,e=i),i=e,i*=e,i+=e,i>>=1,this.framask[i+=t]=1},t.prototype.getWidth=function(){return this.width},t.prototype.putalign=function(t,e){this.qrframe[t+this.width*e]=1;for(var i=-2;i<2;i++)this.qrframe[t+i+this.width*(e-2)]=1,this.qrframe[t-2+this.width*(e+i+1)]=1,this.qrframe[t+2+this.width*(e+i)]=1,this.qrframe[t+i+1+this.width*(e+2)]=1;for(i=0;i<2;i++)this.setmask(t-1,e+i),this.setmask(t+1,e-i),this.setmask(t-i,e-1),this.setmask(t+i,e+1)},t.prototype.modnn=function(t){for(;255<=t;)t=((t-=255)>>8)+(255&t);return t},t.prototype.appendrs=function(t,e,i,r){for(var o,s=0;s<r;s++)this.strinbuf[i+s]=0;for(s=0;s<e;s++){if(255!=(o=GLOG[this.strinbuf[t+s]^this.strinbuf[i]]))for(var n=1;n<r;n++)this.strinbuf[i+n-1]=this.strinbuf[i+n]^GEXP[this.modnn(o+this.genpoly[r-n])];else for(n=i;n<i+r;n++)this.strinbuf[n]=this.strinbuf[n+1];this.strinbuf[i+r-1]=255==o?0:GEXP[this.modnn(o+this.genpoly[0])]}},t.prototype.ismasked=function(t,e){var i;return e<t&&(i=t,t=e,e=i),i=e,i+=e*e,i>>=1,this.framask[i+=t]},t.prototype.badruns=function(t){for(var e=0,i=0;i<=t;i++)5<=this.rlens[i]&&(e+=this.N1+this.rlens[i]-5);for(i=3;i<t-1;i+=2)this.rlens[i-2]==this.rlens[i+2]&&this.rlens[i+2]==this.rlens[i-1]&&this.rlens[i-1]==this.rlens[i+1]&&3*this.rlens[i-1]==this.rlens[i]&&(0==this.rlens[i-3]||t<i+3||3*this.rlens[i-3]>=4*this.rlens[i]||3*this.rlens[i+3]>=4*this.rlens[i])&&(e+=this.N3);return e},t.prototype.toNum=function(t){return 0===t?1:0},t.prototype.applymask=function(t){switch(t){case 0:for(var e=0;e<this.width;e++)for(var i=0;i<this.width;i++)i+e&1||this.ismasked(i,e)||(this.qrframe[i+e*this.width]^=1);break;case 1:for(e=0;e<this.width;e++)for(i=0;i<this.width;i++)1&e||this.ismasked(i,e)||(this.qrframe[i+e*this.width]^=1);break;case 2:for(e=0;e<this.width;e++)for(var r=0,i=0;i<this.width;i++,r++)(r=3==r?0:r)||this.ismasked(i,e)||(this.qrframe[i+e*this.width]^=1);break;case 3:for(var o=0,e=0;e<this.width;e++,o++)for(r=o=3==o?0:o,i=0;i<this.width;i++,r++)(r=3==r?0:r)||this.ismasked(i,e)||(this.qrframe[i+e*this.width]^=1);break;case 4:for(e=0;e<this.width;e++)for(r=0,o=e>>1&1,i=0;i<this.width;i++,r++)(o=3==r?(r=0)<o?0:1:o)||this.ismasked(i,e)||(this.qrframe[i+e*this.width]^=1);break;case 5:for(o=0,e=0;e<this.width;e++,o++){3==o&&(o=0);for(r=0,i=0;i<this.width;i++,r++)3==r&&(r=0),(i&e&1)+this.toNum(this.toNum(r)|this.toNum(o))||this.ismasked(i,e)||(this.qrframe[i+e*this.width]^=1)}break;case 6:for(o=0,e=0;e<this.width;e++,o++){3==o&&(o=0);for(r=0,i=0;i<this.width;i++,r++)(i&e&1)+((r=3==r?0:r)&&(r==o?1:0))&1||this.ismasked(i,e)||(this.qrframe[i+e*this.width]^=1)}break;case 7:for(o=0,e=0;e<this.width;e++,o++){3==o&&(o=0);for(r=0,i=0;i<this.width;i++,r++)((r=3==r?0:r)&&(r==o?1:0))+(i+e&1)&1||this.ismasked(i,e)||(this.qrframe[i+e*this.width]^=1)}}},t.prototype.Genframe=function(t){var e=t.length,i=t.slice(0),r=0,o=0,s=0,n=0,h=0,a=0;do{if(o=4*(this.ecclevel-1)+16*(++h-1),this.neccblk1=ECBLOCKS[o++],this.neccblk2=ECBLOCKS[o++],this.datablkw=ECBLOCKS[o++],this.eccblkwid=ECBLOCKS[o],e<=(o=this.datablkw*(this.neccblk1+this.neccblk2)+this.neccblk2-3+(h<=9?1:0)))break}while(h<40);this.width=17+4*h;for(var n=this.datablkw+(this.datablkw+this.eccblkwid)*(this.neccblk1+this.neccblk2)+this.neccblk2,l=0;l<n;l++)this.eccbuf[l]=0;for(l=0;l<this.width*this.width;l++)this.qrframe[l]=0;for(l=0;l<(this.width*(this.width+1)+1)/2;l++)this.framask[l]=0;for(l=0;l<3;l++){s=o=0,1==l&&(o=this.width-7),2==l&&(s=this.width-7),this.qrframe[s+3+this.width*(o+3)]=1;for(var c=0;c<6;c++)this.qrframe[s+c+this.width*o]=1,this.qrframe[s+this.width*(o+c+1)]=1,this.qrframe[s+6+this.width*(o+c)]=1,this.qrframe[s+c+1+this.width*(o+6)]=1;for(c=1;c<5;c++)this.setmask(s+c,o+1),this.setmask(s+1,o+c+1),this.setmask(s+5,o+c),this.setmask(s+c+1,o+5);for(c=2;c<4;c++)this.qrframe[s+c+this.width*(o+2)]=1,this.qrframe[s+2+this.width*(o+c+1)]=1,this.qrframe[s+4+this.width*(o+c)]=1,this.qrframe[s+c+1+this.width*(o+4)]=1}if(1<h)for(e=ADELTA[h],s=this.width-7;;){for(r=this.width-7;e-3<r&&(this.putalign(r,s),!(r<e));)r-=e;if(s<=e+9)break;s-=e,this.putalign(6,s),this.putalign(s,6)}this.qrframe[8+this.width*(this.width-8)]=1;for(var d=0;d<7;d++)this.setmask(7,d),this.setmask(this.width-8,d),this.setmask(7,d+this.width-7);for(c=0;c<8;c++)this.setmask(c,7),this.setmask(c+this.width-8,7),this.setmask(c,this.width-8);for(c=0;c<9;c++)this.setmask(c,8);for(c=0;c<8;c++)this.setmask(c+this.width-8,8),this.setmask(8,c);for(d=0;d<7;d++)this.setmask(8,d+this.width-7);for(c=0;c<this.width-14;c++)1&c?(this.setmask(8+c,6),this.setmask(6,8+c)):(this.qrframe[8+c+6*this.width]=1,this.qrframe[6+this.width*(8+c)]=1);if(6<h)for(e=VPAT[h-7],o=17,c=0;c<6;c++)for(d=0;d<3;d++,o--)1&(11<o?h>>o-12:e>>o)?(this.qrframe[5-c+this.width*(2-d+this.width-11)]=1,this.qrframe[2-d+this.width-11+this.width*(5-c)]=1):(this.setmask(5-c,2-d+this.width-11),this.setmask(2-d+this.width-11,5-c));for(d=0;d<this.width;d++)for(c=0;c<=d;c++)this.qrframe[c+this.width*d]&&this.setmask(c,d);n=i.length;for(var f=0;f<n;f++)this.eccbuf[f]=i.charCodeAt(f);if(this.strinbuf=this.eccbuf.slice(0),(r=this.datablkw*(this.neccblk1+this.neccblk2)+this.neccblk2)-2<=n&&(n=r-2,9<h&&n--),a=n,9<h){for(this.strinbuf[a+2]=0,this.strinbuf[a+3]=0;a--;)e=this.strinbuf[a],this.strinbuf[a+3]|=255&e<<4,this.strinbuf[a+2]=e>>4;this.strinbuf[2]|=255&n<<4,this.strinbuf[1]=n>>4,this.strinbuf[0]=64|n>>12}else{for(this.strinbuf[a+1]=0,this.strinbuf[a+2]=0;a--;)e=this.strinbuf[a],this.strinbuf[a+2]|=255&e<<4,this.strinbuf[a+1]=e>>4;this.strinbuf[1]|=255&n<<4,this.strinbuf[0]=64|n>>4}for(a=n+3-(h<10?1:0);a<r;)this.strinbuf[a++]=236,this.strinbuf[a++]=17;this.genpoly[0]=1;for(f=0;f<this.eccblkwid;f++){this.genpoly[f+1]=1;for(var u=f;0<u;u--)this.genpoly[u]=this.genpoly[u]?this.genpoly[u-1]^GEXP[this.modnn(GLOG[this.genpoly[u]]+f)]:this.genpoly[u-1];this.genpoly[0]=GEXP[this.modnn(GLOG[this.genpoly[0]]+f)]}for(f=0;f<=this.eccblkwid;f++)this.genpoly[f]=GLOG[this.genpoly[f]];o=r;for(s=0,f=0;f<this.neccblk1;f++)this.appendrs(s,this.datablkw,o,this.eccblkwid),s+=this.datablkw,o+=this.eccblkwid;for(f=0;f<this.neccblk2;f++)this.appendrs(s,this.datablkw+1,o,this.eccblkwid),s+=this.datablkw+1,o+=this.eccblkwid;for(f=s=0;f<this.datablkw;f++){for(u=0;u<this.neccblk1;u++)this.eccbuf[s++]=this.strinbuf[f+u*this.datablkw];for(u=0;u<this.neccblk2;u++)this.eccbuf[s++]=this.strinbuf[this.neccblk1*this.datablkw+f+u*(this.datablkw+1)]}for(u=0;u<this.neccblk2;u++)this.eccbuf[s++]=this.strinbuf[this.neccblk1*this.datablkw+a+u*(this.datablkw+1)];for(f=0;f<this.eccblkwid;f++)for(u=0;u<this.neccblk1+this.neccblk2;u++)this.eccbuf[s++]=this.strinbuf[r+f+u*this.eccblkwid];this.strinbuf=this.eccbuf,r=s=this.width-1,o=n=1;for(var p=(this.datablkw+this.eccblkwid)*(this.neccblk1+this.neccblk2)+this.neccblk2,f=0;f<p;f++){e=this.strinbuf[f];for(u=0;u<8;u++,e<<=1)for(128&e&&(this.qrframe[r+this.width*s]=1);n?r--:(r++,o?0!=s?s--:(o=0===o?1:0,6==(r-=2)&&(r--,s=9)):s!=this.width-1?s++:(o=0===o?1:0,6==(r-=2)&&(r--,s-=8))),n=0<n?0:1,this.ismasked(r,s););}for(this.strinbuf=this.qrframe.slice(0),s=3e4,o=e=0;o<8&&(this.applymask(o),(r=this.badcheck())<s&&(s=r,e=o),7!=e);o++)this.qrframe=this.strinbuf.slice(0);e!=o&&this.applymask(e),s=fmtword[e+(this.ecclevel-1<<3)];for(var S=0;S<8;S++,s>>=1)1&s&&(this.qrframe[this.width-1-S+8*this.width]=1,S<6?this.qrframe[8+this.width*S]=1:this.qrframe[8+this.width*(S+1)]=1);for(S=0;S<7;S++,s>>=1)1&s&&(this.qrframe[8+this.width*(this.width-7+S)]=1,S?this.qrframe[6-S+8*this.width]=1:this.qrframe[7+8*this.width]=1);return this.qrframe},t.prototype.badcheck=function(){for(var t=0,e=0,i=0,r=0,o=0,s=0,n=0,h=0;h<this.width-1;h++)for(var a=0;a<this.width-1;a++)(this.qrframe[a+this.width*h]&&this.qrframe[a+1+this.width*h]&&this.qrframe[a+this.width*(h+1)]&&this.qrframe[a+1+this.width*(h+1)]||!(this.qrframe[a+this.width*h]||this.qrframe[a+1+this.width*h]||this.qrframe[a+this.width*(h+1)]||this.qrframe[a+1+this.width*(h+1)]))&&(t+=this.N2);for(h=0;h<this.width;h++){for(i=r=s=this.rlens[0]=0;s<this.width;s++)(o=this.qrframe[s+this.width*h])==r?this.rlens[i]++:this.rlens[++i]=1,e+=(r=o)?1:-1;t+=this.badruns(i)}var l=e=e<0?-e:e,c=0;for(l+=l<<2,l<<=1;l>this.width*this.width;)l-=this.width*this.width,c++;t+=c*this.N4;for(a=0;a<this.width;a++){for(i=r=n=this.rlens[0]=0;n<this.width;n++)(o=this.qrframe[a+this.width*n])==r?this.rlens[i]++:this.rlens[++i]=1,r=o;t+=this.badruns(i)}return t},t}(),StringToCode128=function(t){var s={currcs:5},e=GetBytes(t),i=126==e[0]?1:0,t=0<e.length?CodeSetAllowedFor(e[i++]):2,i=0<e.length?CodeSetAllowedFor(e[i++]):2;s.currcs=getBestStartSet(t,i),s.currcs=function(t,e){for(var i=0;i<t.length;i++){var r=t[i];if((r<48||57<r)&&126!=r)return e}return 5}(e,s.currcs);var r=[];switch(s.currcs){case 3:r.push(103);break;case 4:r.push(104);break;default:r.push(105)}for(var o=0;o<e.length;o++){var n=e[o];n in REPLACE_CODES&&(r.push(REPLACE_CODES[n]),n=e[++o]);var h=e.length>o+1?e[o+1]:-1,r=r.concat(function(t,e,i){var r=[],o=-1;if(charCompatible(t,i))5==i&&(-1==e?(o=100,i=4):charCompatible(e,i)||(i=charCompatible(e,3)?(o=101,3):(o=100,4)));else if(-1==e||charCompatible(e,i))o=98;else switch(i){case 3:o=100,i=4;break;case 4:o=101,i=3}return-1!=o?(r.push(o),r.push(codeValue(t))):5==i?r.push(codeValue(t,e)):r.push(codeValue(t)),s.currcs=i,r}(n,h,s.currcs));5==s.currcs&&o++}for(var a=r[0],l=1;l<r.length;l++)a+=l*r[l];return r.push(a%103),r.push(106),r},GetBytes=function(t){for(var e=[],i=0;i<t.length;i++)e.push(t.charCodeAt(i));return e},CodeSetAllowedFor=function(t){return 48<=t&&t<=57?1:32<=t&&t<=95?2:t<32?3:4},getBestStartSet=function(t,e){var i=0;return i+=3==t?1:0,i+=4==t?-1:0,i+=3==e?1:0,0<(i+=4==e?-1:0)?3:4},codeValue=function(t,e){return void 0===e?32<=t?t-32:t+64:parseInt(String.fromCharCode(t)+String.fromCharCode(e))},charCompatible=function(t,e){t=codeSetAllowedFor(t);return 1==t||(2==t||(3==t&&3==e||4==t&&4==e))},codeSetAllowedFor=function(t){return 48<=t&&t<=57?1:32<=t&&t<=95?2:t<32?3:4},REPLACE_CODES={CHAR_TILDE:102},BarCode128=StringToCode128,OperationCode=function(t,e){var i,r;t.code?t.id?(r=(new Date).getTime(),"[object String]"==Object.prototype.toString.call(t.id)?(i=uni.createCanvasContext(t.id,t.ctx||null),BarCodeCanvas(r,t,i,e)):"[object Object]"==Object.prototype.toString.call(t.id)&&(i=t.id,BarCodeCanvas(r,t,i,e))):console.warn("没有找到条形码canvas id或者实列!"):console.warn("没有找到条形码code")},BarCodeCanvas=function(t,e,i,r){var o=e.text?(e.text.size||40)+(e.text.padding||20):0,s=GETSIZE[e.source||"none"](e.width),n=GETSIZE[e.source||"none"](e.height),h=UtF16TO8(e.code);i.setFillStyle(e.bgColor||"#FFFFFF"),"horizontal"==e.orient?i.fillRect(0,0,s,GETSIZE[e.source||"none"](e.height+o)):i.fillRect(0,0,GETSIZE[e.source||"none"](e.height+o),s),i.setFillStyle(e.bgColor||"#FFFFFF");o=new GraphicContentInit(i,s,n);e.color?SetBarCodeColors(i,s,n,e.color||["#000000"],e.orient):i.setFillStyle("#000000"),SetBarCodeType[e.type||"CODE128"](h,o,n,e.orient,e.text),e.text&&setBarCodeText(i,e.text,s,n,e.source||"H5",e.orient||"horizontal"),starDraw$1(i,e,t,r)},starDraw$1=function(t,s,n,h){var e=this;setTimeout(function(){t.draw(!1,function(o){return __awaiter(e,void 0,void 0,function(){var e,i,r;return __generator(this,function(t){switch(t.label){case 0:return h?(e=h,i=[__assign({},o)],r={createTime:getTimeDate(),takeUpTime:(new Date).getTime()-n},[4,SaveCodeImg({width:"vertical"==s.orient?s.height:s.width,height:"vertical"==s.orient?s.width:s.height,id:s.id,source:s.source,ctx:s.ctx||null})]):[3,2];case 1:return e.apply(void 0,[__assign.apply(void 0,i.concat([(r.img=t.sent(),r.model=getPixelRatio("model"),r.system=getPixelRatio("system"),r.platform=getPixelRatio("platform"),r.code=s.code,r.source=s.source,r.with=UNIT_CONVERSION(s.width),r.height=UNIT_CONVERSION(s.height),r.id="[object String]"==Object.prototype.toString.call(s.id)?s.id:"nvue",r)]))]),[3,3];case 2:t.label=3;case 3:return[2]}})})})})},SetBarCodeColors=function(t,e,i,r,o){r=SetGradient(t,"vertical"==(o=void 0===o?"horizontal":o)?i:e,"vertical"==o?e:i,r);t.setFillStyle(r)},setBarCodeText=function(t,e,i,r,o,s){var n=e.color||["#000000"],h=SetGradient(t,i,r,n);t.setGlobalAlpha((null==e?void 0:e.opacity)||1),t.setTextAlign("center"),t.setTextBaseline("middle"),t.setFillStyle("#000000"),t.setFontSize(UNIT_CONVERSION(e.size||40)),"H5"==o?t.setFillStyle(h):t.setFillStyle(n[0]);n="bottom"==e.position?r+UNIT_CONVERSION((e.padding||40)+(e.size||20)/2):UNIT_CONVERSION(e.size)/2;"vertical"==s?(t.rotate(90*Math.PI/180),"bottom"==e.position?(t.translate(i,-r),t.fillText(e.content,-i/2,-UNIT_CONVERSION(e.padding||20+(e.size||40)/2))):(t.translate(-i/2,-n),t.fillText(e.content,i,-n))):t.fillText(e.content,i/2,n),t.setGlobalAlpha(1)},SetBarCodeType={CODE128:function(t,e,i,r,o){void 0===r&&(r="horizontal");var s=BarCode128(t),n=e.area.width/(11*(s.length-3)+35),h=e.area.left,t=0;o&&"bottom"!=o.position&&(t=UNIT_CONVERSION(((null==o?void 0:o.size)||40)+((null==o?void 0:o.padding)||20)));for(var a=e.area.top+t,l=i-e.area.top,c=0;c<s.length;c++)for(var d=s[c],f=0;f<8;f+=2){var u=PATTERNS[d][f]*n,p=PATTERNS[d][f+1]*n;0<u&&e.fillFgRect("vertical"==r?a:h,"vertical"==r?h:a,"vertical"==r?l:u,"vertical"==r?u:l),h+=u+p}},CODE39:function(t,e,i){console.error("条形码编码类型：CODE39暂未实现")},EAN13:function(t,e,i){-1!==t.search(/^[0-9]{12}$/)?console.error("条形码编码类型：EAN暂未实现"):console.error("条形码编码：code不符合EAN13规范")},UPCE:function(t,e,i){-1!==t.search(/^[0-9]{6}$/)?console.error("条形码编码类型：EAN暂未实现"):console.error("条形码编码：code不符合UPCE规范")},UPC:function(t,e,i){-1!==t.search(/^[0-9]{1}$/)?console.error("条形码编码类型：EAN暂未实现"):console.error("条形码编码：code不符合UPC规范")},ITF:function(t,e,i){-1!==t.search(/^([0-9]{2})+$/)?console.error("条形码编码类型：ITF暂未实现"):console.error("条形码编码：code不符合ITF规范")},ITF14:function(t,e,i){-1!==t.search(/^[0-9]{14}$/)?console.error("条形码编码类型：ITF14暂未实现"):console.error("条形码编码：code不符合ITF14规范")},MSI:function(t,e,i){-1!==t.search(/^[0-9]+$/)?console.error("条形码编码类型：MSI暂未实现"):console.error("条形码编码：code不符合MSI规范")},Codabar:function(t,e,i){-1!==t.search(/^[A-D][0-9\-\$\:\.\+\/]+[A-D]$/)?console.error("条形码编码类型：Codabar暂未实现"):console.error("条形码编码：code不符合Codabar规范")},Pharmacode:function(t,e,i){!isNaN(parseInt(t,10))&&3<=Number(t)&&Number(t)<=131070?console.error("条形码编码类型：Pharmacode暂未实现"):console.error("条形码编码：code不符合Pharmacode类型")}},GraphicContentInit=function(){function t(t,e,i){this.borderSize=0,this.paddingWidth=0,this.ctx=t,this.width=e,this.height=i,this.quiet=Math.round(this.width/40),this.area={width:e-2*this.paddingWidth-2*this.quiet,height:i-2*this.borderSize,top:this.borderSize-4,left:this.borderSize+this.quiet},this.fillBgRect(0,0,e,i),this.fillBgRect(0,this.borderSize,e,i-2*this.borderSize)}return t.prototype.fillFgRect=function(t,e,i,r){this.FILLRECT(t,e,i,r)},t.prototype.fillBgRect=function(t,e,i,r){this.FILLRECT(t,e,i,r)},t.prototype.FILLRECT=function(t,e,i,r){this.ctx.fillRect(t,e,i,r)},t}(),WidgetCode=function(t,e){var i,r,o,s;t.code?t.id?(r=(new Date).getTime(),s=new QRCodeInit(t.level),(o=UtF16TO8(t.code))?(o=s.Genframe(o),s=s.getWidth(),"[object String]"==Object.prototype.toString.call(t.id)?(i=uni.createCanvasContext(t.id,t.ctx||null),RepaintCanvas(r,t,i,o,s,e)):"[object Object]"==Object.prototype.toString.call(t.id)&&(i=t.id,RepaintCanvas(r,t,i,o,s,e))):console.warn("二维码code转换错误")):console.warn("没有找到二维码canvas id或者实列!"):console.warn("没有找到二维码code")},RepaintCanvas=function(t,e,i,r,o,s){var n=GETSIZE[e.source||"none"]?GETSIZE[e.source||"none"](e.size):UNIT_CONVERSION(e.size),h=GETSIZE[e.source||"none"]?GETSIZE[e.source||"none"](e.size):UNIT_CONVERSION(e.size),a=GETSIZE[e.source||"none"]?GETSIZE[e.source||"none"](e.size):UNIT_CONVERSION(e.size),l=(UNIT_CONVERSION(e.padding||0)||0)+(e.border?e.border.lineWidth||5:0),c=Math.round(n/(o+l)),d=Math.floor((n-c*o)/2);i.clearRect(0,0,h,a),i.setFillStyle(e.bgColor||"#FFFFFF"),i.fillRect(0,0,h,a),e.src&&i.drawImage(e.src,0,0,n,n),e.color?SetColorCode(i,h,a,e.color):i.setFillStyle("#000000");for(var f=0;f<o;f++)for(var u=0;u<o;u++)r[u*o+f]&&(SetCodeType[e.type||"none"],SetCodeType[e.type||"none"](e.bgColor,i,c*f+d,c*u+d,c,c,e.source));e.img&&(SetImageType[(null===(l=e.img)||void 0===l?void 0:l.type)||"none"]?SetImageType[(null===(l=e.img)||void 0===l?void 0:l.type)||"none"](i,n,e.img,e.source||"none"):SetImageType.none(i,n,e.img,e.source||"none")),e.text&&SetTextCode(i,h,a,e.text,e.source||"none"),e.border&&SetBorderCode(i,h,a,e.border,e.source||"none"),i.restore(),starDraw(i,e,t,s)},starDraw=function(t,s,n,h){var e=this;setTimeout(function(){t.draw(!1,function(o){return __awaiter(e,void 0,void 0,function(){var e,i,r;return __generator(this,function(t){switch(t.label){case 0:return h?(e=h,i=[__assign({},o)],r={createTime:getTimeDate(),takeUpTime:(new Date).getTime()-n},[4,SaveCodeImg({width:s.size,height:s.size,id:s.id,source:s.source,ctx:s.ctx||null})]):[3,2];case 1:return e.apply(void 0,[__assign.apply(void 0,i.concat([(r.img=t.sent(),r.source=s.source,r.model=getPixelRatio("model"),r.system=getPixelRatio("system"),r.platform=getPixelRatio("platform"),r.code=s.code,r.size=UNIT_CONVERSION(s.size),r.id="[object String]"==Object.prototype.toString.call(s.id)?s.id:"nvue",r)]))]),[3,3];case 2:t.label=3;case 3:return[2]}})})})},300)},SetCodeType={none:function(t,e,i,r,o,s,n){e.fillRect(i,r,o,s)},starry:function(t,e,i,r,o,s,n){e.drawImage("",i,r,o,s)},dots:function(t,e,i,r,o,s,n){void 0===t&&(t="#ffffff"),e.save(),e.beginPath(),e.arc(i,r,o/2,0,2*Math.PI),e.closePath(),e.fill(),e.setLineWidth(1),e.setStrokeStyle(t),e.stroke(),e.clip(),e.restore()},square:function(t,e,i,r,o,s,n){void 0===t&&(t="#ffffff"),"MP-BAIDU"!=n?(e.save(),e.beginPath(),e.moveTo(i,r),e.arcTo(i+o,r,i+o,r+s,0),e.arcTo(i+o,r+s,i,r+s,0),e.arcTo(i,r+s,i,r,0),e.arcTo(i,r,i+o,r,0),e.fill(),e.closePath(),e.setLineWidth(1),e.setStrokeStyle(t),e.stroke(),e.clip(),e.restore()):e.fillRect(i,r,o,s)},custom:function(t,e,i,r,o,s,n){e.drawImage("",i,r,o,s)}},SetColorCode=function(t,e,i,r){r=SetGradient(t,e,i,r);t.setFillStyle(r)},SetImageType={none:function(t,e,i,r){r=GETSIZE[r](i.size||30),e=Number(((e-r)/2).toFixed(2));t.save(),t.drawImage(i.src,e,e,r,r)},circle:function(t,e,i,r){var o=GETSIZE[r](i.size||30),s=2*o,n=e/2-o,h=e/2-o,a=n+o,e=h+o;t.save(),t.beginPath(),t.arc(a,e,o,0,2*Math.PI),t.closePath(),t.setLineWidth(GETSIZE[r](i.width||5)),t.setStrokeStyle(i.color||"#FFFFFF"),t.stroke(),t.clip(),t.drawImage(i.src,n,h,s,s)},round:function(t,e,i,r){if("MP-BAIDU"==r){var o=GETSIZE[r](i.size||30),s=2*o,n=e/2-o,h=e/2-o,a=n+o,l=h+o;return t.save(),t.beginPath(),t.arc(a,l,o,0,2*Math.PI),t.closePath(),t.setLineWidth(GETSIZE[r](i.width||5)),t.setStrokeStyle(i.color||"#FFFFFF"),t.stroke(),t.clip(),void t.drawImage(i.src,n,h,s,s)}l=i.degree||5,o=GETSIZE[r](i.size||30),n=o,h=o,s=e/2-o/2,o=e/2-o/2;h<2*(l=n<2*l?n/2:l)&&(l=h/2),t.save(),t.beginPath(),t.moveTo(s+l,o),t.arcTo(s+n,o,s+n,o+h,l),t.arcTo(s+n,o+h,s,o+h,l),t.arcTo(s,o+h,s,o,l),t.arcTo(s,o,s+n,o,l),t.closePath(),t.setLineWidth(GETSIZE[r](i.width||5)),t.setStrokeStyle(i.color||"#FFFFFF"),t.stroke(),t.clip(),t.drawImage(i.src,s,o,n,n)}},SetBorderCode=function(t,e,i,r,o){var s=(null==r?void 0:r.color)||["#000000"],n=(null==r?void 0:r.degree)||5,s=SetGradient(t,e,i,s);t.restore(),t.setGlobalAlpha((null==r?void 0:r.opacity)||1),"MP-BAIDU"==o?(t.setLineWidth((null==r?void 0:r.lineWidth)||5),t.setStrokeStyle(s),t.strokeRect(0,0,e,i)):(t.beginPath(),t.moveTo(0+n,0),t.arcTo(0+e,0,0+e,0+i,n),t.arcTo(0+e,0+i,0,0+i,n),t.arcTo(0,0+i,0,0,n),t.arcTo(0,0,0+e,0,n),t.closePath(),t.setLineWidth((null==r?void 0:r.lineWidth)||5),t.setStrokeStyle(s),t.stroke(),t.clip()),t.setGlobalAlpha(1)},SetTextCode=function(t,e,i,r,o){var s=r.color||["#FFFFFF"],i=SetGradient(t,e,i,s);t.restore(),t.setGlobalAlpha((null==r?void 0:r.opacity)||1),t.setTextAlign("center"),t.setTextBaseline("middle"),t.font=(null==r?void 0:r.font)||"normal 20px system-ui","H5"==o?t.setFillStyle(i):t.setFillStyle(s[0]),t.fillText(r.content,e/2,e/2),t.setGlobalAlpha(1)},BarCode=OperationCode,QRCode=WidgetCode,GetImg=SaveCodeImg,GetPixelRatio=getPixelRatio,GetUtF16TO8=UtF16TO8,GetPx=UNIT_CONVERSION;export{BarCode,GetImg,GetPixelRatio,GetPx,GetUtF16TO8,QRCode};
diff --git a/uni_modules/wmf-code/package.json b/uni_modules/wmf-code/package.json
new file mode 100644
index 0000000..0c71ce1
--- /dev/null
+++ b/uni_modules/wmf-code/package.json
@@ -0,0 +1,77 @@
+{
+  "id": "wmf-code",
+  "displayName": "二维码 条形码生成 支持链接 支持nvue 支持纯文字",
+  "version": "1.6.2",
+  "description": "二维码 条形码生成，支持渐变色边框 保存二维码图片,支持链接 ,支持nvue 支持纯文字",
+  "keywords": [
+    "二维码",
+    "条形码"
+],
+  "repository": "https://github.com/lovewmf/uni-code",
+"engines": {
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无 ",
+      "permissions": "无 "
+    },
+    "npmurl": "https://www.npmjs.com/package/@uni-ui/code-ui",
+    "type": "sdk-js"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/x-skeleton/changelog.md b/uni_modules/x-skeleton/changelog.md
new file mode 100644
index 0000000..9bd11da
--- /dev/null
+++ b/uni_modules/x-skeleton/changelog.md
@@ -0,0 +1,11 @@
+## 1.0.4（2023-09-02）
+1、优化一些显示的细节问题
+## 1.0.3（2023-09-01）
+1、新增动画、时间、颜色等相关属性
+## 1.0.2（2023-08-31）
+1、回滚到v1.0.0版本，暂时取消动画时间的修改属性
+## 1.0.1（2023-08-31）
+1、新增动画持续时间属性
+2、新增淡出持续时间属性
+## 1.0.0（2023-08-31）
+第一个版本
diff --git a/uni_modules/x-skeleton/components/x-skeleton/x-skeleton-configs.js b/uni_modules/x-skeleton/components/x-skeleton/x-skeleton-configs.js
new file mode 100644
index 0000000..df6422b
--- /dev/null
+++ b/uni_modules/x-skeleton/components/x-skeleton/x-skeleton-configs.js
@@ -0,0 +1,147 @@
+export default {
+	methods: {
+		bannerConfigs(height = '300rpx') {
+			return {
+				padding: '30rpx',
+				gridRows: 1,
+				gridColumns: 1,
+				gridRowsGap: '40rpx',
+				gridColumnsGap: '24rpx',
+				itemDirection: 'row',
+				itemGap: '30rpx',
+				itemAlign: 'center',
+				headShow: true,
+				headWidth: '100%',
+				headHeight: height,
+				headBorderRadius: '20rpx',
+				textShow: false,
+				textRows: 3,
+				textRowsGap: '20rpx',
+				textWidth: '100%',
+				textHeight: '30rpx',
+				textBorderRadius: '6rpx',
+				...this.configs
+			}
+		},
+		
+		infoConfigs() {
+			return {
+				padding: '30rpx',
+				gridRows: 1,
+				gridColumns: 1,
+				gridRowsGap: '50rpx',
+				gridColumnsGap: '24rpx',
+				itemDirection: 'row',
+				itemGap: '30rpx',
+				itemAlign: 'flex-start',
+				headShow: true,
+				headWidth: '150rpx',
+				headHeight: '150rpx',
+				headBorderRadius: '50%',
+				textShow: true,
+				textRows: 3,
+				textRowsGap: '30rpx',
+				textWidth: ['50%', '100%', '100%', '80%'],
+				textHeight: ['40rpx', '24rpx', '24rpx', '24rpx'],
+				textBorderRadius: '6rpx',
+				...this.configs
+			}
+		},
+		
+		textConfigs() {
+			return {
+				padding: '30rpx',
+				gridRows: 1,
+				gridColumns: 1,
+				gridRowsGap: '50rpx',
+				gridColumnsGap: '24rpx',
+				itemDirection: 'row',
+				itemGap: '30rpx',
+				itemAlign: 'flex-start',
+				headShow: false,
+				headWidth: '100rpx',
+				headHeight: '100rpx',
+				headBorderRadius: '50%',
+				textShow: true,
+				textRows: 4,
+				textRowsGap: '30rpx',
+				textWidth: ['50%', '100%', '100%', '80%'],
+				textHeight: '30rpx',
+				textBorderRadius: '6rpx',
+				...this.configs
+			}
+		},
+		
+		menuConfigs(row = 2) {
+			return {
+				padding: '30rpx',
+				gridRows: row,
+				gridColumns: 5,
+				gridRowsGap: '40rpx',
+				gridColumnsGap: '40rpx',
+				itemDirection: 'column',
+				itemGap: '16rpx',
+				itemAlign: 'center',
+				headShow: true,
+				headWidth: '100rpx',
+				headHeight: '100rpx',
+				headBorderRadius: '50%',
+				textShow: true,
+				textRows: 1,
+				textRowsGap: '0rpx',
+				textWidth: '100%',
+				textHeight: '24rpx',
+				textBorderRadius: '6rpx',
+				...this.configs
+			} 
+		},
+		
+		listConfigs(row = 2) {
+			return {
+				padding: '30rpx',
+				gridRows: row,
+				gridColumns: 1,
+				gridRowsGap: '50rpx',
+				gridColumnsGap: '24rpx',
+				itemDirection: 'row',
+				itemGap: '30rpx',
+				itemAlign: 'flex-start',
+				headShow: true,
+				headWidth: '200rpx',
+				headHeight: '200rpx',
+				headBorderRadius: '16rpx',
+				textShow: true,
+				textRows: 4,
+				textRowsGap: '30rpx',
+				textWidth: ['50%', '100%', '100%', '80%'],
+				textHeight: ['38rpx', '24rpx', '24rpx', '24rpx'],
+				textBorderRadius: '6rpx',
+				...this.configs
+			} 
+		},
+		
+		waterfallConfigs(row = 2) {
+			return {
+				padding: '30rpx',
+				gridRows: row,
+				gridColumns: 2,
+				gridRowsGap: '40rpx',
+				gridColumnsGap: '24rpx',
+				itemDirection: 'column',
+				itemGap: '16rpx',
+				itemAlign: 'center',
+				headShow: true,
+				headWidth: '100%',
+				headHeight: '300rpx',
+				headBorderRadius: '12rpx',
+				textShow: true,
+				textRows: 2,
+				textRowsGap: '12rpx',
+				textWidth: ['85%', '85%'],
+				textHeight: ['30rpx', '20rpx'],
+				textBorderRadius: '6rpx',
+				...this.configs
+			} 
+		},
+	}
+}
diff --git a/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue b/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue
new file mode 100644
index 0000000..419da4d
--- /dev/null
+++ b/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue
@@ -0,0 +1,334 @@
+<template>
+	<view class="x-skeleton" :style="variableStr">
+		<!-- 骨架屏 -->
+		<view 
+			v-if="skeletonLoading"
+			class="x-skeleton__wrapper"
+			:class="[ startFadeOut && 'fade-out' ]"
+			:style="{ padding: skeletonConfigs.padding }"
+		>
+			<view
+				v-for="(row, rowIndex) in gridRowsArr" :key="rowIndex"
+				class="x-skeleton__wrapper__rows" 
+				:style="{ marginBottom: rowIndex < gridRowsArr.length - 1 ? skeletonConfigs.gridRowsGap : 0 }"
+			>
+				<view
+					v-for="(column, columnIndex) in gridColumnsArr" :key="columnIndex"
+					class="x-skeleton__wrapper__columns" 
+					:style="{ 
+						flexDirection: skeletonConfigs.itemDirection, 
+						alignItems: skeletonConfigs.itemAlign,
+						marginRight: columnIndex < gridColumnsArr.length - 1 ? skeletonConfigs.gridColumnsGap : 0,
+					}"
+				>
+					<view 
+						v-if="skeletonConfigs.headShow"
+						class="x-skeleton__wrapper__head" 
+						:class="[ propAnimate && 'animate' ]"
+						:style="{
+							width: skeletonConfigs.headWidth, 
+							height: skeletonConfigs.headHeight, 
+							borderRadius: skeletonConfigs.headBorderRadius,
+							marginRight: (skeletonConfigs.itemDirection == 'row' && skeletonConfigs.textShow) ? skeletonConfigs.itemGap : 0,
+							marginBottom: (skeletonConfigs.itemDirection == 'column' && skeletonConfigs.textShow) ? skeletonConfigs.itemGap : 0
+						}"
+					></view>
+					<view v-if="skeletonConfigs.textShow" class="x-skeleton__wrapper__text">
+						<view
+							v-for="(text, textIndex) in textRowsArr" :key="textIndex"
+							class="x-skeleton__wrapper__text__row" 
+							:class="[propAnimate && 'animate']"
+							:style="{
+								width: text.width, 
+								height: text.height, 
+								borderRadius: skeletonConfigs.textBorderRadius,
+								marginBottom: textIndex < textRowsArr.length - 1 ? skeletonConfigs.textRowsGap : 0
+							}"
+						></view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 插槽 -->
+		<view v-else>
+			<slot></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	import XSkeletonConfigs from './x-skeleton-configs.js'
+	export default {
+		name: "x-skeleton",
+		mixins: [ XSkeletonConfigs ],
+		props: {
+			// 骨架屏类型
+			propType: {
+				type: String,
+				default: '' //banner轮播图、info个人信息、text段落、menu菜单、list列表、waterfall瀑布流
+			},
+			// 是否展示骨架组件
+			propLoading: {
+			    type: Boolean,
+			    default: true
+			},
+			// 是否开启动画效果
+			propAnimate: {
+			    type: Boolean,
+			    default: true
+			},
+			// 动画效果持续时间，单位秒
+			propAnimateTime: {
+				type: Number || String,
+				default: 1.8
+			},
+			// 是否开启淡出动画
+			propFadeOut: {
+				type: Boolean,
+				default: true
+			},
+			// 淡出效果持续时间，单位秒
+			propFadeOutTime: {
+				type: Number || String,
+				default: 0.5
+			},
+			// 骨架的背景色
+			propBgColor: {
+				type: String,
+				default: '#EAEDF5'
+			},
+			// 骨架的动画高亮背景色
+			propHighlightBgColor: {
+				type: String,
+				default: '#F9FAFF'
+			},
+            // 指定n内容高度
+            propHeightNumber: {
+                type: Number || String,
+                default: 300
+            },
+            // 指定菜单栏行数
+            propRowNumber: {
+                type: Number || String,
+                default: 2
+            },
+			// 自定义配置
+			propConfig: {
+				type: Object,
+				default: () => {
+					return {
+						// padding: '30rpx',		   				  //内边距
+						// gridRows: 3, 			 	   			  //行数
+						// gridColumns: 2,	  		  	   			  //列数
+						// gridRowsGap: '40rpx',		   			  //行间隔
+						// gridColumnsGap: '24rpx',	   			  	  //竖间距
+						// itemDirection: 'column',   				  //head与text之间的排列方向（row、column）
+						// itemGap: '16rpx', 				  		  //head与text之间的间隔
+						// itemAlign: 'center',  	   				  //head与text之间的纵轴对齐方式（center、flex-start、flex-end、baseline）
+						// headShow: true,		 	   				  //head是否展示
+						// headWidth: '100%',	  	   				  //head宽度，支持百分比
+						// headHeight: '400rpx',	   				  //head高度
+						// headBorderRadius: '12rpx', 				  //head圆角，支持百分比
+						// textShow: true,		   				      //文本是否展示
+						// textRows: 3,		 	   				  	  //文本的行数
+						// textRowsGap: '12rpx',		   			  //文本间距
+						// textWidth: ['40%', '85%', '60%'], 		  //文本的宽度，可以为百分比，数值，带单位字符串等，可通过数组传入指定每个段落行的宽度
+						// textHeight: ['30rpx', '20rpx', '20rpx'],   //文本的高度，可以为数值，带单位字符串等，可通过数组传入指定每个段落行的高度
+						// textBorderRadius: '6rpx',  			      //文本的圆角，支持百分比
+					}
+				}
+			}
+		},
+
+		computed: {
+			gridRowsArr() {
+				return new Array(Number(this.skeletonConfigs?.gridRows || []));
+			},
+			gridColumnsArr() {
+				return new Array(Number(this.skeletonConfigs?.gridColumns || []));
+			},
+			textRowsArr() {
+				if (!this.skeletonConfigs?.textShow) return [];
+				if (/%$/.test(this.skeletonConfigs.textHeight)) {
+					console.error('x-skeleton: textHeight参数不支持百分比单位');
+				}
+				const rows = []
+				for (let i = 0; i < this.skeletonConfigs.textRows; i++) {
+					const { gridRows, textWidth, textHeight } = this.skeletonConfigs;
+					let item = {},
+						// 需要预防超出数组边界的情况
+						rowWidth = this.isArray(textWidth) ? (textWidth[i] || (i === gridRows - 1 ? '70%' : '100%')) : i === gridRows - 1 ? '100%' : textWidth,
+						rowHeight = this.isArray(textHeight) ? (textHeight[i] || '30rpx') : textHeight
+					// 非百分比的宽度时，调整像素单位
+					if (/%$/.test(rowWidth)) {
+						item.width = rowWidth;
+					} else {
+						item.width = this.addUnit(rowWidth)
+					}
+					item.height = this.addUnit(rowHeight)
+					rows.push(item)
+				}
+				return rows
+			},
+			variableStr() {
+				let keys = ['propAnimateTime', 'propFadeOutTime', 'propBgColor', 'propHighlightBgColor'];
+				let str = keys.map(item => {
+					if (item.indexOf('Time') > -1) {
+						return `--${item}:${this[item]}s`
+					} else {
+						return `--${item}:${this[item]}`
+					}
+				}).join(";");
+				return str;
+			}
+		},
+
+		watch: {
+			propLoading: {
+				immediate: true, 
+				handler(value) {
+					if (value) {
+						this.skeletonLoading = true;
+					} else {
+						if (this.propFadeOut) {
+							this.startFadeOut = true;
+							setTimeout(() => {
+								this.skeletonLoading = false;
+								this.startFadeOut = false;
+							}, this.propFadeOutTime * 1000);
+						} else {
+							this.skeletonLoading = false;
+						}
+					}
+				}
+			},
+			propType: {
+				immediate: true,
+				handler(value) {
+					if (value === 'banner') {
+						this.skeletonConfigs = this.bannerConfigs(this.propHeightNumber+'rpx');
+					} else if (value === 'info') {
+						this.skeletonConfigs = this.infoConfigs();
+					} else if (value === 'text') {
+						this.skeletonConfigs = this.textConfigs();
+					} else if (value === 'menu') {
+						this.skeletonConfigs = this.menuConfigs(this.propRowNumber);
+					} else if (value === 'list') {
+						this.skeletonConfigs = this.listConfigs(this.propRowNumber);
+					} else if (value === 'waterfall') {
+						this.skeletonConfigs = this.waterfallConfigs(this.propRowNumber);
+					} else {
+						this.skeletonConfigs = this.propConfig || {};
+					}
+				}
+			}
+		},
+
+		data() {
+			return {
+				skeletonConfigs: this.propConfig || {},
+				skeletonLoading: this.propLoading,
+				startFadeOut: false,
+				width: 0
+			};
+		},
+		
+		mounted() {
+
+		},
+		
+		methods: {
+			/**
+			 * @description 是否为数组
+			 * @param {object} value 需要判断的对象
+			 */
+			isArray(value) {
+			    if (typeof Array.isArray === 'function') {
+			        return Array.isArray(value)
+			    }
+			    return Object.prototype.toString.call(value) === '[object Array]'
+			},
+			
+			/**
+			 * @description 添加单位，如果有rpx，upx，%，px等单位结尾或者值为auto，直接返回，否则加上px单位结尾
+			 * @param {string|number} value 需要添加单位的值
+			 * @param {string} unit 添加的单位名 比如px
+			 */
+			addUnit(value = 'auto', unit = 'px') {
+				value = String(value);
+				// 用uView内置验证规则中的number判断是否为数值
+				return /^[\+-]?(\d+\.?\d*|\.\d+|\d\.\d+e\+\d+)$/.test(value) ? `${value}${unit}` : value;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@mixin background {
+		background: linear-gradient(90deg, var(--propBgColor) 25%, var(--propHighlightBgColor) 37%, var(--propBgColor) 50%);
+		background-size: 400% 100%;
+	}
+	
+	.x-skeleton {
+		width: 100%;
+		box-sizing: border-box;
+
+		.x-skeleton__wrapper {
+			display: flex;
+			flex-direction: column;
+
+			&__rows {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+			}
+
+			&__columns {
+				display: flex;
+				align-items: center;
+				flex: 1;
+			}
+
+			&__head {
+				width: 100%;
+				@include background;
+			}
+			
+			&__text {
+				flex: 1;
+				width: 100%;
+				&__row {
+					@include background;
+				}
+			}
+		}
+		
+		.fade-out {
+			opacity: 0;
+			animation: propFadeOutAnim var(--propFadeOutTime);
+		}
+		
+		@keyframes propFadeOutAnim {
+			from {
+				opacity: 1;
+			}
+			to {
+				opacity: 0;
+			}
+		}
+		
+		.animate {
+			animation: skeletonAnim var(--propAnimateTime) ease infinite;
+		}
+		
+		@keyframes skeletonAnim {
+			0% {
+				background-position: 100% 50%;
+			}
+		
+			100% {
+				background-position: 0 50%;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/x-skeleton/package.json b/uni_modules/x-skeleton/package.json
new file mode 100644
index 0000000..7912e90
--- /dev/null
+++ b/uni_modules/x-skeleton/package.json
@@ -0,0 +1,84 @@
+{
+  "id": "x-skeleton",
+  "displayName": "skeleton骨架屏（可任意配置-易用-灵活-动画）",
+  "version": "1.0.4",
+  "description": "x-skeleton骨架屏可随意配置内容，扩展性强，简单易用，内含常用的骨架类型",
+  "keywords": [
+    "skeleton",
+    "骨架屏",
+    "加载效果",
+    "vue",
+    "微信小程序"
+],
+  "repository": "",
+"engines": {
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "插件不采集任何数据",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "u"
+        },
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u",
+          "钉钉": "u",
+          "快手": "u",
+          "飞书": "u",
+          "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/x-skeleton/readme.md b/uni_modules/x-skeleton/readme.md
new file mode 100644
index 0000000..74726ab
--- /dev/null
+++ b/uni_modules/x-skeleton/readme.md
@@ -0,0 +1,93 @@
+# x-skeleton
+
+# 功能介绍
+- 支持 H5、微信小程序，其他端未测试过
+- 使用简单、灵活，高度自定义
+- 加载时支持动画
+- 消失时加了动画，不再生硬切换页面
+- 支持绝大部分常用场景：
+1、轮播图 
+2、个人信息 
+3、段落 
+4、菜单 
+5、列表 
+6、瀑布流
+7、自定义...
+
+# 属性说明
+
+| 参数    | 说明                                                | 类型    | 默认值 | 可选值 |
+| ------- | --------------------------------------------------- | ------- | ------ | --- |
+| type | 骨架类型，为空时是完全自定义 | String | - |banner轮播图、info个人信息、text段落、menu菜单、list列表、waterfall瀑布流|
+| loading | 是否显示骨架占位图，设置为false将会展示子组件内容 | Boolean | true |true、false|
+| animate | 是否开启动画效果 | Boolean | true |true、false|
+| animateTime | 动画效果持续时间，单位秒 | Number \| String | 1.8 |-|
+| fadeOut | 是否开启淡出动画 | Boolean | true |true、false|
+| fadeOutTime | 淡出效果持续时间，单位秒 | Number \| String | 0.5 |-|
+| bgColor | 骨架的背景色 | String | #EAEDF5 |-|
+| highlightBgColor | 骨架的动画高亮背景色 | String | #F9FAFF |-|
+| configs | 自定义配置，具体看下方 | Object | {} |-|
+
+## configs参数说明
+
+| 参数    | 说明                                                | 类型  |
+| ------- | --------------------------------------------------- | ------- |
+| padding | 骨架内边距，同 css 的 padding | String |
+| gridRows | 行数 | Number |
+| gridColumns | 列数 | Number |
+| gridRowsGap | 行间隔 | String |
+| gridColumnsGap | 竖间距 | String |
+| itemDirection | head与text之间的排列方向（row、column） | String |
+| itemGap | head与text之间的间隔 | String |
+| itemAlign | head与text之间的纵轴对齐方式，同 flex 的align-items（center、flex-start、flex-end等） | String |
+| headShow | head是否展示 | Boolean |
+| headWidth | head宽度，支持百分比 | String |
+| headHeight | head高度 | String |
+| headBorderRadius | head圆角，支持百分比 | String |
+| textShow | text是否展示 | Boolean |
+| textRows | text的行数 | Number |
+| textRowsGap | text间距 | String |
+| textWidth | text的宽度，可以为百分比，数值，带单位字符串等，可通过数组传入指定每个段落行的宽度 | String \| Array \| Number |
+| textHeight | text的高度，可以为数值，带单位字符串等，可通过数组传入指定每个段落行的高度 | String \| Array \| Number |
+| textBorderRadius | text的圆角，支持百分比 | String |
+
+大部分情况下，直接指定相应的 type 已经够用了，如果大家想进行样式的微调、完全自定义可通过设置 configs 来实现。
+
+简单解释一下这些参数（右边有结构布局图示）：
+
+布局总共分成 4 块，分别是 grid、item、head、text。
+
+1、grid：包含 item，指定每一行有多少个 item，每一列有多少个 item
+
+2、item：包含 head、text，可设置他们之间的排列方式、间距
+
+3、head：一个 item 只有一个 head，可设置宽高、圆角
+
+4、text：一个 item 可以有多行 text，可分别设置宽高、圆角、间距
+
+
+
+# 使用示例
+
+```html
+<x-skeleton type="banner" :loading="loading">
+	<view>我是轮播图</view>
+</x-skeleton>
+```
+
+```js
+export default {
+	data() {
+		return {
+			loading: true,
+		}
+	},
+	onLoad() {
+		setTimeout(() => {
+			this.loading = false;
+		}, 2000);
+	},
+}
+```
+
+更多用法请下载查看示例代码，有问题可以留言
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
new file mode 100644
index 0000000..24a9629
--- /dev/null
+++ b/vue.config.js
@@ -0,0 +1,9 @@
+module.exports = {
+    // webpack配置
+    configureWebpack: {
+        // 关闭 webpack 的性能提示
+        performance: {
+            hints: false
+        }
+    }
+}
\ No newline at end of file