diff --git a/api/config/params.php b/api/config/params.php
index d1d3b77a7..90b9bea1d 100644
--- a/api/config/params.php
+++ b/api/config/params.php
@@ -8,8 +8,9 @@
     ],
     'user.log.except.code' => [], // 不记录的code
 
-    // token有效期是否验证 默认不关闭验证
-    'user.accessTokenValidity' => false,
+    /** ------ token相关 ------ **/
+    // token有效期是否验证 默认开启验证
+    'user.accessTokenValidity' => true,
     // token有效期 默认 2 小时
     'user.accessTokenExpire' => 2 * 60 * 60,
     // refresh token有效期是否验证 默认开启验证
diff --git a/api/controllers/ActiveController.php b/api/controllers/ActiveController.php
index 12eef6c07..816133690 100644
--- a/api/controllers/ActiveController.php
+++ b/api/controllers/ActiveController.php
@@ -82,7 +82,10 @@ public function behaviors()
                 HttpBasicAuth::class,
                 HttpBearerAuth::class,
                 HttpHeaderAuth::class,
-                QueryParamAuth::class,
+                [
+                    'class' => QueryParamAuth::class,
+                    'tokenParam' => 'access-token'
+                ],
             ],
             // 不进行认证判断方法
             'optional' => $this->optional,
diff --git a/api/modules/v1/controllers/MiniProgramController.php b/api/modules/v1/controllers/MiniProgramController.php
index 519bdfec3..62207f993 100644
--- a/api/modules/v1/controllers/MiniProgramController.php
+++ b/api/modules/v1/controllers/MiniProgramController.php
@@ -121,7 +121,7 @@ public function actionDecode()
         {
             $member = new MemberInfo();
             $member->attributes = [
-                'sex' => $userinfo['gender'],
+                'gender' => $userinfo['gender'],
                 'nickname' => $userinfo['nickName'],
                 'head_portrait' => $userinfo['avatarUrl'],
             ];
diff --git a/api/modules/v1/controllers/member/InfoController.php b/api/modules/v1/controllers/member/InfoController.php
index 16d085ef8..f0c28546f 100644
--- a/api/modules/v1/controllers/member/InfoController.php
+++ b/api/modules/v1/controllers/member/InfoController.php
@@ -28,7 +28,7 @@ public function actionView($id)
     {
         $model = $this->modelClass::find()
             ->where(['id' => $id, 'status' => StatusEnum::ENABLED])
-            ->select(['id', 'username', 'nickname', 'realname', 'head_portrait', 'sex', 'qq', 'email', 'birthday', 'user_money', 'user_integral', 'status', 'created_at'])
+            ->select(['id', 'username', 'nickname', 'realname', 'head_portrait', 'gender', 'qq', 'email', 'birthday', 'user_money', 'user_integral', 'status', 'created_at'])
             ->asArray()
             ->one();
 
diff --git a/backend/assets/AppAsset.php b/backend/assets/AppAsset.php
index d6a7d173d..d91199663 100644
--- a/backend/assets/AppAsset.php
+++ b/backend/assets/AppAsset.php
@@ -23,7 +23,6 @@ class AppAsset extends AssetBundle
         'plugins/toastr/toastr.min.css', // 状态通知
         'dist/css/AdminLTE.min.css',
         'dist/css/rageframe.css',
-        'dist/css/wechat.css',
     ];
 
     public $js = [
@@ -33,6 +32,7 @@ class AppAsset extends AssetBundle
         'plugins/sweetalert/sweetalert.min.js',
         'plugins/fancybox/jquery.fancybox.min.js',
         'dist/js/adminlte.js',
+        'dist/js/demo.js',
         'dist/js/template.js',
         'dist/js/rageframe.js',
         'dist/js/ueditor.all.min.js',
diff --git a/backend/config/main.php b/backend/config/main.php
index a1a927a1e..b13297cd4 100644
--- a/backend/config/main.php
+++ b/backend/config/main.php
@@ -82,7 +82,7 @@
         'assetManager' => [
             // 线上建议将forceCopy设置成false，如果访问量不大无所谓
             'forceCopy' => true,
-            'appendTimestamp' => true,
+            // 'appendTimestamp' => true,
             'bundles' => [
                 'yii\web\JqueryAsset' => [
                     'sourcePath' => null,
@@ -108,8 +108,9 @@
         'provinces' => [
             'class' => 'backend\widgets\provinces\ProvincesController',
         ],
-        'wechat-select-attachment' => [
-            'class' => 'backend\widgets\wechatselectattachment\WechatSelectAttachment',
+        // 微信资源选择
+        'selector' => [
+            'class' => 'backend\widgets\selector\SelectorController',
         ],
     ],
     'params' => $params,
diff --git a/backend/config/params.php b/backend/config/params.php
index 99b28e18e..82ebf4308 100644
--- a/backend/config/params.php
+++ b/backend/config/params.php
@@ -4,6 +4,9 @@
     'adminAcronym' => 'RF',
     'adminTitle' => 'RageFrame',
 
+    /** ------ 总管理员配置 ------ **/
+    'adminAccount' => 1,// 系统管理员账号id
+
     /** ------ 日志记录 ------ **/
     'user.log' => true,
     'user.log.level' => ['error'], // 级别 ['info', 'warning', 'error']
@@ -15,13 +18,9 @@
     ],
     'user.log.except.code' => [], // 不记录的code
 
-    /** ------ 总管理员配置 ------ **/
-    'adminAccount' => 1,// 系统管理员账号id
-
     /** ------ 开发者信息 ------ **/
-    'exploitName' => '简言',
-    'exploitVersions' => '2.2.21',
-    'exploitSysName' => 'RageFrame应用开发引擎',
+    'exploitDeveloper' => '简言',
+    'exploitFullName' => 'RageFrame应用开发引擎',
     'exploitOfficialWebsite' => '<a href="http://www.rageframe.com" target="_blank">www.rageframe.com</a>',
     'exploitGitHub' => '<a href="https://github.com/jianyan74/rageframe2" target="_blank">https://github.com/jianyan74/rageframe2</a>',
 
diff --git a/backend/controllers/AddonsController.php b/backend/controllers/AddonsController.php
index 956aa5238..dfef9582f 100644
--- a/backend/controllers/AddonsController.php
+++ b/backend/controllers/AddonsController.php
@@ -13,6 +13,7 @@
 use common\helpers\AddonHelper;
 use common\models\sys\AddonsAuthItemChild;
 use common\helpers\AddonAuthHelper;
+use common\helpers\DebrisHelper;
 use backend\modules\wechat\models\RuleForm;
 
 /**
@@ -33,7 +34,7 @@ public function behaviors()
                 'rules' => [
                     [
                         'allow' => true,
-                        'roles' => ['@'],// 登录
+                        'roles' => ['@'], // 登录
                     ],
                 ],
             ],
@@ -48,6 +49,14 @@ public function behaviors()
      */
     public function beforeAction($action)
     {
+        if (Yii::$app->user->isGuest)
+        {
+            throw new UnauthorizedHttpException('对不起，请先登录');
+        }
+
+        // 判断是否手机
+        Yii::$app->params['isMobile'] = DebrisHelper::isMobile();
+
         // 验证是否登录且验证是否超级管理员
         if (!Yii::$app->user->isGuest && Yii::$app->services->sys->isAuperAdmin())
         {
@@ -61,9 +70,9 @@ public function beforeAction($action)
 
         // 当前菜单路由
         $route = $this->route;
-        in_array($action->id, ['cover', 'qr-code']) && $route = AddonsAuthItemChild::AUTH_COVER;
+        in_array($action->id, ['cover']) && $route = AddonsAuthItemChild::AUTH_COVER;
         in_array($action->id, ['rule', 'rule-edit', 'rule-delete', 'ajax-update']) && $route = AddonsAuthItemChild::AUTH_RULE;
-        if (AddonAuthHelper::verify($route) == false)
+        if (AddonAuthHelper::verify($route) === false)
         {
             throw new UnauthorizedHttpException('对不起，您现在还没获此操作的权限');
         }
@@ -113,8 +122,9 @@ public function actionRule()
         $request = Yii::$app->request;
         $keyword = $request->get('keyword', null);
 
-        $data = Rule::find()->with('ruleKeyword')
+        $data = Rule::find()
             ->where(['module' => Rule::RULE_MODULE_ADDON])
+            ->with('ruleKeyword')
             ->joinWith('addon as b')
             ->andWhere(['b.addon' => Yii::$app->params['addon']['name']])
             ->andFilterWhere(['like', 'name', $keyword]);
@@ -248,26 +258,4 @@ public function actionAjaxUpdate($id)
 
         return ResultDataHelper::json(200, '修改成功');
     }
-
-    /**
-     * 二维码渲染
-     *
-     * @return mixed
-     * @throws \yii\base\InvalidConfigException
-     * @throws \yii\web\NotFoundHttpException
-     */
-    public function actionQrCode()
-    {
-        // 初始化模块
-        AddonHelper::initAddon($this->addonName, $this->route);
-
-        $qr = Yii::$app->get('qr');
-        Yii::$app->response->format = Response::FORMAT_RAW;
-        Yii::$app->response->headers->add('Content-Type', $qr->getContentType());
-
-        return $qr->setText(Yii::$app->request->get('url', null))
-            ->setSize(150)
-            ->setMargin(7)
-            ->writeString();
-    }
 }
\ No newline at end of file
diff --git a/backend/controllers/MController.php b/backend/controllers/MController.php
index bd333a090..be4618482 100644
--- a/backend/controllers/MController.php
+++ b/backend/controllers/MController.php
@@ -1,10 +1,10 @@
 <?php
 namespace backend\controllers;
 
-use common\helpers\AuthHelper;
 use Yii;
 use yii\web\UnauthorizedHttpException;
 use yii\filters\AccessControl;
+use common\helpers\AuthHelper;
 
 /**
  * 基类控制器
@@ -12,37 +12,10 @@
  * Class MController
  * @package backend\controllers
  * @property \yii\db\ActiveRecord $modelClass;
- * @property \EasyWeChat\OfficialAccount\Application $app;
- * @property \common\services\Application $services;
  * @author jianyan74 <751393839@qq.com>
  */
 class MController extends \common\controllers\BaseController
 {
-    /**
-     * 微信实例化SDK
-     *
-     * @var
-     */
-    protected $app;
-
-    /**
-     * 服务
-     *
-     * @var
-     */
-    protected $services;
-
-    /**
-     * @throws \yii\base\InvalidConfigException
-     */
-    public function init()
-    {
-        parent::init();
-
-        empty($this->app) && $this->app = Yii::$app->wechat->app;
-        empty($this->services) && $this->services = Yii::$app->services;
-    }
-
     /**
      * @return array
      */
diff --git a/backend/modules/member/Module.php b/backend/modules/member/Module.php
index 3f5261134..75a087894 100644
--- a/backend/modules/member/Module.php
+++ b/backend/modules/member/Module.php
@@ -4,6 +4,7 @@
 /**
  * Class Module
  * @package backend\modules\member
+ * @author jianyan74 <751393839@qq.com>
  */
 class Module extends \yii\base\Module
 {
diff --git a/backend/modules/member/views/auth/edit.php b/backend/modules/member/views/auth/edit.php
index 39af4a239..8a1eba9bf 100644
--- a/backend/modules/member/views/auth/edit.php
+++ b/backend/modules/member/views/auth/edit.php
@@ -1,5 +1,4 @@
 <?php
-use yii\helpers\Url;
 use yii\widgets\ActiveForm;
 use common\enums\GenderEnum;
 use common\enums\StatusEnum;
@@ -29,21 +28,9 @@
                 <?= $form->field($model, 'head_portrait')->widget('common\widgets\webuploader\Images', [
                     'config' => [
                         // 可设置自己的上传地址, 不设置则默认地址
-                        // 'server' => '',
                         'pick' => [
                             'multiple' => false,
                         ],
-                        'formData' => [
-                            // 不配置则不生成缩略图
-                            // 'thumb' => [
-                            //     [
-                            //         'widget' => 100,
-                            //         'height' => 100,
-                            //     ],
-                            // ]
-                        ],
-                        'chunked' => false,// 开启分片上传
-                        'chunkSize' => 512 * 1024,// 分片大小
                     ]
                 ]);?>
                 <?= $form->field($model, 'country')->textInput() ?>
@@ -68,7 +55,7 @@
             <!-- /.box-body -->
             <div class="box-footer">
                 <div class="col-sm-12 text-center">
-                    <button class="btn btn-primary" type="submit" onclick="SendForm()">保存</button>
+                    <button class="btn btn-primary" type="submit">保存</button>
                     <span class="btn btn-white" onclick="history.go(-1)">返回</span>
                 </div>
             </div>
diff --git a/backend/modules/member/views/member/ajax-edit.php b/backend/modules/member/views/member/ajax-edit.php
index 3d8b721bb..4ff52a240 100644
--- a/backend/modules/member/views/member/ajax-edit.php
+++ b/backend/modules/member/views/member/ajax-edit.php
@@ -29,4 +29,4 @@
     </div>
 </div>
 
-<?php ActiveForm::end(); ?>
+<?php ActiveForm::end(); ?>
\ No newline at end of file
diff --git a/backend/modules/member/views/member/edit.php b/backend/modules/member/views/member/edit.php
index 239ace026..e8808bdf7 100644
--- a/backend/modules/member/views/member/edit.php
+++ b/backend/modules/member/views/member/edit.php
@@ -9,7 +9,6 @@
 $this->params['breadcrumbs'][] = ['label' => $this->title];
 ?>
 
-
 <div class="row">
     <div class="col-lg-12">
         <div class="box">
@@ -19,7 +18,7 @@
             <?php $form = ActiveForm::begin([
                 'fieldConfig' => [
                     'template' => "<div class='col-sm-2 text-right'>{label}</div><div class='col-sm-10'>{input}{hint}{error}</div>",
-                ]
+                ],
             ]); ?>
             <div class="box-body">
                 <?= $form->field($model, 'realname')->textInput() ?>
@@ -46,7 +45,6 @@
                     ],
                     'options'=>[
                         'class' => 'form-control no_bor',
-                        'readonly' => 'readonly',// 禁止输入
                     ]
                 ]); ?>
                 <?= $form->field($model, 'status')->radioList(StatusEnum::$listExplain) ?>
diff --git a/backend/modules/sys/views/addons-plug/create.php b/backend/modules/sys/views/addons-plug/create.php
index ad6d7668b..2422de8db 100644
--- a/backend/modules/sys/views/addons-plug/create.php
+++ b/backend/modules/sys/views/addons-plug/create.php
@@ -27,7 +27,7 @@
                             <div class="col-sm-12">
                                 <?= $form->field($model, 'title')->textInput()->hint('模块的名称, 显示在用户的模块列表中. 不要超过20个字符') ?>
                                 <?= $form->field($model, 'name')->textInput()->hint('模块标识符, 应对应模块文件夹的名称, 系统按照此标识符查找模块定义, 只能英文和下划线组成，建议大写驼峰，例如：RfArticle') ?>
-                                <?= $form->field($model, 'group')->dropDownList(ArrayHelper::map($addonsGroup,'name','title')) ?>
+                                <?= $form->field($model, 'group')->dropDownList(ArrayHelper::map($addonsGroup, 'name', 'title')) ?>
                                 <?= $form->field($model, 'version')->textInput()->hint('模块当前版本, 此版本号用于模块的版本更新')?>
                                 <?= $form->field($model, 'brief_introduction')->textInput() ?>
                                 <?= $form->field($model, 'description')->textarea()->hint('模块详细描述, 详细介绍模块的功能和使用方法 ')?>
@@ -52,19 +52,19 @@
                                 <div class="well well-sm desk-menu">
                                     <div class="col-sm-12">
                                         <div class="col-md-3">
-                                            <div class="input-group" style="margin-left:-15px;margin-bottom:10px">
+                                            <div class="input-group rfAddonAddMenu">
                                                 <span class="input-group-addon">菜单名称</span>
                                                 <input class="form-control" name="bindings[cover][title][]" placeholder="例如:首页入口" type="text">
                                             </div>
                                         </div>
                                         <div class="col-md-3">
-                                            <div class="input-group" style="margin-left:-15px;margin-bottom:10px">
+                                            <div class="input-group rfAddonAddMenu">
                                                 <span class="input-group-addon">菜单路由</span>
                                                 <input class="form-control" name="bindings[cover][route][]" placeholder="例如:test/index" type="text">
                                             </div>
                                         </div>
                                         <div class="col-md-3">
-                                            <div class="input-group" style="margin-left:-15px;margin-bottom:10px">
+                                            <div class="input-group rfAddonAddMenu">
                                                 <span class="input-group-addon">菜单图标</span>
                                                 <input class="form-control" name="bindings[cover][icon][]" placeholder="例如:fa fa-wechat" type="text">
                                             </div>
@@ -76,7 +76,7 @@
                                         </div>
                                     </div>
                                     <div class="add">
-                                        <a href="javascript:;" onclick="addOption('cover',this);">添加菜单 <i class="fa fa-plus-circle" title="添加菜单"></i></a><br>
+                                        <a href="javascript:;" class="m-l" onclick="addOption('cover',this);">添加菜单 <i class="fa fa-plus-circle" title="添加菜单"></i></a><br>
                                         前台(含api/微信)导航入口菜单,点击后进入系统中对应的功能..
                                     </div>
                                 </div>
@@ -86,19 +86,19 @@
                                 <div class="well well-sm">
                                     <div class="col-sm-12">
                                         <div class="col-md-3">
-                                            <div class="input-group" style="margin-left:-15px;margin-bottom:10px">
+                                            <div class="input-group rfAddonAddMenu">
                                                 <span class="input-group-addon">菜单名称</span>
                                                 <input class="form-control" name="bindings[menu][title][]" placeholder="例如:首页管理" type="text">
                                             </div>
                                         </div>
                                         <div class="col-md-3">
-                                            <div class="input-group" style="margin-left:-15px;margin-bottom:10px">
+                                            <div class="input-group rfAddonAddMenu">
                                                 <span class="input-group-addon">菜单路由</span>
                                                 <input class="form-control" name="bindings[menu][route][]" placeholder="例如:test/index" type="text">
                                             </div>
                                         </div>
                                         <div class="col-md-3">
-                                            <div class="input-group" style="margin-left:-15px;margin-bottom:10px">
+                                            <div class="input-group rfAddonAddMenu">
                                                 <span class="input-group-addon">菜单图标</span>
                                                 <input class="form-control" name="bindings[menu][icon][]" placeholder="例如:fa fa-wechat" type="text">
                                             </div>
@@ -110,7 +110,7 @@
                                         </div>
                                     </div>
                                     <div class="add">
-                                        <a href="javascript:;" onclick="addOption('menu',this);">添加菜单 <i class="fa fa-plus-circle" title="添加菜单"></i></a><br>
+                                        <a href="javascript:;" class="m-l" onclick="addOption('menu',this);">添加菜单 <i class="fa fa-plus-circle" title="添加菜单"></i></a><br>
                                         后台管理中心导航菜单将会在管理中心生成一个导航入口(管理后台操作), 用于对模块定义的内容进行管理.
                                     </div>
                                 </div>
@@ -137,19 +137,19 @@
 <script id="menuModel" type="text/html">
     <div class="col-sm-12">
         <div class="col-md-3">
-            <div class="input-group" style="margin-left:-15px;margin-bottom:10px">
+            <div class="input-group rfAddonAddMenu">
                 <span class="input-group-addon">菜单名称</span>
                 <input class="form-control" name="bindings[{{type}}][title][]" placeholder="例如:首页管理/入口" type="text">
             </div>
         </div>
         <div class="col-md-3">
-            <div class="input-group" style="margin-left:-15px;margin-bottom:10px">
+            <div class="input-group rfAddonAddMenu">
                 <span class="input-group-addon">菜单路由</span>
                 <input class="form-control" name="bindings[{{type}}][route][]" placeholder="例如:test/index" type="text">
             </div>
         </div>
         <div class="col-md-3">
-            <div class="input-group" style="margin-left:-15px;margin-bottom:10px">
+            <div class="input-group rfAddonAddMenu">
                 <span class="input-group-addon">菜单图标</span>
                 <input class="form-control" name="bindings[{{type}}][icon][]" placeholder="例如:fa fa-wechat" type="text">
             </div>
diff --git a/backend/modules/sys/views/auth-accredit/ajax-edit.php b/backend/modules/sys/views/auth-accredit/ajax-edit.php
index 3a1f01dea..f916f680e 100644
--- a/backend/modules/sys/views/auth-accredit/ajax-edit.php
+++ b/backend/modules/sys/views/auth-accredit/ajax-edit.php
@@ -19,7 +19,7 @@
     </div>
     <div class="modal-body">
         <?= $form->field($model, 'description')->textInput() ?>
-        <?= $form->field($model, 'name')->textInput()->hint('如果是路由要绝对路径哦, 例如 /main/index') ?>
+        <?= $form->field($model, 'name')->textInput()->label('路由/别名')->hint('如果是路由要绝对路径哦, 例如 /main/index') ?>
         <?= $form->field($model, 'rule_name')->dropDownList(AuthRule::getRoutes(), ['prompt' => '请选择']) ?>
         <?= $form->field($model, 'sort')->textInput() ?>
     </div>
diff --git a/backend/modules/sys/views/manager-notify/announce.php b/backend/modules/sys/views/manager-notify/announce.php
index 132bc6ff2..9c5b00adf 100644
--- a/backend/modules/sys/views/manager-notify/announce.php
+++ b/backend/modules/sys/views/manager-notify/announce.php
@@ -38,15 +38,19 @@
                             [
                                 'label'=> '浏览状态',
                                 'filter' => false, //不显示搜索框
+                                'format' => 'raw',
                                 'value' => function($model){
-                                    return $model->is_read == 1 ? '已读' : '未读';
+                                    $label = $model->is_read == 0 ? 'label-success' : 'label-default';
+                                    return HtmlHelper::label($model->is_read == 1 ? '已读' : '未读', '', [
+                                        'class' => "label " . $label
+                                    ]);
                                 },
                             ],
                             [
-                                'label'=> '创建日期',
+                                'label'=> '创建时间',
                                 'attribute' => 'created_at',
                                 'filter' => false, //不显示搜索框
-                                'format' => ['date', 'php:Y-m-d H:i:s'],
+                                'format' => ['date', 'php:Y-m-d H:i'],
                             ],
                             [
                                 'header' => "操作",
diff --git a/backend/modules/sys/views/manager/_form.php b/backend/modules/sys/views/manager/_form.php
index 86857d673..3b45d4691 100644
--- a/backend/modules/sys/views/manager/_form.php
+++ b/backend/modules/sys/views/manager/_form.php
@@ -31,7 +31,6 @@
                 ]
             ]); ?>
             <div class="box-body">
-                <?= $form->field($model, 'head_portrait')->hiddenInput()->label(false) ?>
                 <?= $form->field($model, 'realname')->textInput() ?>
                 <?= $form->field($model, 'gender')->radioList(GenderEnum::$listExplain) ?>
                 <?= $form->field($model, 'mobile')->textInput() ?>
@@ -58,6 +57,7 @@
                     ]
                 ]); ?>
                 <?= $form->field($model, 'address')->textarea() ?>
+                <?= $form->field($model, 'head_portrait')->hiddenInput()->label(false) ?>
             </div>
             <div class="box-footer text-center">
                 <button class="btn btn-primary" type="submit" onclick="sendForm()">保存</button>
diff --git a/backend/modules/sys/views/system/info.php b/backend/modules/sys/views/system/info.php
index 003c06da8..998dd4be1 100644
--- a/backend/modules/sys/views/system/info.php
+++ b/backend/modules/sys/views/system/info.php
@@ -8,7 +8,7 @@
     <div class="col-xs-7">
         <div class="box">
             <div class="box-header">
-                <h3 class="box-title"><i class="fa fa-cog"></i> 开发环境</h3>
+                <h3 class="box-title"><i class="fa fa-cog"></i> 环境配置</h3>
             </div>
             <div class="box-body table-responsive">
                 <table class="table table-hover">
@@ -26,7 +26,7 @@
                     </tr>
                     <tr>
                         <td>数据库大小</td>
-                        <td><?= Yii::$app->formatter->asShortSize($mysql_size); ?></td>
+                        <td><?= Yii::$app->formatter->asShortSize($mysql_size, 2); ?></td>
                     </tr>
                     <tr>
                         <td>附件目录</td>
@@ -34,7 +34,7 @@
                     </tr>
                     <tr>
                         <td>附件目录大小</td>
-                        <td><?= Yii::$app->formatter->asShortSize($attachment_size); ?></td>
+                        <td><?= Yii::$app->formatter->asShortSize($attachment_size, 2); ?></td>
                     </tr>
                     <tr>
                         <td>文件上传限制</td>
@@ -55,13 +55,13 @@
     <div class="col-xs-5">
         <div class="box">
             <div class="box-header">
-                <h3 class="box-title"><i class="fa fa-code"></i> 开发系统</h3>
+                <h3 class="box-title"><i class="fa fa-code"></i> 系统信息</h3>
             </div>
             <div class="box-body table-responsive">
                 <table class="table table-hover">
                     <tr>
-                        <td width="150px">系统名称</td>
-                        <td><?= Yii::$app->params['exploitSysName']?></td>
+                        <td width="150px">系统全称</td>
+                        <td><?= Yii::$app->params['exploitFullName']; ?></td>
                     </tr>
                     <tr>
                         <td></td>
@@ -69,7 +69,7 @@
                     </tr>
                     <tr>
                         <td>系统版本</td>
-                        <td><?= Yii::$app->params['exploitVersions']?></td>
+                        <td><?= Yii::$app->version; ?></td>
                     </tr>
                     <tr>
                         <td width="150px">Yii2版本</td>
@@ -89,7 +89,7 @@
                     </tr>
                     <tr>
                         <td>开发者</td>
-                        <td><?= Yii::$app->params['exploitName']?></td>
+                        <td><?= Yii::$app->params['exploitDeveloper']?></td>
                     </tr>
                 </table>
             </div>
diff --git a/backend/modules/wechat/controllers/AttachmentController.php b/backend/modules/wechat/controllers/AttachmentController.php
index 3adc3a08e..3e93ff41a 100644
--- a/backend/modules/wechat/controllers/AttachmentController.php
+++ b/backend/modules/wechat/controllers/AttachmentController.php
@@ -58,6 +58,7 @@ public function actionIndex()
      * @throws \EasyWeChat\Kernel\Exceptions\HttpException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
+     * @throws \EasyWeChat\Kernel\Exceptions\RuntimeException
      * @throws \Psr\SimpleCache\InvalidArgumentException
      * @throws \yii\web\UnprocessableEntityHttpException
      */
@@ -74,7 +75,7 @@ public function actionNewsEdit()
         if ($request->isAjax)
         {
             // 素材库
-            $material = $this->app->material;
+            $material = Yii::$app->wechat->app->material;
 
             $attach_id = $request->post('attach_id');
             $attachment = $this->findModel($attach_id);
@@ -206,6 +207,7 @@ public function actionNewsEdit()
      * @throws \EasyWeChat\Kernel\Exceptions\HttpException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
+     * @throws \EasyWeChat\Kernel\Exceptions\RuntimeException
      * @throws \Psr\SimpleCache\InvalidArgumentException
      * @throws \yii\web\UnprocessableEntityHttpException
      */
@@ -215,7 +217,7 @@ public function actionImageCreate()
         if ($model->load(Yii::$app->request->post()) && $model->local_url)
         {
             // 本地前缀
-            $result = $this->app->material->uploadImage(StringHelper::getLocalFilePath($model->local_url));
+            $result = Yii::$app->wechat->app->material->uploadImage(StringHelper::getLocalFilePath($model->local_url));
             // 验证微信报错
             if ($error = Yii::$app->debris->getWechatError($result, false))
             {
@@ -239,6 +241,7 @@ public function actionImageCreate()
      * @throws \EasyWeChat\Kernel\Exceptions\HttpException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
+     * @throws \EasyWeChat\Kernel\Exceptions\RuntimeException
      * @throws \Psr\SimpleCache\InvalidArgumentException
      * @throws \yii\web\UnprocessableEntityHttpException
      */
@@ -248,7 +251,7 @@ public function actionVoiceCreate()
         if ($model->load(Yii::$app->request->post()) && $model->local_url)
         {
             // 本地前缀
-            $result = $this->app->material->uploadVoice(StringHelper::getLocalFilePath($model->local_url, 'voices'));
+            $result = Yii::$app->wechat->app->material->uploadVoice(StringHelper::getLocalFilePath($model->local_url, 'voices'));
             // 验证微信报错
             if ($error = Yii::$app->debris->getWechatError($result, false))
             {
@@ -272,6 +275,7 @@ public function actionVoiceCreate()
      * @throws \EasyWeChat\Kernel\Exceptions\HttpException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
+     * @throws \EasyWeChat\Kernel\Exceptions\RuntimeException
      * @throws \Psr\SimpleCache\InvalidArgumentException
      * @throws \yii\web\UnprocessableEntityHttpException
      */
@@ -281,7 +285,7 @@ public function actionVideoCreate()
         if ($model->load(Yii::$app->request->post()))
         {
             // 本地前缀
-            $result = $this->app->material->uploadVideo(StringHelper::getLocalFilePath($model->local_url, 'videos'), $model->file_name, $model->description);
+            $result = Yii::$app->wechat->app->material->uploadVideo(StringHelper::getLocalFilePath($model->local_url, 'videos'), $model->file_name, $model->description);
             // 验证微信报错
             if ($error = Yii::$app->debris->getWechatError($result, false))
             {
@@ -319,7 +323,7 @@ public function actionDelete($attach_id, $mediaType)
         if ($model->delete())
         {
             // 删除微信服务器数据
-            $result = $this->app->material->delete($model['media_id']);
+            $result = Yii::$app->wechat->app->material->delete($model['media_id']);
             // 验证微信报错
             if ($error = Yii::$app->debris->getWechatError($result, false))
             {
@@ -341,6 +345,7 @@ public function actionDelete($attach_id, $mediaType)
      * @throws \EasyWeChat\Kernel\Exceptions\HttpException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
+     * @throws \EasyWeChat\Kernel\Exceptions\RuntimeException
      * @throws \Psr\SimpleCache\InvalidArgumentException
      * @throws \yii\web\UnprocessableEntityHttpException
      */
@@ -363,7 +368,7 @@ public function actionPreview($attach_id, $mediaType)
             $method = $preview[$attachment->media_type];
             // 1:openid预览 2:微信号预览
             $model->type == 1 && $method = $method . 'ByName';
-            $result = $this->app->broadcasting->$method($attachment->media_id, $model->content);
+            $result = Yii::$app->wechat->app->broadcasting->$method($attachment->media_id, $model->content);
             // 验证微信报错
             if ($error = Yii::$app->debris->getWechatError($result, false))
             {
@@ -432,7 +437,7 @@ public function actionGetAllAttachment($type, $offset = 0, $count = 20)
         // 查找素材
         try
         {
-            $lists = $this->app->material->list($type, $offset, $count);
+            $lists = Yii::$app->wechat->app->material->list($type, $offset, $count);
             // 解析微信接口是否报错.报错则抛出错误信息
             Yii::$app->debris->getWechatError($lists);
             if (empty($lists))
diff --git a/backend/modules/wechat/controllers/FansController.php b/backend/modules/wechat/controllers/FansController.php
index 86bdcc6a5..0f1e812c2 100644
--- a/backend/modules/wechat/controllers/FansController.php
+++ b/backend/modules/wechat/controllers/FansController.php
@@ -147,7 +147,7 @@ public function actionSendMessage($openid)
                     break;
             }
 
-            $result = $this->app->customer_service->message($message)->to($model['openid'])->send();
+            $result = Yii::$app->wechat->app->customer_service->message($message)->to($model['openid'])->send();
             if ($error = Yii::$app->debris->getWechatError($result, false))
             {
                 return ResultDataHelper::json(422, $error);
@@ -166,7 +166,10 @@ public function actionSendMessage($openid)
      *
      * @param $fan_id
      * @return string|Response
+     * @throws \EasyWeChat\Kernel\Exceptions\HttpException
+     * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
+     * @throws \Psr\SimpleCache\InvalidArgumentException
      * @throws yii\web\UnprocessableEntityHttpException
      */
     public function actionMoveTag($fan_id)
@@ -194,7 +197,7 @@ public function actionMoveTag($fan_id)
             {
                 if (!in_array($tag_id, $fansTags))
                 {
-                    $this->app->user_tag->tagUsers([$fans['openid']], $tag_id);
+                    Yii::$app->wechat->app->user_tag->tagUsers([$fans['openid']], $tag_id);
                 }
 
                 $model = new FansTagMap();
@@ -208,7 +211,7 @@ public function actionMoveTag($fan_id)
             {
                 if (!in_array($tag_id, $tags))
                 {
-                    $this->app->user_tag->untagUsers([$fans['openid']], $tag_id);
+                    Yii::$app->wechat->app->user_tag->untagUsers([$fans['openid']], $tag_id);
                 }
             }
 
@@ -237,7 +240,7 @@ public function actionGetAllFans()
         $next_openid = $request->get('next_openid', '');
 
         // 获取全部列表
-        $fans_list = $this->app->user->list();
+        $fans_list = Yii::$app->wechat->app->user->list();
         $fans_count = $fans_list['total'];
 
         // 设置关注全部为为关注
@@ -291,6 +294,7 @@ public function actionGetAllFans()
      * 开始同步粉丝数据
      *
      * @return array
+     * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
      * @throws yii\db\Exception
      */
     public function actionSync()
diff --git a/backend/modules/wechat/controllers/FansTagsController.php b/backend/modules/wechat/controllers/FansTagsController.php
index 7de07f5ed..0f65bcb90 100644
--- a/backend/modules/wechat/controllers/FansTagsController.php
+++ b/backend/modules/wechat/controllers/FansTagsController.php
@@ -39,13 +39,13 @@ public function actionIndex()
                     return $this->message("标签名称不能为空", $this->redirect(['index']), 'error');
                 }
 
-                $this->app->user_tag->update($key, $value);
+                Yii::$app->wechat->app->user_tag->update($key, $value);
             }
 
             // 插入标签
             foreach ($tag_add as $value)
             {
-                $this->app->user_tag->create($value);
+                Yii::$app->wechat->app->user_tag->create($value);
             }
 
             FansTags::updateList();
diff --git a/backend/modules/wechat/controllers/MenuController.php b/backend/modules/wechat/controllers/MenuController.php
index fc20592cf..04a34c9cd 100644
--- a/backend/modules/wechat/controllers/MenuController.php
+++ b/backend/modules/wechat/controllers/MenuController.php
@@ -3,7 +3,6 @@
 
 use Yii;
 use yii\data\Pagination;
-use yii\web\NotFoundHttpException;
 use common\models\wechat\Menu;
 use common\helpers\ResultDataHelper;
 use common\models\wechat\FansTags;
@@ -24,6 +23,7 @@ class MenuController extends WController
      * @throws \EasyWeChat\Kernel\Exceptions\HttpException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
+     * @throws \EasyWeChat\Kernel\Exceptions\RuntimeException
      * @throws \Psr\SimpleCache\InvalidArgumentException
      * @throws \yii\web\UnprocessableEntityHttpException
      */
@@ -38,7 +38,7 @@ public function actionIndex()
             ->all();
 
         // 查询下菜单
-        !$models && Yii::$app->debris->getWechatError($this->app->menu->current());
+        !$models && Yii::$app->debris->getWechatError(Yii::$app->wechat->app->menu->current());
 
         return $this->render('index', [
             'pages' => $pages,
@@ -55,6 +55,7 @@ public function actionIndex()
      * @throws \EasyWeChat\Kernel\Exceptions\HttpException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
+     * @throws \EasyWeChat\Kernel\Exceptions\RuntimeException
      * @throws \Psr\SimpleCache\InvalidArgumentException
      * @throws \yii\web\UnprocessableEntityHttpException
      */
@@ -123,7 +124,7 @@ public function actionEdit()
                 ];
 
                 // 创建自定义菜单
-                $menuResult = $this->app->menu->create($buttons, $matchRule);
+                $menuResult = Yii::$app->wechat->app->menu->create($buttons, $matchRule);
                 if ($error = Yii::$app->debris->getWechatError($menuResult, false))
                 {
                     return ResultDataHelper::json(422, $error);
@@ -136,7 +137,7 @@ public function actionEdit()
             }
 
             // 验证微信报错
-            if ($error = Yii::$app->debris->getWechatError($this->app->menu->create($buttons), false))
+            if ($error = Yii::$app->debris->getWechatError(Yii::$app->wechat->app->menu->create($buttons), false))
             {
                 return ResultDataHelper::json(422, $error);
             }
@@ -173,7 +174,7 @@ public function actionDelete($id, $type)
         if ($model->delete())
         {
             // 个性化菜单删除
-            !empty($model['menu_id']) && $this->app->menu->delete($model['menu_id']);
+            !empty($model['menu_id']) && Yii::$app->wechat->app->menu->delete($model['menu_id']);
             return $this->message("删除成功", $this->redirect(['index', 'type' => $type]));
         }
 
@@ -188,6 +189,7 @@ public function actionDelete($id, $type)
      * @throws \EasyWeChat\Kernel\Exceptions\HttpException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
+     * @throws \EasyWeChat\Kernel\Exceptions\RuntimeException
      * @throws \Psr\SimpleCache\InvalidArgumentException
      * @throws \yii\web\UnprocessableEntityHttpException
      */
@@ -199,7 +201,7 @@ public function actionSave($id)
             $model->save();
 
             // 创建微信菜单
-            $createReturn = $this->app->menu->create(unserialize($model->menu_data));
+            $createReturn = Yii::$app->wechat->app->menu->create(unserialize($model->menu_data));
             // 解析微信接口是否报错
             if ($error = Yii::$app->debris->getWechatError($createReturn, false))
             {
@@ -217,20 +219,21 @@ public function actionSave($id)
      * @throws \EasyWeChat\Kernel\Exceptions\HttpException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
+     * @throws \EasyWeChat\Kernel\Exceptions\RuntimeException
      * @throws \Psr\SimpleCache\InvalidArgumentException
      * @throws \yii\web\UnprocessableEntityHttpException
      */
     public function actionSync()
     {
         // 获取菜单列表
-        $list = $this->app->menu->list();
+        $list = Yii::$app->wechat->app->menu->list();
         // 解析微信接口是否报错
         if ($error = Yii::$app->debris->getWechatError($list, false))
         {
             return ResultDataHelper::json(404, $error);
         }
 
-        // 开始获取同步
+        // 开始获取自定义菜单同步
         if (!empty($list['menu']))
         {
             $model = new Menu;
diff --git a/backend/modules/wechat/controllers/QrcodeController.php b/backend/modules/wechat/controllers/QrcodeController.php
index edc647391..58c9b7edb 100644
--- a/backend/modules/wechat/controllers/QrcodeController.php
+++ b/backend/modules/wechat/controllers/QrcodeController.php
@@ -46,7 +46,7 @@ public function actionAdd()
 
         if ($model->load(Yii::$app->request->post()) && $model->validate())
         {
-            $qrcode = $this->app->qrcode;
+            $qrcode = Yii::$app->wechat->app->qrcode;
             try
             {
                 if ($model->model == Qrcode::MODEL_TEM)
@@ -68,7 +68,7 @@ public function actionAdd()
             }
             catch (\Exception $e)
             {
-                return $this->message($e->getMessage(), $this->redirect(['index']), 'error', 0, false);
+                return $this->message($e->getMessage(), $this->redirect(['index']), 'error');
             }
 
             return $this->redirect(['index']);
@@ -152,7 +152,7 @@ public function actionDown()
     {
         $id = Yii::$app->request->get('id');
         $model = Qrcode::findOne($id);
-        $url = $this->app->qrcode->url($model['ticket']);
+        $url = Yii::$app->wechat->app->qrcode->url($model['ticket']);
 
         header("Cache-control:private");
         header('content-type:image/jpeg');
@@ -167,6 +167,7 @@ public function actionDown()
      * @throws \EasyWeChat\Kernel\Exceptions\HttpException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
+     * @throws \EasyWeChat\Kernel\Exceptions\RuntimeException
      * @throws \Psr\SimpleCache\InvalidArgumentException
      * @throws \yii\web\UnprocessableEntityHttpException
      */
@@ -177,7 +178,7 @@ public function actionLongUrl()
             $postUrl = Yii::$app->request->post('shortUrl', '');
 
             // 长链接转短链接
-            $shortUrl = $this->app->url->shorten($postUrl);
+            $shortUrl = Yii::$app->wechat->app->url->shorten($postUrl);
             if ($error = Yii::$app->debris->getWechatError($shortUrl, false))
             {
                 return ResultDataHelper::json(422, $error);
diff --git a/backend/modules/wechat/controllers/RuleController.php b/backend/modules/wechat/controllers/RuleController.php
index 177209e89..5834dc1f4 100644
--- a/backend/modules/wechat/controllers/RuleController.php
+++ b/backend/modules/wechat/controllers/RuleController.php
@@ -34,7 +34,6 @@ public function actionIndex()
 
         $data = Rule::find()
             ->where(['>=', 'status', StatusEnum::DISABLED])
-            ->with('ruleKeyword')
             ->andWhere(['in', 'module', array_keys(Rule::$moduleExplain)])
             ->andFilterWhere(['module' => $module])
             ->andFilterWhere(['like', 'name', $keyword]);
@@ -42,6 +41,7 @@ public function actionIndex()
         $pages = new Pagination(['totalCount' => $data->count(), 'pageSize' => $this->pageSize]);
         $models = $data->offset($pages->offset)
             ->orderBy('sort asc,created_at desc')
+            ->with('ruleKeyword')
             ->limit($pages->limit)
             ->all();
 
diff --git a/backend/modules/wechat/views/attachment/image.php b/backend/modules/wechat/views/attachment/image.php
index dd38810bc..ba62e02fa 100644
--- a/backend/modules/wechat/views/attachment/image.php
+++ b/backend/modules/wechat/views/attachment/image.php
@@ -18,7 +18,7 @@
         <div class="inlineBlockContainer col3 vAlignTop">
             <?php foreach ($models as $model){ ?>
                 <div class="normalPaddingRight" style="width:20%;">
-                    <div class="borderColorGray separateChildrenWithLine whiteBG" style="margin-bottom: 20px;">
+                    <div class="borderColorGray separateChildrenWithLine whiteBG m-b-sm">
                         <div class="normalPadding">
                             <div style="background-image: url(<?= Url::to(['analysis/image','attach' => $model['media_url']]) ?>); height: 160px" class="backgroundCover relativePosition mainPostCover">
                                 <div class="bottomBar"><?= $model['file_name'] ?></div>
diff --git a/backend/modules/wechat/views/attachment/news.php b/backend/modules/wechat/views/attachment/news.php
index 159d0b4dd..3f513b077 100644
--- a/backend/modules/wechat/views/attachment/news.php
+++ b/backend/modules/wechat/views/attachment/news.php
@@ -20,7 +20,7 @@
             <div class="inlineBlockContainer col5 vAlignTop separateChildren">
                 <?php foreach ($models as $item){ ?>
                     <div class="normalPaddingRight" style="position:absolute">
-                        <div class="borderColorGray separateChildrenWithLine whiteBG" style="margin-bottom: 30px;">
+                        <div class="borderColorGray separateChildrenWithLine whiteBG m-b-sm">
                             <?php foreach ($item['news'] as $index => $news){ ?>
                                 <div class="normalPadding relativePosition postItem">
                                     <?php if($index == 0){ ?>
diff --git a/backend/modules/wechat/views/attachment/video.php b/backend/modules/wechat/views/attachment/video.php
index 59a616414..bb257b09b 100644
--- a/backend/modules/wechat/views/attachment/video.php
+++ b/backend/modules/wechat/views/attachment/video.php
@@ -18,7 +18,7 @@
         <div class="inlineBlockContainer col3 vAlignTop">
             <?php foreach ($models as $model){ ?>
                 <div class="normalPaddingRight" style="width:20%;">
-                    <div class="borderColorGray separateChildrenWithLine whiteBG" style="margin-bottom: 20px;">
+                    <div class="borderColorGray separateChildrenWithLine whiteBG m-b-sm">
                         <div class="normalPadding">
                             <div style="height: 160px;text-align:center;" class="backgroundCover relativePosition mainPostCover">
                                 <i class="fa fa-play-circle-o" style="font-size: 50px;margin:0 auto;padding-top: 30px"></i>
diff --git a/backend/modules/wechat/views/attachment/voice.php b/backend/modules/wechat/views/attachment/voice.php
index 187a950b2..541bb7857 100644
--- a/backend/modules/wechat/views/attachment/voice.php
+++ b/backend/modules/wechat/views/attachment/voice.php
@@ -18,7 +18,7 @@
         <div class="inlineBlockContainer col3 vAlignTop">
             <?php foreach ($models as $model){ ?>
                 <div class="normalPaddingRight" style="width:20%;">
-                    <div class="borderColorGray separateChildrenWithLine whiteBG" style="margin-bottom: 20px;">
+                    <div class="borderColorGray separateChildrenWithLine whiteBG m-b-sm">
                         <div class="normalPadding">
                             <div style="height: 160px;text-align:center;" class="backgroundCover relativePosition mainPostCover">
                                 <i class="fa fa-music" style="font-size: 40px;margin:0 auto;padding-top: 40px"></i>
diff --git a/backend/modules/wechat/views/fans/index.php b/backend/modules/wechat/views/fans/index.php
index 0c7b90e67..effbf8348 100644
--- a/backend/modules/wechat/views/fans/index.php
+++ b/backend/modules/wechat/views/fans/index.php
@@ -28,7 +28,7 @@
                 <div class="tab-content">
                     <div class="tab-pane active">
                         <div class="panel-body">
-                            <div class="col-sm-6">
+                            <div class="col-sm-6 m-l-n-sm">
                                 <!-- 权限校验判断 -->
                                 <?php if(AuthHelper::verify('/wechat/fans/sync')){ ?>
                                     <span class="btn btn-white" id="sync"> 同步选中粉丝信息</span>
diff --git a/backend/modules/wechat/views/fans/send-message.php b/backend/modules/wechat/views/fans/send-message.php
index cf107524d..99ce898f5 100644
--- a/backend/modules/wechat/views/fans/send-message.php
+++ b/backend/modules/wechat/views/fans/send-message.php
@@ -20,7 +20,7 @@
             <tbody>
             <tr>
                 <td class="feed-element">
-                    <img src="<?= $model->head_portrait ?>" class="img-circle img-bordered-sm rf-img-lg">
+                    <img src="<?= $model->head_portrait ?>" class="img-circle img-bordered-sm" width="48" height="48">
                 </td>
                 <td><?= $model['nickname']?></td>
             </tr>
@@ -28,10 +28,6 @@
                 <td>粉丝编号</td>
                 <td><?= $model['openid']?></td>
             </tr>
-            <tr>
-                <td>性别</td>
-                <td><?= $model->sex == 1 ? '男' : '女' ?></td>
-            </tr>
             </tbody>
         </table>
     </div>
@@ -56,7 +52,7 @@
                     </div>
                     <div id="tab-2" class="tab-pane">
                         <div class="panel-body">
-                            <?= \backend\widgets\wechatselectattachment\Select::widget([
+                            <?= \backend\widgets\selector\Select::widget([
                                 'name' => 'images',
                                 'value' => '',
                                 'type' => 'image',
@@ -66,7 +62,7 @@
                     </div>
                     <div id="tab-3" class="tab-pane">
                         <div class="panel-body">
-                            <?= \backend\widgets\wechatselectattachment\Select::widget([
+                            <?= \backend\widgets\selector\Select::widget([
                                 'name' => 'news',
                                 'value' => '',
                                 'type' => 'news',
@@ -85,12 +81,12 @@
                             </div>
                             <div class="form-group required">
                                 <label class="control-label" for="manager-mobile">视频说明</label>
-                                <?= Html::textarea('description', '',[
+                                <?= Html::input('text', 'description', '', [
                                     'class' => 'form-control',
                                     'id' => 'description',
                                 ])?>
                             </div>
-                            <?= \backend\widgets\wechatselectattachment\Select::widget([
+                            <?= \backend\widgets\selector\Select::widget([
                                 'name' => 'video',
                                 'value' => '',
                                 'type' => 'video',
@@ -100,7 +96,7 @@
                     </div>
                     <div id="tab-5" class="tab-pane">
                         <div class="panel-body">
-                            <?= \backend\widgets\wechatselectattachment\Select::widget([
+                            <?= \backend\widgets\selector\Select::widget([
                                 'name' => 'voice',
                                 'value' => '',
                                 'type' => 'voice',
@@ -154,12 +150,12 @@ function beforSubmit() {
         if (type == 4) {
 
             if (!$('#title').val()){
-                rfWarning('请选择标题');
+                rfWarning('请填写标题');
                 return false;
             }
 
             if (!$('#description').val()){
-                rfWarning('请填写内容');
+                rfWarning('请填写视频说明');
                 return false;
             }
 
diff --git a/backend/modules/wechat/views/fans/view.php b/backend/modules/wechat/views/fans/view.php
index 8b0d2fe8e..e1b2cce28 100644
--- a/backend/modules/wechat/views/fans/view.php
+++ b/backend/modules/wechat/views/fans/view.php
@@ -11,8 +11,8 @@
     <table class="table text-center">
         <tbody>
         <tr>
-            <td class="feed-element">
-                <img src="<?= $model->head_portrait ?>" class="img-circle img-bordered-sm rf-img-lg">
+            <td class="feed-element" >
+                <img src="<?= $model->head_portrait ?>" class="img-circle img-bordered-sm" width="48" height="48">
             </td>
             <td><?= $model['nickname']?></td>
         </tr>
diff --git a/backend/modules/wechat/views/mass-record/image.php b/backend/modules/wechat/views/mass-record/image.php
index 094be7934..ee1a985e3 100644
--- a/backend/modules/wechat/views/mass-record/image.php
+++ b/backend/modules/wechat/views/mass-record/image.php
@@ -1,4 +1,4 @@
-<?= \backend\widgets\wechatselectattachment\Select::widget([
+<?= \backend\widgets\selector\Select::widget([
     'name' => 'SendForm[media_id]',
     'value' => $model->media_id,
     'type' => 'image',
diff --git a/backend/modules/wechat/views/mass-record/index.php b/backend/modules/wechat/views/mass-record/index.php
index 132b419c3..500d3b5a5 100644
--- a/backend/modules/wechat/views/mass-record/index.php
+++ b/backend/modules/wechat/views/mass-record/index.php
@@ -82,7 +82,7 @@
 
 <script type="text/html"  id="editModel">
     <?php foreach($mediaType as $key => $item){ ?>
-        <div class="col-lg-12 text-center" style="padding: 10px">
+        <div class="col-lg-12 text-center p-xs">
             <a href="<?= Url::to(['edit', 'media_type' => $key]); ?>" class="btn btn-w-m btn-info"><?= $item; ?></a>
         </div>
     <?php } ?>
diff --git a/backend/modules/wechat/views/mass-record/news.php b/backend/modules/wechat/views/mass-record/news.php
index d7442fc38..f76b02654 100644
--- a/backend/modules/wechat/views/mass-record/news.php
+++ b/backend/modules/wechat/views/mass-record/news.php
@@ -1,4 +1,4 @@
-<?= \backend\widgets\wechatselectattachment\Select::widget([
+<?= \backend\widgets\selector\Select::widget([
     'name' => 'SendForm[attachment_id]',
     'value' => $model->attachment_id,
     'type' => 'news',
diff --git a/backend/modules/wechat/views/mass-record/video.php b/backend/modules/wechat/views/mass-record/video.php
index 8e15e9be2..65971b43b 100644
--- a/backend/modules/wechat/views/mass-record/video.php
+++ b/backend/modules/wechat/views/mass-record/video.php
@@ -1,4 +1,4 @@
-<?= \backend\widgets\wechatselectattachment\Select::widget([
+<?= \backend\widgets\selector\Select::widget([
     'name' => 'SendForm[media_id]',
     'value' => $model->media_id,
     'type' => 'video',
diff --git a/backend/modules/wechat/views/mass-record/voice.php b/backend/modules/wechat/views/mass-record/voice.php
index b98820521..499cefccc 100644
--- a/backend/modules/wechat/views/mass-record/voice.php
+++ b/backend/modules/wechat/views/mass-record/voice.php
@@ -1,4 +1,4 @@
-<?= \backend\widgets\wechatselectattachment\Select::widget([
+<?= \backend\widgets\selector\Select::widget([
     'name' => 'SendForm[media_id]',
     'value' => $model->media_id,
     'type' => 'voice',
diff --git a/backend/modules/wechat/views/menu/edit.php b/backend/modules/wechat/views/menu/edit.php
index d94e1adf5..70c928214 100644
--- a/backend/modules/wechat/views/menu/edit.php
+++ b/backend/modules/wechat/views/menu/edit.php
@@ -84,7 +84,7 @@
                                 ])->label('系统') ?>
                             </div>
                             <div class="col-sm-3">
-                                <?= $form->field($model, 'language')->dropDownList(Yii::$app->params['individuationMenuLanguage'],[
+                                <?= $form->field($model, 'language')->dropDownList(Yii::$app->params['individuationMenuLanguage'], [
                                     'disabled' => $model->isNewRecord ? false : true
                                 ])->label('语言') ?>
                             </div>
diff --git a/backend/modules/wechat/views/rule/edit.php b/backend/modules/wechat/views/rule/edit.php
index edaa943e8..5b6b6b701 100644
--- a/backend/modules/wechat/views/rule/edit.php
+++ b/backend/modules/wechat/views/rule/edit.php
@@ -23,7 +23,7 @@
                                 <?= $form->field($model, 'sort')->textInput()->hint('规则优先级，越大则越靠前，最大不得超过255') ?>
                             </div>
                         </div>
-                        <div class="col-sm-3 col-md-2" style="padding-top: 14px;">
+                        <div class="col-sm-3 col-md-2 m-t-md">
                             <div class="checkbox m-2 m-r-xs">
                                 <label><input type="checkbox" id="setting" class="adv"> 高级设置</label>
                             </div>
@@ -142,7 +142,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="col-sm-3 col-md-2" style="padding-top: 14px;">
+                        <div class="col-sm-3 col-md-2 m-t-md">
                             <div class="checkbox m-2 m-r-xs">
                                 <label><input type="checkbox" id="trigger" class="adv"> 高级触发</label>
                             </div>
@@ -166,7 +166,6 @@
 </div>
 <?php ActiveForm::end(); ?>
 
-
 <!--关键字模板-->
 <script id="keylist" type="text/html">
     <tr>
@@ -197,6 +196,7 @@
 
 <script>
     $(document).ready(function(){
+        // 单击展开
         $('.adv').click(function () {
             var id = $(this).attr('id');
             if($(this).is(':checked')) {
@@ -207,7 +207,12 @@
             }
         });
 
-        // 添加
+        // 展开高级触发
+        if ($('#list-key-2').html().length > 121 || $('#list-key-3').html().length > 121 || $('#list-key-4').html().length > 121){
+            $('#trigger').trigger('click');
+        }
+
+        // 添加关键字
         var take = "<?= RuleKeyword::TYPE_TAKE?>";
         $('.addKeyword').click(function(){
             var self = $(this);
diff --git a/backend/modules/wechat/views/rule/images.php b/backend/modules/wechat/views/rule/images.php
index 32e45c1a1..49a5e904f 100644
--- a/backend/modules/wechat/views/rule/images.php
+++ b/backend/modules/wechat/views/rule/images.php
@@ -9,7 +9,7 @@
     </div>
     <div class="box-body">
         <div class="col-lg-12">
-            <?= \backend\widgets\wechatselectattachment\Select::widget([
+            <?= \backend\widgets\selector\Select::widget([
                 'name' => 'ReplyImages[media_id]',
                 'value' => $moduleModel->media_id,
                 'type' => 'image',
diff --git a/backend/modules/wechat/views/rule/index.php b/backend/modules/wechat/views/rule/index.php
index d03f8e13d..3f9b8a81e 100644
--- a/backend/modules/wechat/views/rule/index.php
+++ b/backend/modules/wechat/views/rule/index.php
@@ -1,26 +1,26 @@
 <?php
 use yii\helpers\Url;
 use yii\widgets\LinkPager;
+use yii\widgets\ActiveForm;
+use yii\helpers\Html;
 use common\helpers\AuthHelper;
 use common\models\wechat\RuleKeyword;
 use common\enums\StatusEnum;
-use yii\widgets\ActiveForm;
-use yii\helpers\Html;
 use common\helpers\HtmlHelper;
 
 $this->title = '自动回复';
-$this->params['breadcrumbs'][] = ['label' =>  $this->title];
+$this->params['breadcrumbs'][] = ['label' => $this->title];
 ?>
 
 <div class="row">
     <div class="col-sm-12">
         <div class="nav-tabs-custom">
             <ul class="nav nav-tabs">
-                <li class="active"><a href="<?= Url::to(['rule/index'])?>"> 关键字自动回复</a></li>
-                <li><a href="<?= Url::to(['setting/special-message'])?>"> 非文字自动回复</a></li>
-                <li><a href="<?= Url::to(['reply-default/index'])?>"> 关注/默认回复</a></li>
+                <li class="active"><a href="<?= Url::to(['rule/index']); ?>"> 关键字自动回复</a></li>
+                <li><a href="<?= Url::to(['setting/special-message']); ?>"> 非文字自动回复</a></li>
+                <li><a href="<?= Url::to(['reply-default/index']); ?>"> 关注/默认回复</a></li>
                 <!-- 权限校验判断 -->
-                <?php if(AuthHelper::verify('/wechat/rule/edit')){?>
+                <?php if (AuthHelper::verify('/wechat/rule/edit')) {?>
                     <li class="pull-right">
                         <a class="btn btn-primary btn-xs" onclick="openEdit()">
                             <i class="fa fa-plus"></i> 创建
@@ -33,7 +33,7 @@
                     <div class="row">
                         <div class="col-lg-8">
                             <div class="btn-group">
-                                <a class="btn <?= !$module ? 'btn-primary': 'btn-white' ;?>" href="<?= Url::to(['index'])?>">全部</a>
+                                <a class="btn <?= !$module ? 'btn-primary': 'btn-white'; ?>" href="<?= Url::to(['index']); ?>">全部</a>
                                 <?php foreach ($modules as $key => $mo){ ?>
                                     <a class="btn <?= $module == $key ? 'btn-primary': 'btn-white' ;?>" href="<?= Url::to(['index','module'=>$key])?>"><?= $mo?></a>
                                 <?php } ?>
@@ -65,9 +65,9 @@
                                         <span class="label label-info">直接接管</span>
                                     <?php } ?>
                                     <?php if($model->status == StatusEnum::ENABLED){ ?>
-                                        <span class="label label-info" onclick="statusRule(this)">已启用</span>
+                                        <span class="label label-info pointer" onclick="statusRule(this)">已启用</span>
                                     <?php }else{ ?>
-                                        <span class="label label-danger" onclick="statusRule(this)">已禁用</span>
+                                        <span class="label label-danger pointer" onclick="statusRule(this)">已禁用</span>
                                     <?php } ?>
                                 </span>
                             </div>
@@ -84,8 +84,10 @@
                                     </div>
                                     <div class="col-lg-3">
                                         <div class="btn-group pull-right">
-                                            <?= HtmlHelper::linkButton(['edit', 'id' => $model->id, 'module' => $model->module], '<i class="fa fa-edit"></i>编辑')?>
-                                            <?= HtmlHelper::delete(['delete', 'id' => $model->id], '<i class="fa fa-times"></i>删除')?>
+                                            <?= HtmlHelper::linkButton(['edit', 'id' => $model->id, 'module' => $model->module], '<i class="fa fa-edit"></i> 编辑')?>
+                                            <?= HtmlHelper::delete(['delete', 'id' => $model->id], '<i class="fa fa-times"></i> 删除', [
+                                                    'class' => 'btn btn-white btn-sm'
+                                            ])?>
                                             <!-- <a class="btn btn-white btn-sm" href="#"><i class="fa fa-bar-chart-o"></i> 使用率走势</a>-->
                                         </div>
                                     </div>
@@ -108,7 +110,7 @@
 
 <script type="text/html"  id="editModel">
     <?php foreach($modules as $key => $module){ ?>
-        <div class="col-lg-12 text-center" style="padding: 10px">
+        <div class="col-lg-12 text-center p-xs">
             <a href="<?= Url::to(['edit', 'module' => $key]); ?>" class="btn btn-w-m btn-info"><?= $module; ?></a>
         </div>
     <?php } ?>
diff --git a/backend/modules/wechat/views/rule/news.php b/backend/modules/wechat/views/rule/news.php
index 411f68515..907ec0729 100644
--- a/backend/modules/wechat/views/rule/news.php
+++ b/backend/modules/wechat/views/rule/news.php
@@ -9,7 +9,7 @@
     </div>
     <div class="box-body">
         <div class="col-lg-12">
-            <?= \backend\widgets\wechatselectattachment\Select::widget([
+            <?= \backend\widgets\selector\Select::widget([
                 'type' => 'news',
                 'label' => '图文',
                 'block' => '由于微信限制，自动回复只能回复一条图文信息，如果有多条图文，默认选择第一条图文',
diff --git a/backend/modules/wechat/views/rule/video.php b/backend/modules/wechat/views/rule/video.php
index ff37e3da3..d72e8f087 100644
--- a/backend/modules/wechat/views/rule/video.php
+++ b/backend/modules/wechat/views/rule/video.php
@@ -5,7 +5,7 @@
     <div class="box-body">
         <div class="col-sm-12">
             <?= $form->field($moduleModel, 'title')->textInput() ?>
-            <?= \backend\widgets\wechatselectattachment\Select::widget([
+            <?= \backend\widgets\selector\Select::widget([
                 'name' => 'ReplyVideo[media_id]',
                 'value' => $moduleModel->media_id,
                 'type' => 'video',
diff --git a/backend/modules/wechat/views/rule/voice.php b/backend/modules/wechat/views/rule/voice.php
index 7902d0a08..bd040dcac 100644
--- a/backend/modules/wechat/views/rule/voice.php
+++ b/backend/modules/wechat/views/rule/voice.php
@@ -4,7 +4,7 @@
     </div>
     <div class="box-body">
         <div class="col-lg-12">
-            <?= \backend\widgets\wechatselectattachment\Select::widget([
+            <?= \backend\widgets\selector\Select::widget([
                 'name' => 'ReplyVoice[media_id]',
                 'value' => $moduleModel->media_id,
                 'type' => 'voice',
diff --git a/backend/modules/wechat/views/setting/special-message.php b/backend/modules/wechat/views/setting/special-message.php
index 326acf63e..3950f7956 100644
--- a/backend/modules/wechat/views/setting/special-message.php
+++ b/backend/modules/wechat/views/setting/special-message.php
@@ -10,9 +10,9 @@
     <div class="col-sm-12">
         <div class="nav-tabs-custom">
             <ul class="nav nav-tabs">
-                <li><a href="<?= Url::to(['rule/index'])?>"> 关键字自动回复</a></li>
-                <li class="active"><a href="<?= Url::to(['setting/special-message'])?>"> 非文字自动回复</a></li>
-                <li><a href="<?= Url::to(['reply-default/index'])?>"> 关注/默认回复</a></li>
+                <li><a href="<?= Url::to(['rule/index']); ?>"> 关键字自动回复</a></li>
+                <li class="active"><a href="<?= Url::to(['setting/special-message']); ?>"> 非文字自动回复</a></li>
+                <li><a href="<?= Url::to(['reply-default/index']); ?>"> 关注/默认回复</a></li>
             </ul>
             <div class="tab-content">
                 <div class="active tab-pane rf-auto">
diff --git a/backend/views/addons/cover.php b/backend/views/addons/cover.php
index 0591a9fcf..e572f75e0 100644
--- a/backend/views/addons/cover.php
+++ b/backend/views/addons/cover.php
@@ -1,5 +1,6 @@
 <?php
 use yii\helpers\Url;
+use yii\helpers\Html;
 use common\helpers\AddonUrl;
 use \common\helpers\StringHelper;
 
@@ -10,34 +11,32 @@
 $addon = StringHelper::toUnderScore($addon);
 ?>
 
+<!--jq二维码生成-->
+<?= Html::jsFile('@web/resources/plugins/jquery-qrcode/jquery.qrcode.min.js'); ?>
+
 <div class="row">
     <div class="col-sm-12">
         <div class="nav-tabs-custom">
             <ul class="nav nav-tabs">
-                <li class="active">
-                    <a data-toggle="tab" href="#tab-1" aria-expanded="true"> 微信入口</a>
-                </li>
-                <li class="">
-                    <a data-toggle="tab" href="#tab-2" aria-expanded="false">前台入口</a>
-                </li>
-                <li class="">
-                    <a data-toggle="tab" href="#tab-3" aria-expanded="false">api入口</a>
-                </li>
+                <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">微信入口</a></li>
+                <li><a data-toggle="tab" href="#tab-2" aria-expanded="false">前台入口</a></li>
+                <li><a data-toggle="tab" href="#tab-3" aria-expanded="false">api入口</a></li>
             </ul>
             <div class="tab-content rf-auto">
                 <div class="active tab-pane" id="tab-1">
                     <?php foreach (Yii::$app->params['addonBinding']['cover'] as $value){ ?>
                         <div class="col-sm-12">
                             <div class="form-group">
-                                <label class="control-label" for="menu-title"><?= $value['title'] ?></label>
+                                <label class="control-label" for="menu-title"><?= $value['title']; ?></label>
                                 <input class="form-control" type="text" value="<?= AddonUrl::toWechat([$value['route'], 'addon' => $addon, 'route' => $value['route']]) ?>" readonly>
                             </div>
                             <div class="form-group">
                                 <label class="control-label" for="menu-title">二维码</label><br>
-                                <div class="row" style="padding-left: 15px">
-                                    <img src="<?= Url::to(['qr-code', 'addon' => $addon,'url'=> AddonUrl::toWechat([$value['route'], 'addon' => $addon])])?>" class="rf-qr-p">
+                                <div class="row m-l-none">
+                                    <div data-src="<?= AddonUrl::toWechat([$value['route'], 'addon' => $addon]); ?>" class="rf-qr-p"></div>
                                 </div>
                             </div>
+                            <div class="hr-line-dashed"></div>
                         </div>
                     <?php } ?>
                 </div>
@@ -45,15 +44,16 @@
                     <?php foreach (Yii::$app->params['addonBinding']['cover'] as $value){ ?>
                         <div class="col-sm-12">
                             <div class="form-group">
-                                <label class="control-label" for="menu-title"><?= $value['title'] ?></label>
+                                <label class="control-label" for="menu-title"><?= $value['title']; ?></label>
                                 <input class="form-control" type="text" value="<?= AddonUrl::toFront([$value['route'], 'addon' => $addon, 'route' => $value['route']]) ?>" readonly>
                             </div>
                             <div class="form-group">
                                 <label class="control-label" for="menu-title">二维码</label><br>
-                                <div class="row" style="padding-left: 15px">
-                                    <img src="<?= Url::to(['qr-code', 'addon' => $addon, 'route' => $value['route'],'url'=> AddonUrl::toFront([$value['route'], 'addon' => $addon])])?>" class="rf-qr-p">
+                                <div class="row m-l-none">
+                                    <div data-src="<?= AddonUrl::toFront([$value['route'], 'addon' => $addon]); ?>" class="rf-qr-p"></div>
                                 </div>
                             </div>
+                            <div class="hr-line-dashed"></div>
                         </div>
                     <?php } ?>
                 </div>
@@ -61,19 +61,32 @@
                     <?php foreach (Yii::$app->params['addonBinding']['cover'] as $value){ ?>
                         <div class="col-sm-12">
                             <div class="form-group">
-                                <label class="control-label" for="menu-title"><?= $value['title'] ?></label>
+                                <label class="control-label" for="menu-title"><?= $value['title']; ?></label>
                                 <input class="form-control" type="text" value="<?= AddonUrl::toApi([$value['route'], 'addon' => $addon, 'route' => $value['route']]) ?>" readonly>
                             </div>
                             <div class="form-group">
                                 <label class="control-label" for="menu-title">二维码</label><br>
-                                <div class="row" style="padding-left: 15px">
-                                    <img src="<?= Url::to(['qr-code', 'addon' => $addon, 'route' => $value['route'], 'url' => AddonUrl::toApi([$value['route'], 'addon' => $addon])])?>" class="rf-qr-p">
+                                <div class="row m-l-none">
+                                    <div data-src="<?= AddonUrl::toApi([$value['route'], 'addon' => $addon]); ?>" class="rf-qr-p"></div>
                                 </div>
                             </div>
+                            <div class="hr-line-dashed"></div>
                         </div>
                     <?php } ?>
                 </div>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+
+<script>
+    $(document).ready(function(){
+        $('.rf-qr-p').each(function (letter, rows) {
+            $(rows).qrcode({
+                text: $(rows).data('src'),
+                width: 150,
+                height: 150,
+            });
+        })
+    });
+</script>
\ No newline at end of file
diff --git a/backend/views/addons/rule-edit.php b/backend/views/addons/rule-edit.php
index 284827aeb..7fe93bfa6 100644
--- a/backend/views/addons/rule-edit.php
+++ b/backend/views/addons/rule-edit.php
@@ -25,7 +25,7 @@
                             </div>
                         </div>
                         <div class="col-sm-3 col-md-2">
-                            <div class="checkbox m-2 m-r-xs" style="padding-top: 14px">
+                            <div class="checkbox m-2 m-r-xs m-t-lg">
                                 <label><input type="checkbox" id="setting" class="adv"> 高级设置</label>
                             </div>
                         </div>
@@ -144,7 +144,7 @@
                             </div>
                         </div>
                         <div class="col-sm-3 col-md-2">
-                            <div class="checkbox m-2 m-r-xs" style="padding-top: 14px">
+                            <div class="checkbox m-2 m-r-xs m-t-lg">
                                 <label><input type="checkbox" id="trigger" class="adv"> 高级触发</label>
                             </div>
                         </div>
@@ -154,19 +154,19 @@
                             <?= $form->field($model, 'status')->radioList(['1' => '启用','0' => '禁用'])->hint('您可以临时禁用这条回复') ?>
                         </div>
                     </div>
+                    <div class="form-group">　
+                        <div class="col-sm-12 text-center">
+                            <button class="btn btn-primary" type="submit">保存</button>
+                            <span class="btn btn-white" onclick="history.go(-1)">返回</span>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
-<div class="form-group">　
-    <div class="col-sm-12 text-center">
-        <button class="btn btn-primary" type="submit">保存</button>
-        <span class="btn btn-white" onclick="history.go(-1)">返回</span>
-    </div>
-</div>
-<?php ActiveForm::end(); ?>
 
+<?php ActiveForm::end(); ?>
 
 <!--关键字模板-->
 <script id="keylist" type="text/html">
@@ -208,6 +208,11 @@
             }
         });
 
+        // 展开高级触发
+        if ($('#list-key-2').html().length > 121 || $('#list-key-3').html().length > 121 || $('#list-key-4').html().length > 121){
+            $('#trigger').trigger('click');
+        }
+
         // 添加
         var take = "<?= RuleKeyword::TYPE_TAKE?>";
         $('.addKeyword').click(function(){
diff --git a/backend/views/addons/rule.php b/backend/views/addons/rule.php
index 5ccb6203d..8aff45c71 100644
--- a/backend/views/addons/rule.php
+++ b/backend/views/addons/rule.php
@@ -3,7 +3,7 @@
 use yii\widgets\LinkPager;
 use common\models\wechat\RuleKeyword;
 use common\enums\StatusEnum;
-use common\helpers\HtmlHelper;
+use common\helpers\AddonHtmlHelper;
 
 $this->title = '规则管理';
 $this->params['breadcrumbs'][] = ['label' => $this->title];
@@ -15,7 +15,7 @@
             <div class="box-header">
                 <h3 class="box-title"><?= $this->title; ?></h3>
                 <div class="box-tools">
-                    <?= HtmlHelper::create(['rule-edit', 'addon' => Yii::$app->params['addon']['name']])?>
+                    <a class="btn btn-primary btn-xs" href="<?= Url::to(['rule-edit', 'addon' => Yii::$app->params['addon']['name']]); ?>"><i class="fa fa-plus"></i> 创建</a>
                 </div>
             </div>
             <div class="box-body table-responsive">
@@ -30,9 +30,9 @@
                                         <span class="label label-info">直接接管</span>
                                     <?php } ?>
                                     <?php if ($model->status == StatusEnum::ENABLED){ ?>
-                                        <span class="label label-info" onclick="statusRule(this)">已启用</span>
+                                        <span class="label label-info pointer" onclick="statusRule(this)">已启用</span>
                                     <?php }else{ ?>
-                                        <span class="label label-danger" onclick="statusRule(this)">已禁用</span>
+                                        <span class="label label-danger pointer" onclick="statusRule(this)">已禁用</span>
                                     <?php } ?>
                                  </span>
                             </div>
@@ -49,8 +49,10 @@
                                     </div>
                                     <div class="col-lg-3">
                                         <div class="btn-group pull-right">
-                                            <a class="btn btn-white btn-sm" href="<?= Url::to(['rule-edit','id' => $model->id, 'addon' => Yii::$app->params['addon']['name']])?>"><i class="fa fa-edit"></i> 编辑</a>
-                                            <a class="btn btn-white btn-sm" href="<?= Url::to(['rule-delete','id' => $model->id, 'addon' => Yii::$app->params['addon']['name']])?>" onclick="rfDelete(this);return false;"><i class="fa fa-times"></i> 删除</a>
+                                            <div class="btn-group pull-right">
+                                                <a class="btn btn-white btn-sm" href="<?= Url::to(['rule-edit', 'addon' => Yii::$app->params['addon']['name'], 'id' => $model->id]); ?>"><i class="fa fa-edit"></i> 编辑</a>
+                                                <a class="btn btn-white btn-sm" href="<?= Url::to(['rule-delete', 'addon' => Yii::$app->params['addon']['name'], 'id' => $model->id]); ?>" onclick="rfDelete(this);return false;"><i class="fa fa-times"></i> 删除</a>                                            <!-- <a class="btn btn-white btn-sm" href="#"><i class="fa fa-bar-chart-o"></i> 使用率走势</a>-->
+                                            </div>
                                             <!-- <a class="btn btn-white btn-sm" href="#"><i class="fa fa-bar-chart-o"></i> 使用率走势</a>-->
                                         </div>
                                     </div>
@@ -59,11 +61,11 @@
                         </div>
                     <?php } ?>
                 </div>
-            </div>
-            <div class="box-footer">
-                <?= LinkPager::widget([
-                    'pagination' => $pages
-                ]);?>
+                <div class="col-sm-12">
+                    <?= LinkPager::widget([
+                        'pagination' => $pages,
+                    ]);?>
+                </div>
             </div>
         </div>
     </div>
diff --git a/backend/views/layouts/addon.php b/backend/views/layouts/addon.php
index 3966db53b..84e9c6051 100644
--- a/backend/views/layouts/addon.php
+++ b/backend/views/layouts/addon.php
@@ -104,8 +104,8 @@
     <script>
         // 配置
         var config = {
-            tag: <?= Yii::$app->debris->config('sys_tags'); ?>,
-            isMobile: "<?= Yii::$app->params['isMobile']; ?>",
+            tag: <?= Yii::$app->debris->config('sys_tags') ?? false; ?>,
+            isMobile: "<?= Yii::$app->params['isMobile'] ?? false; ?>",
         };
 
         $(document).ready(function () {
diff --git a/backend/views/main/clear-cache.php b/backend/views/main/clear-cache.php
index 7028c1db7..0fa704932 100644
--- a/backend/views/main/clear-cache.php
+++ b/backend/views/main/clear-cache.php
@@ -8,7 +8,7 @@
     <?php if ($result == true) { ?>
         <div class="alert alert-success alert-dismissible">
             <h4><i class="icon fa fa-check"></i> 缓存清理成功</h4>
-            可手动关闭当前标签页
+            请手动关闭当前标签页
         </div>
     <?php }else{ ?>
         <div class="alert alert-danger alert-dismissible">
diff --git a/backend/views/main/index.php b/backend/views/main/index.php
index 3011811d6..3b6d321a4 100644
--- a/backend/views/main/index.php
+++ b/backend/views/main/index.php
@@ -37,7 +37,7 @@
                     <ul class="nav navbar-nav">
                         <li class="dropdown notifications-menu rfTopMenu">
                             <a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
-                                <span class="sr-only">Toggle navigation</span>
+                                <span class="sr-only">切换导航</span>
                                 <span class="icon-bar"></span>
                                 <span class="icon-bar"></span>
                                 <span class="icon-bar"></span>
@@ -46,7 +46,7 @@
                         <!-- Notifications: style can be found in dropdown.less -->
                         <?php foreach ($menuCates as $cate){ ?>
                             <?php if ($cate['status'] == StatusEnum::ENABLED && AuthHelper::verify('cate:' . $cate['id'])) { ?>
-                                <li class="dropdown notifications-menu rfTopMenu <?php if(Yii::$app->params['isMobile'] == true) echo 'hide'; ?> <?php if($cate['is_default_show'] == StatusEnum::ENABLED) echo 'rfTopMenuHover'; ?>" data-type="<?= $cate['id']; ?>">
+                                <li class="dropdown notifications-menu rfTopMenu hide <?php if($cate['is_default_show'] == StatusEnum::ENABLED) echo 'rfTopMenuHover'; ?>" data-type="<?= $cate['id']; ?>">
                                     <a class="dropdown-toggle">
                                         <i class="fa <?= $cate['icon']; ?>"></i> <?= $cate['title']; ?>
                                     </a>
@@ -54,7 +54,7 @@
                             <?php } ?>
                         <?php } ?>
                         <?php if (Yii::$app->debris->config('sys_addon_show') == StatusEnum::ENABLED && AuthHelper::verify('addons')) { ?>
-                            <li class="dropdown notifications-menu rfTopMenu <?php if(Yii::$app->params['isMobile'] == true) echo 'hide'; ?>" data-type="addons">
+                            <li class="dropdown notifications-menu rfTopMenu hide" data-type="addons">
                                 <a class="dropdown-toggle">
                                     <i class="fa fa-th-large"></i> 应用中心
                                 </a>
@@ -64,7 +64,7 @@
                 </div>
                 <div class="navbar-custom-menu">
                     <ul class="nav navbar-nav">
-                        <?php if (AuthHelper::verify('/sys/manager-notify/index')){ ?>
+                        <?php if (AuthHelper::verify('base-announce')){ ?>
                             <li class="dropdown notifications-menu">
                                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="true">
                                     <i class="fa fa-bell-o"></i>
@@ -86,9 +86,7 @@
                                         </ul>
                                     </li>
                                     <!-- 验证权限 -->
-                                    <?php if(AuthHelper::verify('base-announce') && AuthHelper::verify('/sys/manager-notify/announce')){ ?>
-                                        <li class="footer"><a href="<?= Url::to(['/sys/manager-notify/announce']); ?>" class="J_menuItem">查看消息</a></li>
-                                    <?php } ?>
+                                    <li class="footer"><a href="<?= Url::to(['/sys/manager-notify/announce']); ?>" class="J_menuItem" onclick="$('body').click();">查看消息</a></li>
                                 </ul>
                             </li>
                         <?php } ?>
@@ -128,7 +126,7 @@
                         <li>
                             <a href="#" data-toggle="control-sidebar"><i class="fa fa-gears"></i></a>
                         </li>
-                        <li id="logout" class="<?php if(Yii::$app->debris->config('sys_tags') == true) echo 'hide'; ?>">
+                        <li id="logout" class="hide">
                             <a href="<?= Url::to(['site/logout']); ?>" data-method="post"><i class="fa fa fa-sign-out"></i>退出</a>
                         </li>
                     </ul>
@@ -170,7 +168,7 @@
         </aside>
         <!-- 主体内容区域 -->
         <div class="content-wrapper" style="overflow: hidden; width: auto; height: 567px;">
-            <div class="content-tabs <?php if(Yii::$app->debris->config('sys_tags') == false) echo 'hide'; ?>">
+            <div class="content-tabs hide">
                 <button class="roll-nav roll-left J_tabLeft"><i class="fa fa-angle-double-left"></i></button>
                 <nav class="page-tabs J_menuTabs" id="rftags">
                     <div class="page-tabs-content">
@@ -200,9 +198,9 @@
             <div class="pull-right hidden-xs">
                 <?= Yii::$app->debris->config('web_copyright'); ?>
             </div>
-            当前版本：<?= Yii::$app->params['exploitVersions']; ?>
+            当前版本：<?= Yii::$app->version; ?>
         </footer>
-        <!-- Control Sidebar -->
+        <!-- 布局样式设置 -->
         <aside class="control-sidebar control-sidebar-dark">
             <div class="tab-content">
                 <!-- Home tab content -->
@@ -218,6 +216,16 @@
             tag: <?= Yii::$app->debris->config('sys_tags') ?? false; ?>,
             isMobile: "<?= Yii::$app->params['isMobile'] ?? false; ?>",
         };
+
+        if (config.isMobile == false){
+            $('.rfTopMenu').removeClass('hide');
+        }
+
+        if (config.tag == false){
+            $('.logout').removeClass('hide');
+        }else{
+            $('.content-tabs').removeClass('hide');
+        }
     </script>
     <?php $this->endBody() ?>
     </body>
diff --git a/backend/widgets/menu/views/addon-left.php b/backend/widgets/menu/views/addon-left.php
index d375b7988..a25175e99 100644
--- a/backend/widgets/menu/views/addon-left.php
+++ b/backend/widgets/menu/views/addon-left.php
@@ -8,7 +8,7 @@
 $addonName = StringHelper::toUnderScore($addonName);
 ?>
 
-<div class="box box-solid rfAddonMenu">
+<div class="box box-solid p-xs rfAddonMenu">
     <?php if($addon['is_setting'] == StatusEnum::ENABLED || $addon['is_cover'] == StatusEnum::ENABLED || $addon['is_rule'] == StatusEnum::ENABLED){ ?>
         <div class="box-header with-border">
             <h3 class="rf-box-title">核心设置</h3>
diff --git a/backend/widgets/wechatselectattachment/Select.php b/backend/widgets/selector/Select.php
similarity index 95%
rename from backend/widgets/wechatselectattachment/Select.php
rename to backend/widgets/selector/Select.php
index ab849b4c1..7cb32eb7a 100644
--- a/backend/widgets/wechatselectattachment/Select.php
+++ b/backend/widgets/selector/Select.php
@@ -1,14 +1,14 @@
 <?php
-namespace backend\widgets\wechatselectattachment;
+namespace backend\widgets\selector;
 
+use yii\widgets\InputWidget;
 use common\models\wechat\Attachment;
 use common\models\wechat\AttachmentNews;
-use yii\widgets\InputWidget;
 use common\helpers\StringHelper;
 
 /**
  * Class Select
- * @package backend\widgets\wechatselectattachment
+ * @package backend\widgets\selector
  * @author jianyan74 <751393839@qq.com>
  */
 class Select extends InputWidget
diff --git a/backend/widgets/wechatselectattachment/WechatSelectAttachment.php b/backend/widgets/selector/SelectorController.php
similarity index 79%
rename from backend/widgets/wechatselectattachment/WechatSelectAttachment.php
rename to backend/widgets/selector/SelectorController.php
index 0c64f4bf9..58b8a1ced 100644
--- a/backend/widgets/wechatselectattachment/WechatSelectAttachment.php
+++ b/backend/widgets/selector/SelectorController.php
@@ -1,7 +1,6 @@
 <?php
-namespace backend\widgets\wechatselectattachment;
+namespace backend\widgets\selector;
 
-use backend\widgets\wechatselectattachment\assets\AttachmentAsset;
 use Yii;
 use yii\data\Pagination;
 use yii\filters\AccessControl;
@@ -13,11 +12,13 @@
 use common\helpers\ResultDataHelper;
 
 /**
- * Class WechatSelectAttachment
- * @package backend\widgets\wechatselectattachment
+ * 微信资源选择器
+ *
+ * Class SelectorController
+ * @package backend\widgets\selector
  * @author jianyan74 <751393839@qq.com>
  */
-class WechatSelectAttachment extends Controller
+class SelectorController extends Controller
 {
     /**
      * 行为控制
@@ -42,37 +43,27 @@ public function behaviors()
     /**
      * 获取图片/视频/音频/图文
      *
-     * @param $media_type
-     * @return string
+     * @param bool $json 返回json格式
+     * @return array|string
      */
-    public function actionList()
+    public function actionList($json = false)
     {
         $keyword = Yii::$app->request->get('keyword');
         $media_type = Yii::$app->request->get('media_type');
         $models = $media_type == Attachment::TYPE_NEWS ? $this->news($keyword) : $this->attachment($media_type, $keyword);
 
-        // 资源注册
-        AttachmentAsset::register($this->view);
+        if ($json == true)
+        {
+            return ResultDataHelper::json(200, '获取成功', $models);
+        }
 
-        return $this->renderAjax('@backend/widgets/wechatselectattachment/views/list-model', [
+        return $this->renderAjax('@backend/widgets/selector/views/selector', [
             'models' => $models,
             'media_type' => $media_type,
             'boxId' => Yii::$app->request->get('boxId'),
         ]);
     }
 
-    /**
-     * @return array
-     */
-    public function actionAjaxList()
-    {
-        $keyword = Yii::$app->request->get('keyword');
-        $media_type = Yii::$app->request->get('media_type');
-        $models = $media_type == Attachment::TYPE_NEWS ? $this->news($keyword) : $this->attachment($media_type, $keyword);
-
-        return ResultDataHelper::json(200, '获取成功', $models);
-    }
-
     /**
      * 获取图片/视频/音频
      *
diff --git a/backend/widgets/selector/views/select.php b/backend/widgets/selector/views/select.php
new file mode 100644
index 000000000..6d23da634
--- /dev/null
+++ b/backend/widgets/selector/views/select.php
@@ -0,0 +1,20 @@
+<?php
+use yii\helpers\Url;
+use yii\helpers\Html;
+?>
+
+<div class="form-group required">
+    <label class="control-label"><?= $label; ?></label>
+    <div class="rule-photo-list" id="<?= $boxId; ?>">
+        <div class="img-box" data-toggle="modal" data-target="#ajaxModalMax" href="<?= Url::to(['/selector/list', 'boxId' => $boxId, 'media_type' => $type])?>">
+            <?php if ($type == 'news' || $type == 'image'){ ?>
+                <?= Html::img(!empty($model->media_url) ? Url::to(['analysis/image','attach' => $model->media_url]) : '@web/resources/dist/img/add-img.png')?>
+            <?php }else{ ?>
+                <i class="fa fa-file" style="font-size: 35px;margin:0 auto;padding-top: 40px"></i>
+            <?php } ?>
+            <div class="bottomBar"><?= !empty($model->file_name) ? $model->file_name : '点击选择'?></div>
+        </div>
+        <div class="hint-block"><?= $block ?></div>
+        <?= Html::hiddenInput($name, $value)?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/backend/widgets/wechatselectattachment/views/list-model.php b/backend/widgets/selector/views/selector.php
similarity index 90%
rename from backend/widgets/wechatselectattachment/views/list-model.php
rename to backend/widgets/selector/views/selector.php
index a1f628f9d..0d8ed778b 100644
--- a/backend/widgets/wechatselectattachment/views/list-model.php
+++ b/backend/widgets/selector/views/selector.php
@@ -3,12 +3,6 @@
 use yii\helpers\Url;
 ?>
 
-<style>
-    .normalPaddingRight .active {
-        border: 2px solid #1ab394 !important;
-    }
-</style>
-
 <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
     <h4 class="modal-title">文件列表</h4>
@@ -29,7 +23,7 @@
     <div class="inlineBlockContainer col3 vAlignTop" id="rfAttachmentList">
         <?php foreach ($models as $model){ ?>
             <div class="normalPaddingRight" style="width:20%;margin-top: 10px;">
-                <div class="borderColorGray separateChildrenWithLine whiteBG rfAttachmentActive" style="margin-bottom: 20px;" data-url="<?= $model['imgUrl']?>" data-key="<?= $model['key']?>" data-title="<?= $model['title']?>">
+                <div class="borderColorGray separateChildrenWithLine whiteBG rfWechatAttachmentActive" data-url="<?= $model['imgUrl']?>" data-key="<?= $model['key']?>" data-title="<?= $model['title']?>">
                     <div class="normalPadding">
                         <?php if ($model['type'] == 'image'){?>
                             <div style="background-image: url(<?= $model['imgUrl']?>); height: 160px;" class="backgroundCover relativePosition mainPostCover">
@@ -46,7 +40,7 @@
             </div>
         <?php } ?>
     </div>
-    <div class="row text-center" id="loadingAttachment">
+    <div class="row text-center m-t" id="loadingAttachment">
         <span onclick="rfGetWechatAttachment()" class="btn btn-white">加载更多</span>
     </div>
 </div>
@@ -59,8 +53,8 @@
 <script type="text/html" id="rfAttachmentlistModel">
     {{each data as value i}}
     <div class="normalPaddingRight" style="width:20%;margin-top: 10px;">
-        <div class="borderColorGray separateChildrenWithLine whiteBG rfAttachmentActive" style="margin-bottom: 20px;" data-title="{{value.title}}" data-key="{{value.key}}" data-url="{{value.imgUrl}}">
-            <div class="normalPadding rule-ajax-img">
+        <div class="borderColorGray separateChildrenWithLine whiteBG rfWechatAttachmentActive" data-title="{{value.title}}" data-key="{{value.key}}" data-url="{{value.imgUrl}}">
+            <div class="normalPadding">
                 {{if value.type == "image"}}
                 <div style="background-image: url({{value.imgUrl}}); height: 160px;" class="backgroundCover relativePosition mainPostCover">
                     <div class="bottomBar">{{value.title}}</div>
@@ -138,7 +132,7 @@ function rfAttachmentSearch() {
     function rfGetWechatAttachment() {
         $.ajax({
             type:"get",
-            url:"<?= Url::to(['/wechat-select-attachment/ajax-list'])?>",
+            url:"<?= Url::to(['/selector/list', 'json' => true])?>",
             dataType: "json",
             data: {
                 page:page,
diff --git a/backend/widgets/wechatselectattachment/assets/AttachmentAsset.php b/backend/widgets/wechatselectattachment/assets/AttachmentAsset.php
deleted file mode 100644
index c2aca78c0..000000000
--- a/backend/widgets/wechatselectattachment/assets/AttachmentAsset.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-namespace backend\widgets\wechatselectattachment\assets;
-
-use yii\web\AssetBundle;
-
-/**
- * Class AttachmentAsset
- * @package backend\widgets\wechatselectattachment\assets
- * @author jianyan74 <751393839@qq.com>
- */
-class AttachmentAsset extends AssetBundle
-{
-    public $sourcePath = '@backend/widgets/wechatselectattachment/resources/';
-
-    public $css = [
-    ];
-
-    public $js = [
-        'list.js',
-    ];
-
-    public $depends = [
-    ];
-}
\ No newline at end of file
diff --git a/backend/widgets/wechatselectattachment/resources/list.js b/backend/widgets/wechatselectattachment/resources/list.js
deleted file mode 100644
index a9fe14460..000000000
--- a/backend/widgets/wechatselectattachment/resources/list.js
+++ /dev/null
@@ -1,7 +0,0 @@
-$(document).on("click",".rfAttachmentActive",function() {
-    if (!$(this).hasClass('active')){
-        $(this).addClass('active');
-    }else{
-        $(this).removeClass('active');
-    }
-});
\ No newline at end of file
diff --git a/backend/widgets/wechatselectattachment/views/select.php b/backend/widgets/wechatselectattachment/views/select.php
deleted file mode 100644
index 371278616..000000000
--- a/backend/widgets/wechatselectattachment/views/select.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-use yii\helpers\Url;
-?>
-
-<div class="form-group required">
-    <label class="control-label"><?= $label ?></label>
-    <div class="rule-photo-list" id="<?= $boxId ?>">
-        <div class="img-box" data-toggle="modal" data-target="#ajaxModalMax" href="<?= Url::to(['/wechat-select-attachment/list', 'boxId' => $boxId, 'media_type' => $type])?>">
-            <?php if($type == 'news' || $type == 'image'){ ?>
-                <?= \yii\helpers\Html::img(!empty($model->media_url) ? Url::to(['analysis/image','attach' => $model->media_url]) : '@web/resources/dist/img/add-img.png')?>
-            <?php }else{ ?>
-                <i class="fa fa-file" style="font-size: 35px;margin:0 auto;padding-top: 40px"></i>
-            <?php } ?>
-            <div class="bottomBar"><?= !empty($model->file_name) ? $model->file_name : '点击选择'?></div>
-        </div>
-        <div class="hint-block"><?= $block ?></div>
-        <input name="<?= $name ?>" value="<?= $value ?>" type="hidden">
-    </div>
-</div>
\ No newline at end of file
diff --git a/common/components/payment/AliPay.php b/common/components/payment/AliPay.php
index 1313144c1..864b4db17 100644
--- a/common/components/payment/AliPay.php
+++ b/common/components/payment/AliPay.php
@@ -1,6 +1,7 @@
 <?php
 namespace common\components\payment;
 
+use Omnipay\Alipay\Requests\AopTradeAppPayRequest;
 use Yii;
 use Omnipay\Omnipay;
 
@@ -12,17 +13,10 @@ class AliPay
 {
     protected $config;
 
-    /**
-     * 类型
-     *
-     * @var array
-     */
-    protected $type = [
-        'pc' => 'Alipay_AopPage',
-        'app' => 'Alipay_AopApp',
-        'f2f' => 'Alipay_AopF2F',
-        'wap' => 'Alipay_AopWap',
-    ];
+    const PC = 'Alipay_AopPage';
+    const APP = 'Alipay_AopApp';
+    const F2F = 'Alipay_AopF2F';
+    const WAP = 'Alipay_AopWap';
 
     public function __construct($config)
     {
@@ -33,11 +27,11 @@ public function __construct($config)
      * 实例化类
      *
      * @param string $type
-     * @return \Omnipay\Alipay\BaseAbstractGateway
+     * @return \Omnipay\Alipay\AbstractAopGateway
      */
-    private function create($type = 'Alipay_AopApp')
+    private function create($type = self::PC)
     {
-        /* @var $gateway \Omnipay\Alipay\BaseAbstractGateway */
+        /* @var $gateway \Omnipay\Alipay\AbstractAopGateway */
         $gateway = Omnipay::create($type);
         $gateway->setSignType('RSA2'); // RSA/RSA2/MD5
         $gateway->setAppId($this->config['app_id']);
@@ -64,12 +58,12 @@ public function pc($order)
     {
         $order['product_code'] = 'FAST_INSTANT_TRADE_PAY';
 
-        $gateway = $this->create('Alipay_AopPage');
+        $gateway = $this->create(self::PC);
         $request = $gateway->purchase();
         $request->setBizContent($order);
 
         /**
-         * @var AopTradeAppPayResponse $response
+         * @var \Omnipay\Common\Message\AbstractResponse $response
          */
         $response = $request->send();
         $redirectUrl = $response->getRedirectUrl();
@@ -107,7 +101,7 @@ public function app($order)
     {
         $order['product_code'] = 'QUICK_MSECURITY_PAY';
 
-        $gateway = $this->create('Alipay_AopApp');
+        $gateway = $this->create(self::APP);
         $request = $gateway->purchase();
         $request->setBizContent($order);
 
@@ -126,7 +120,7 @@ public function app($order)
      */
     public function f2f($order)
     {
-        $gateway = $this->create('Alipay_AopF2F');
+        $gateway = $this->create(self::F2F);
         $request = $gateway->purchase();
         $request->setBizContent($order);
 
@@ -147,12 +141,12 @@ public function wap($order)
     {
         $order['product_code'] = 'QUICK_WAP_PAY';
 
-        $gateway = $this->create('Alipay_AopWap');
+        $gateway = $this->create(self::WAP);
         $request = $gateway->purchase();
         $request->setBizContent($order);
 
         /**
-         * @var AopTradeAppPayResponse $response
+         * @var \Omnipay\Common\Message\AbstractResponse $response
          */
         $response = $request->send();
 
@@ -198,7 +192,8 @@ public function capture()
     /**
      * 异步/同步通知
      *
-     * @return mixed
+     * @return \Omnipay\Alipay\Requests\AopCompletePurchaseRequest
+     * @throws \Omnipay\Common\Exception\InvalidRequestException
      */
     public function notify()
     {
diff --git a/common/components/payment/UnionPay.php b/common/components/payment/UnionPay.php
index bbce1bb22..0f9dea032 100644
--- a/common/components/payment/UnionPay.php
+++ b/common/components/payment/UnionPay.php
@@ -14,6 +14,8 @@ class UnionPay
 {
     protected $config;
 
+    const DEFAULT = 'UnionPay_Express';
+
     /**
      * UnionPay constructor.
      */
@@ -28,7 +30,7 @@ public function __construct($config)
      * @param string $type
      * @return \Omnipay\UnionPay\ExpressGateway
      */
-    private function create($type = 'UnionPay_Express')
+    private function create($type = self::DEFAULT)
     {
         /* @var $gateway \Omnipay\UnionPay\ExpressGateway */
         $gateway = Omnipay::create($type);
diff --git a/common/components/payment/WechatPay.php b/common/components/payment/WechatPay.php
index 83760f95f..6e0ebed57 100644
--- a/common/components/payment/WechatPay.php
+++ b/common/components/payment/WechatPay.php
@@ -13,6 +13,13 @@
  */
 class WechatPay
 {
+    const DEFAULT = 'WechatPay';
+    const APP = 'WechatPay_App';
+    const NATIVE = 'WechatPay_Native';
+    const JS = 'WechatPay_Js';
+    const POS = 'WechatPay_Pos';
+    const MWEB = 'WechatPay_Mweb';
+
     /**
      * 订单
      *
@@ -67,7 +74,7 @@ private function create($type)
      */
     public function notify()
     {
-        $gateway = $this->create('WechatPay');
+        $gateway = $this->create(self::DEFAULT);
 
         return $gateway->completePurchase([
             'request_params' => file_get_contents('php://input')
@@ -87,7 +94,7 @@ public function notify()
      */
     public function app($order, $debug = false)
     {
-        $gateway = $this->create('WechatPay_App');
+        $gateway = $this->create(self::APP);
         $request  = $gateway->purchase(ArrayHelper::merge($this->order, $order));
         $response = $request->send();
 
@@ -108,7 +115,7 @@ public function app($order, $debug = false)
      */
     public function native($order, $debug = false)
     {
-        $gateway = $this->create('WechatPay_Native');
+        $gateway = $this->create(self::NATIVE);
         $request  = $gateway->purchase(ArrayHelper::merge($this->order, $order));
         $response = $request->send();
 
@@ -130,7 +137,7 @@ public function native($order, $debug = false)
      */
     public function js($order, $debug = true)
     {
-        $gateway = $this->create('WechatPay_Js');
+        $gateway = $this->create(self::JS);
         $request  = $gateway->purchase(ArrayHelper::merge($this->order, $order));
         $response = $request->send();
 
@@ -152,7 +159,7 @@ public function js($order, $debug = true)
      */
     public function pos($order, $debug = false)
     {
-        $gateway = $this->create('WechatPay_Pos');
+        $gateway = $this->create(self::POS);
         $request  = $gateway->purchase(ArrayHelper::merge($this->order, $order));
         $response = $request->send();
 
@@ -172,7 +179,7 @@ public function pos($order, $debug = false)
      */
     public function mweb($order, $debug = false)
     {
-        $gateway = $this->create('WechatPay_Mweb');
+        $gateway = $this->create(self::MWEB);
         $request  = $gateway->purchase(ArrayHelper::merge($this->order, $order));
         $response = $request->send();
 
@@ -186,7 +193,7 @@ public function mweb($order, $debug = false)
      */
     public function close($out_trade_no)
     {
-        $gateway = $this->create('WechatPay');
+        $gateway = $this->create(self::DEFAULT);
         $response = $gateway->close([
             'out_trade_no' => $out_trade_no, //The merchant trade no
         ])->send();
@@ -201,7 +208,7 @@ public function close($out_trade_no)
      */
     public function query($transaction_id)
     {
-        $gateway = $this->create('WechatPay');
+        $gateway = $this->create(self::DEFAULT);
         $response = $gateway->query([
             'transaction_id' => $transaction_id, //The wechat trade no
         ])->send();
@@ -224,7 +231,7 @@ public function query($transaction_id)
      */
     public function refund($info)
     {
-        $gateway = $this->create('WechatPay');
+        $gateway = $this->create(self::DEFAULT);
         $response = $gateway->refund($info)->send();
 
         return $response->getData();
diff --git a/common/config/main.php b/common/config/main.php
index 3ab80466a..6e4083865 100644
--- a/common/config/main.php
+++ b/common/config/main.php
@@ -1,5 +1,7 @@
 <?php
 return [
+    'name' => 'RageFrame',
+    'version' => '2.2.32',
     'aliases' => [
         '@bower' => '@vendor/bower-asset',
         '@npm' => '@vendor/npm-asset',
diff --git a/common/config/params.php b/common/config/params.php
index 0121718ad..203e1ae20 100644
--- a/common/config/params.php
+++ b/common/config/params.php
@@ -4,7 +4,7 @@
     'supportEmail' => 'support@example.com',
     'user.passwordResetTokenExpire' => 3600,
 
-    // 上传配置
+    // 全局上传配置
     'uploadConfig' => [
         // 图片
         'images' => [
diff --git a/common/controllers/AddonsController.php b/common/controllers/AddonsController.php
index 01f82a229..5470b267a 100644
--- a/common/controllers/AddonsController.php
+++ b/common/controllers/AddonsController.php
@@ -39,8 +39,8 @@ public function init()
     {
         parent::init();
 
-        $this->route = Yii::$app->request->get('route', null) ?? Yii::$app->request->post('route');
-        $this->addonName = Yii::$app->request->get('addon', null) ?? Yii::$app->request->post('addon');
+        $this->route = Yii::$app->request->get('route', Yii::$app->request->post('route', ''));
+        $this->addonName = Yii::$app->request->get('addon', Yii::$app->request->post('addon', ''));
         $this->addonName = StringHelper::strUcwords($this->addonName);
     }
 
diff --git a/common/controllers/BaseController.php b/common/controllers/BaseController.php
index eb80e6dfa..7d28a4704 100644
--- a/common/controllers/BaseController.php
+++ b/common/controllers/BaseController.php
@@ -3,8 +3,6 @@
 
 use Yii;
 use yii\web\Controller;
-use common\helpers\FileHelper;
-use common\helpers\ArrayHelper;
 
 /**
  * 基类
diff --git a/common/controllers/FileBaseController.php b/common/controllers/FileBaseController.php
index b0e9a4e58..0d8ca85b3 100644
--- a/common/controllers/FileBaseController.php
+++ b/common/controllers/FileBaseController.php
@@ -213,23 +213,44 @@ public function actionMerge()
     }
 
     /**
-     * 获取资源列表
+     * 资源选择器
      *
-     * @return string
+     * @param bool $json
+     * @return array|string
      */
-    public function actionAttachment()
+    public function actionSelector($json = false)
     {
         $upload_type = Yii::$app->request->get('upload_type', Attachment::UPLOAD_TYPE_IMAGES);
+        $year = Yii::$app->request->get('year', '');
+        $month = Yii::$app->request->get('month', '');
 
         $data = Attachment::find()
             ->where(['>=', 'status', StatusEnum::DISABLED])
-            ->andWhere(['upload_type' => $upload_type]);
-        $pages = new Pagination(['totalCount' => $data->count(), 'pageSize' => 10]);
+            ->andWhere(['upload_type' => $upload_type])
+            ->andFilterWhere(['year' => $year])
+            ->andFilterWhere(['month' => $month]);
+        $pages = new Pagination(['totalCount' => $data->count(), 'pageSize' => 10, 'validatePage' => false]);
         $models = $data->offset($pages->offset)
             ->orderBy('id desc')
             ->limit($pages->limit)
+            ->asArray()
             ->all();
 
+        // 如果是以文件形式上传的图片手动修改为图片类型显示
+        foreach ($models as &$model)
+        {
+            if (preg_match("/^image/", $model['specific_type']) && $model['extension'] != 'psd')
+            {
+                $model['upload_type'] = Attachment::UPLOAD_TYPE_IMAGES;
+            }
+        }
+
+        // 判断是否直接返回json格式
+        if ($json == true)
+        {
+            return ResultDataHelper::json(200, '获取成功', $models);
+        }
+
         $year = [];
         for ($i = 2019; $i <= date('Y'); $i++)
         {
@@ -242,16 +263,7 @@ public function actionAttachment()
             $month[$i] = $i;
         }
 
-        // 如果是以文件形式上传的图片手动修改为图片类型显示
-        foreach ($models as &$model)
-        {
-            if (preg_match("/^image/", $model['specific_type']) && $model['extension'] != 'psd')
-            {
-                $model['upload_type'] = Attachment::UPLOAD_TYPE_IMAGES;
-            }
-        }
-
-        return $this->renderAjax('@common/widgets/webuploader/views/ajax-list/list', [
+        return $this->renderAjax('@common/widgets/webuploader/views/selector', [
             'models' => $models,
             'upload_type' => $upload_type,
             'month' => $month,
@@ -261,39 +273,6 @@ public function actionAttachment()
         ]);
     }
 
-    /**
-     * @return array
-     */
-    public function actionAjaxAttachment()
-    {
-        $upload_type = Yii::$app->request->get('upload_type', Attachment::UPLOAD_TYPE_IMAGES);
-        $year = Yii::$app->request->get('year', '');
-        $month = Yii::$app->request->get('month', '');
-
-        $data = Attachment::find()
-            ->where(['>=', 'status', StatusEnum::DISABLED])
-            ->andWhere(['upload_type' => $upload_type])
-            ->andFilterWhere(['year' => $year])
-            ->andFilterWhere(['month' => $month]);
-        $pages = new Pagination(['totalCount' => $data->count(), 'pageSize' => 10, 'validatePage' => false]);
-        $models = $data->offset($pages->offset)
-            ->orderBy('id desc')
-            ->limit($pages->limit)
-            ->asArray()
-            ->all();
-
-        // 如果是以文件形式上传的图片手动修改为图片类型显示
-        foreach ($models as &$model)
-        {
-            if (preg_match("/^image/", $model['specific_type']))
-            {
-                $model['upload_type'] = Attachment::UPLOAD_TYPE_IMAGES;
-            }
-        }
-
-        return ResultDataHelper::json(200, '获取成功', $models);
-    }
-
     /**
      * 获取本地文件列表
      *
diff --git a/common/controllers/WechatApiController.php b/common/controllers/WechatApiController.php
index 2d5c2f2f7..57d0aa48c 100644
--- a/common/controllers/WechatApiController.php
+++ b/common/controllers/WechatApiController.php
@@ -49,9 +49,7 @@ public function actionIndex()
                 }
 
                 throw new NotFoundHttpException('签名验证失败.');
-
                 break;
-
             // 接收数据
             case 'POST':
                 $app = Yii::$app->wechat->getApp();
@@ -90,11 +88,8 @@ public function actionIndex()
                 // 将响应输出
                 $response = $app->server->serve();
                 $response->send();
-
                 break;
-
             default:
-
                 throw new NotFoundHttpException('所请求的页面不存在.');
         }
 
@@ -144,6 +139,8 @@ protected function event($message)
             // 上报地理位置事件
             case 'LOCATION' :
 
+                //TODO 暂时不处理
+
                 break;
             // 自定义菜单(点击)事件
             case 'CLICK' :
diff --git a/common/helpers/AddonUrl.php b/common/helpers/AddonUrl.php
index 1a30c5afa..423147268 100644
--- a/common/helpers/AddonUrl.php
+++ b/common/helpers/AddonUrl.php
@@ -25,7 +25,7 @@ class AddonUrl
      * @param bool $scheme
      * @return bool| string
      */
-    public static function to(array $url, $scheme = false)
+    public static function to($url, $scheme = false)
     {
         return urldecode(Url::to(self::regroupUrl($url), $scheme));
     }
@@ -88,6 +88,11 @@ public static function toAbsoluteUrl(array $url, $scheme = false)
      */
     protected static function regroupUrl($url)
     {
+        if (!is_array($url))
+        {
+            return $url;
+        }
+
         $addonsUrl = [];
         $addonsUrl[0] = self::ADDON_EXECUTE;
         $addonsUrl['route'] = self::regroupRoute($url);
diff --git a/common/helpers/ArrayHelper.php b/common/helpers/ArrayHelper.php
index 675cafdba..f94be77ed 100644
--- a/common/helpers/ArrayHelper.php
+++ b/common/helpers/ArrayHelper.php
@@ -19,14 +19,14 @@ class ArrayHelper extends BaseArrayHelper
      * @param string $pidField
      * @return array
      */
-    public static function itemsMerge(array $items, $pid = 0, $idField = "id", $pidField = 'pid')
+    public static function itemsMerge(array $items, $pid = 0, $idField = "id", $pidField = 'pid', $child = '-')
     {
         $arr = [];
         foreach($items as $v)
         {
             if ($v[$pidField] == $pid)
             {
-                $v['-'] = self::itemsMerge($items, $v[$idField], $idField, $pidField);
+                $v[$child] = self::itemsMerge($items, $v[$idField], $idField, $pidField);
                 $arr[] = $v;
             }
         }
diff --git a/common/helpers/ExcelHelper.php b/common/helpers/ExcelHelper.php
index cb055c14f..4127ea221 100644
--- a/common/helpers/ExcelHelper.php
+++ b/common/helpers/ExcelHelper.php
@@ -78,23 +78,25 @@ public static function exportData($list = [], $header = [], $filename = '', $suf
             case 'xlsx' :
                 $writer = new Xlsx($spreadsheet);
                 header('Pragma:public');
-                header("Content-Type:application/x-msexecl;name=\"{$filename}.xlsx\"");
+                header("Content-Type:application/x-msexecl;charset=utf-8;name=\"{$filename}.xlsx\"");
                 header("Content-Disposition:inline;filename=\"{$filename}.xlsx\"");
                 $writer->save('php://output');
+                exit();
                 break;
 
             case 'xls' :
                 $writer = new Xls($spreadsheet);
                 header('Pragma:public');
-                header("Content-Type:application/x-msexecl;name=\"{$filename}.xls\"");
+                header("Content-Type:application/x-msexecl;charset=utf-8;name=\"{$filename}.xls\"");
                 header("Content-Disposition:inline;filename=\"{$filename}.xls\"");
                 $writer->save('php://output');
+                exit();
                 break;
 
             case 'csv' :
                 $writer = new Csv($spreadsheet);
                 header('Pragma:public');
-                header("Content-type:text/csv;");
+                header("Content-type:text/csv;charset=utf-8;");
                 header("Content-Disposition:attachment; filename={$filename}.csv");
                 $writer->save('php://output');
                 exit();
@@ -103,7 +105,7 @@ public static function exportData($list = [], $header = [], $filename = '', $suf
             case 'html' :
                 $writer = new Html($spreadsheet);
                 header('Pragma:public');
-                header("Content-Type:text/html;");
+                header("Content-Type:text/html;charset=utf-8;");
                 header("Content-Disposition:attachment;filename=\"{$filename}.{$suffix}\"");
                 $writer->save('php://output');
                 exit();
diff --git a/common/helpers/FileHelper.php b/common/helpers/FileHelper.php
index c55b73e6b..b8b01692f 100644
--- a/common/helpers/FileHelper.php
+++ b/common/helpers/FileHelper.php
@@ -2,7 +2,7 @@
 namespace common\helpers;
 
 /**
- * 文件帮助类
+ * 文件辅助类
  *
  * Class FileHelper
  * @package common\helpers
diff --git a/common/helpers/HashidsHelper.php b/common/helpers/HashidsHelper.php
new file mode 100644
index 000000000..542bbf1a7
--- /dev/null
+++ b/common/helpers/HashidsHelper.php
@@ -0,0 +1,62 @@
+<?php
+namespace common\helpers;
+
+use Yii;
+use Hashids\Hashids;
+
+/**
+ * ID加密辅助类
+ *
+ * Class HashidsHelper
+ * @package common\helpers
+ * @author jianyan74 <751393839@qq.com>
+ */
+class HashidsHelper
+{
+    /**
+     * 长度
+     *
+     * @var int
+     */
+    public static $lenght = 10;
+
+    /**
+     * @var \Hashids\Hashids
+     */
+    protected static $hashids;
+
+    /**
+     * 加密
+     *
+     * @param mixed ...$numbers
+     * @return string
+     */
+    public static function encode(...$numbers)
+    {
+        return self::getHashids()->encode(...$numbers);
+    }
+
+    /**
+     * 解密
+     *
+     * @param string $hash
+     * @return array
+     */
+    public static function decode(string $hash)
+    {
+        return self::getHashids()->decode($hash);
+    }
+
+    /**
+     * @return Hashids
+     */
+    private static function getHashids()
+    {
+        if (!self::$hashids instanceof Hashids)
+        {
+            self::$hashids = new Hashids(Yii::$app->request->cookieValidationKey, self::$lenght); // all lowercase
+        }
+
+        return self::$hashids;
+    }
+}
\ No newline at end of file
diff --git a/common/helpers/HtmlHelper.php b/common/helpers/HtmlHelper.php
index 5bc1a03a7..b954fde95 100644
--- a/common/helpers/HtmlHelper.php
+++ b/common/helpers/HtmlHelper.php
@@ -1,11 +1,11 @@
 <?php
 namespace common\helpers;
 
+use Yii;
+use yii\helpers\Url;
 use common\enums\WhetherEnum;
 use common\enums\StatusEnum;
 use yii\helpers\BaseHtml;
-use Yii;
-use yii\helpers\Url;
 
 /**
  * Class HtmlHelper
diff --git a/common/helpers/RegularHelper.php b/common/helpers/RegularHelper.php
index 527fe3576..d38a95d8f 100644
--- a/common/helpers/RegularHelper.php
+++ b/common/helpers/RegularHelper.php
@@ -29,7 +29,8 @@ public static function verify($type, $value)
      */
     public static function mobile()
     {
-        return '/^[1][3456789][0-9]{9}$/';
+        // return '/^[1][3456789][0-9]{9}$/';
+        return '/^(0|86|17951)?(13[0-9]|15[012356789]|166|17[3678]|18[0-9]|14[57])[0-9]{8}$/';
     }
 
     /**
@@ -39,7 +40,7 @@ public static function mobile()
      */
     public static function email()
     {
-        return '';
+        return '/^[a-zA-Z0-9!#$%&\'*+\\/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&\'*+\\/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$/';
     }
 
     /**
@@ -60,7 +61,8 @@ public static function telephone()
      */
     public static function identityCard()
     {
-        return '/^\d{15}|\d{}18$/';
+        // return '/^\d{15}|\d{}18$/';
+        return '/^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/';
     }
 
     /**
diff --git a/common/helpers/StringHelper.php b/common/helpers/StringHelper.php
index fa34427ea..ce7ec6087 100644
--- a/common/helpers/StringHelper.php
+++ b/common/helpers/StringHelper.php
@@ -315,4 +315,87 @@ protected static function isWindowsOS()
     {
         return strncmp(PHP_OS, 'WIN', 3) === 0;
     }
+
+    /**
+     * 将一个字符串部分字符用*替代隐藏
+     *
+     * @param string $string 待转换的字符串
+     * @param int $bengin 起始位置，从0开始计数，当$type=4时，表示左侧保留长度
+     * @param int $len 需要转换成*的字符个数，当$type=4时，表示右侧保留长度
+     * @param int $type 转换类型：0，从左向右隐藏；1，从右向左隐藏；2，从指定字符位置分割前由右向左隐藏；3，从指定字符位置分割后由左向右隐藏；4，保留首末指定字符串
+     * @param string $glue 分割符
+     * @return bool|string
+     */
+    public static function hideStr($string, $bengin = 0, $len = 4, $type = 0, $glue = "@")
+    {
+        if (empty($string))
+        {
+            return false;
+        }
+
+        $array = [];
+        if ($type == 0 || $type == 1 || $type == 4)
+        {
+            $strlen = $length = mb_strlen($string);
+            while ($strlen)
+            {
+                $array[] = mb_substr($string, 0, 1, "utf8");
+                $string = mb_substr($string, 1, $strlen, "utf8");
+                $strlen = mb_strlen($string);
+            }
+        }
+
+        if ($type == 0)
+        {
+            for ($i = $bengin; $i < ($bengin + $len); $i++)
+            {
+                isset($array[$i]) && $array[$i] = "*";
+            }
+
+            $string = implode("", $array);
+        }
+        else if ($type == 1)
+        {
+            $array = array_reverse($array);
+            for ($i = $bengin; $i < ($bengin + $len); $i++)
+            {
+                isset($array[$i]) && $array[$i] = "*";
+            }
+
+            $string = implode("", array_reverse($array));
+        }
+        else if ($type == 2)
+        {
+            $array = explode($glue, $string);
+            $array[0] = self::hideStr($array[0], $bengin, $len, 1);
+            $string = implode($glue, $array);
+        }
+        else if ($type == 3)
+        {
+            $array = explode($glue, $string);
+            $array[1] = self::hideStr($array[1], $bengin, $len, 0);
+            $string = implode($glue, $array);
+        }
+        else if ($type == 4)
+        {
+            $left = $bengin;
+            $right = $len;
+            $tem = array();
+            for ($i = 0; $i < ($length - $right); $i++)
+            {
+                if (isset($array[$i]))
+                    $tem[] = $i >= $left ? "*" : $array[$i];
+            }
+
+            $array = array_chunk(array_reverse($array), $right);
+            $array = array_reverse($array[0]);
+            for ($i = 0; $i < $right; $i++)
+            {
+                $tem[] = $array[$i];
+            }
+            $string = implode("", $tem);
+        }
+
+        return $string;
+    }
 }
\ No newline at end of file
diff --git a/common/models/member/Address.php b/common/models/member/Address.php
index f9d05034b..20cb79130 100644
--- a/common/models/member/Address.php
+++ b/common/models/member/Address.php
@@ -42,7 +42,7 @@ public function rules()
     {
         return [
             [['member_id', 'provinces', 'city', 'area', 'realname', 'mobile'], 'required'],
-            ['mobile', 'match', 'pattern' => RegularHelper::mobile(),'message' => '不是一个有效的手机号码'],
+            ['mobile', 'match', 'pattern' => RegularHelper::mobile(), 'message' => '不是一个有效的手机号码'],
             [['member_id', 'provinces', 'city', 'area', 'is_default', 'zip_code', 'status', 'created_at', 'updated_at'], 'integer'],
             [['address_name', 'address_details'], 'string', 'max' => 200],
             [['realname'], 'string', 'max' => 100],
diff --git a/common/models/sys/Addons.php b/common/models/sys/Addons.php
index cd6131142..d494cb528 100644
--- a/common/models/sys/Addons.php
+++ b/common/models/sys/Addons.php
@@ -1,6 +1,9 @@
 <?php
 namespace common\models\sys;
 
+use common\models\wechat\ReplyAddon;
+use common\models\wechat\Rule;
+use common\models\wechat\RuleKeyword;
 use Yii;
 use common\enums\StatusEnum;
 use common\models\common\BaseModel;
@@ -260,10 +263,20 @@ public function getAuthItemChild()
      */
     public function afterDelete()
     {
+        // 移除绑定的菜单导航
         AddonsBinding::deleteAll(['addons_name' => $this->name]);
+        //权限清理
         AddonsAuthItemChild::deleteAll(['addons_name' => $this->name]);
         AddonsAuthItem::deleteAll(['addons_name' => $this->name]);
-        // Rule::deleteAll($this->name);
+        // 移除关键字
+        if ($replys = ReplyAddon::find()->where(['addon' => $this->name])->asArray()->all())
+        {
+            $ruleIds = array_column($replys, 'rule_id');
+            Rule::deleteAll(['in', 'id', $ruleIds]);
+            RuleKeyword::deleteAll(['in', 'rule_id', $ruleIds]);
+        }
+
+        ReplyAddon::deleteAll(['addon' => $this->name]);
         parent::afterDelete();
     }
 }
diff --git a/common/services/Application.php b/common/services/Application.php
index f316841d0..8c2deab6e 100644
--- a/common/services/Application.php
+++ b/common/services/Application.php
@@ -13,6 +13,7 @@
  * @property \common\services\common\ErrorLog $errorLog 报错日志记录
  * @property \common\services\common\Mailer $mailer 发送邮件
  * @property \common\services\common\Push $push app推送
+ * @property \common\services\common\Provinces $provinces 省市区
  * @author jianyan74 <751393839@qq.com>
  */
 class Application extends Service
@@ -51,6 +52,9 @@ class Application extends Service
             'queueSwitch' => false, // 是否丢进队列 注意如果需要请先开启执行队列
             'exceptCode' => [403] // 除了数组内的状态码不记录，其他按照配置记录
         ],
+        'provinces' => [
+            'class' => 'common\services\common\Provinces',
+        ],
         'push' => [
             'class' => 'common\services\common\Push',
         ],
diff --git a/common/services/common/Provinces.php b/common/services/common/Provinces.php
new file mode 100644
index 000000000..31c47eb04
--- /dev/null
+++ b/common/services/common/Provinces.php
@@ -0,0 +1,58 @@
+<?php
+namespace common\services\common;
+
+use Yii;
+use common\models\common\Provinces as ProvincesModel;
+
+/**
+ * Class Provinces
+ * @package common\services\common
+ * @author jianyan74 <751393839@qq.com>
+ */
+class Provinces
+{
+    protected static $cacheKey = 'sysProvinces';
+
+    /**
+     * @param $ids
+     * @return array|\yii\db\ActiveRecord[]
+     *
+     */
+    public function getAllByIds($ids)
+    {
+        return ProvincesModel::find()
+            ->select(['id', 'title', 'pid', 'level'])
+            ->where(['in', 'id', $ids])
+            ->asArray()
+            ->all();
+    }
+
+    /**
+     * @return mixed
+     */
+    public function all()
+    {
+        // 获取缓存
+        if (!($data = Yii::$app->cache->get(self::$cacheKey)))
+        {
+            // 数据库依赖缓存
+            $dependency = new \yii\caching\DbDependency([
+                'sql' => ProvincesModel::find()
+                    ->select('id')
+                    ->orderBy('id desc')
+                    ->createCommand()
+                    ->getRawSql(),
+            ]);
+
+            $data = ProvincesModel::find()
+                ->select(['id', 'title', 'pid', 'level'])
+                ->where(['<=', 'level', 4])
+                ->asArray()
+                ->all();
+
+            Yii::$app->cache->set(self::$cacheKey, $data, 60 * 60 * 24 * 30, $dependency);
+        }
+
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/common/widgets/webuploader/views/file.php b/common/widgets/webuploader/views/file.php
index af1684fda..9115110f1 100644
--- a/common/widgets/webuploader/views/file.php
+++ b/common/widgets/webuploader/views/file.php
@@ -22,7 +22,7 @@
                     <li class="upload-box upload-album-<?= $boxId?>" data-select="<?= $config['select']?>"></li>
                     <div class="halfOpacityBlackBG absoluteFullSize" style="display: none;width: 110px;height: 110px;">
                         <a class="fontColorWhite uploadWebuploader" href="javascript:void(0)" style="left:25%;top: 25%;position: absolute;">上传文件</a>
-                        <a class="fontColorWhite" href="<?= Url::to(['/file/attachment', 'boxId' => $boxId, 'multiple' => true, 'upload_type' => 'files'])?>" style="right:25%;top: 55%;position: absolute;" data-toggle='modal' data-target='#ajaxModalMax'>选择文件</a>
+                        <a class="fontColorWhite" href="<?= Url::to(['/file/selector', 'boxId' => $boxId, 'multiple' => true, 'upload_type' => 'files'])?>" style="right:25%;top: 55%;position: absolute;" data-toggle='modal' data-target='#ajaxModalMax'>选择文件</a>
                     </div>
                 <?php }else{ ?>
                     <?php if($value){ ?>
@@ -38,7 +38,7 @@
                     <li class="upload-box upload-album-<?= $boxId ?>" <?php if(!empty($value)){?> style="display: none"<?php } ?> data-select="<?= $config['select']?>"></li>
                     <div class="halfOpacityBlackBG absoluteFullSize" style="display: none;width: 110px;height: 110px;">
                         <a class="fontColorWhite uploadWebuploader" href="javascript:void(0)" style="left:25%;top: 25%;position: absolute;">上传文件</a>
-                        <a class="fontColorWhite" href="<?= Url::to(['/file/attachment', 'boxId' => $boxId, 'multiple' => false, 'upload_type' => 'files'])?>" style="right:25%;top: 55%;position: absolute;" data-toggle='modal' data-target='#ajaxModalMax'>选择文件</a>
+                        <a class="fontColorWhite" href="<?= Url::to(['/file/selector', 'boxId' => $boxId, 'multiple' => false, 'upload_type' => 'files'])?>" style="right:25%;top: 55%;position: absolute;" data-toggle='modal' data-target='#ajaxModalMax'>选择文件</a>
                     </div>
                 <?php } ?>
             </ul>
@@ -65,6 +65,11 @@
         }
     });
 
+    // 移除文件蒙层
+    $('.file-list').mouseleave(function(e){
+        $(e.currentTarget).parent().find('.halfOpacityBlackBG').hide();
+    });
+
     $(".upload-album-{$boxId}").InitMultiUploader({$jsConfig});
     var sortable = Sortable.create(document.getElementById('{$boxId}'),{});
     // 兼容老IE
diff --git a/common/widgets/webuploader/views/image.php b/common/widgets/webuploader/views/image.php
index a302b6357..8fd7669d0 100644
--- a/common/widgets/webuploader/views/image.php
+++ b/common/widgets/webuploader/views/image.php
@@ -3,52 +3,52 @@
 $jsConfig = json_encode($config);
 ?>
 
-<div class="row">
-    <div class="multi-container col-sm-12 rf-m">
-        <div class="photo-list">
-            <ul data-name = "<?= $name?>" data-boxId = "<?= $boxId?>" id="<?= $boxId?>">
-                <?php if($config['pick']['multiple'] == true){ ?>
-                    <?php foreach ($value as $vo){ ?>
-                        <li>
-                            <input name="<?= $name?>" value="<?= $vo?>" type="hidden">
-                            <div class="img-box">
-                                <a href="<?= trim($vo) ?>" data-fancybox="rfUploadImg">
-                                    <div class="backgroundCover" style="background-image: url(<?= $vo?>);height: 110px"></div>
-                                </a>
-                                <i class="delimg" data-multiple="<?= $config['pick']['multiple'] ?>"></i>
-                            </div>
-                        </li>
+    <div class="row">
+        <div class="multi-container col-sm-12 rf-m">
+            <div class="photo-list">
+                <ul data-name = "<?= $name?>" data-boxId = "<?= $boxId?>" id="<?= $boxId?>">
+                    <?php if($config['pick']['multiple'] == true){ ?>
+                        <?php foreach ($value as $vo){ ?>
+                            <li>
+                                <input name="<?= $name?>" value="<?= $vo?>" type="hidden">
+                                <div class="img-box">
+                                    <a href="<?= trim($vo) ?>" data-fancybox="rfUploadImg">
+                                        <div class="backgroundCover" style="background-image: url(<?= $vo?>);height: 110px"></div>
+                                    </a>
+                                    <i class="delimg" data-multiple="<?= $config['pick']['multiple'] ?>"></i>
+                                </div>
+                            </li>
+                        <?php } ?>
+                        <li class="upload-box upload-album-<?= $boxId?>"  data-select="<?= $config['select']?>"></li>
+                        <div class="halfOpacityBlackBG absoluteFullSize" style="display: none;width: 110px;height: 110px;">
+                            <a class="fontColorWhite uploadWebuploader" href="javascript:void(0)" style="left:25%;top: 25%;position: absolute;">上传图片</a>
+                            <a class="fontColorWhite" href="<?= Url::to(['/file/selector', 'boxId' => $boxId, 'multiple' => true])?>" style="right:25%;top: 55%;position: absolute;" data-toggle='modal' data-target='#ajaxModalMax'>选择图片</a>
+                        </div>
+                    <?php }else{ ?>
+                        <?php if($value){ ?>
+                            <li>
+                                <input name="<?= $name?>" value="<?= $value?>" type="hidden">
+                                <div class="img-box">
+                                    <a href="<?= $value ?>" data-fancybox="rfUploadImg">
+                                        <div class="backgroundCover" style="background-image: url(<?= $value?>);height: 110px"></div>
+                                    </a>
+                                    <i class="delimg" data-multiple="<?= $config['pick']['multiple'] ?>"></i>
+                                </div>
+                            </li>
+                        <?php } ?>
+                        <li class="upload-box upload-album-<?= $boxId ?>" <?php if(!empty($value)){?> style="display: none"<?php } ?>  data-select="<?= $config['select']?>"></li>
+                        <div class="halfOpacityBlackBG absoluteFullSize" style="display: none;width: 110px;height: 110px;">
+                            <a class="fontColorWhite uploadWebuploader" href="javascript:void(0)" style="left:25%;top: 25%;position: absolute;">上传图片</a>
+                            <a class="fontColorWhite" href="<?= Url::to(['/file/selector', 'boxId' => $boxId, 'multiple' => false])?>" style="right:25%;top: 55%;position: absolute;" data-toggle='modal' data-target='#ajaxModalMax'>选择图片</a>
+                        </div>
                     <?php } ?>
-                    <li class="upload-box upload-album-<?= $boxId?>"  data-select="<?= $config['select']?>"></li>
-                    <div class="halfOpacityBlackBG absoluteFullSize" style="display: none;width: 110px;height: 110px;">
-                        <a class="fontColorWhite uploadWebuploader" href="javascript:void(0)" style="left:25%;top: 25%;position: absolute;">上传图片</a>
-                        <a class="fontColorWhite" href="<?= Url::to(['/file/attachment', 'boxId' => $boxId, 'multiple' => true])?>" style="right:25%;top: 55%;position: absolute;" data-toggle='modal' data-target='#ajaxModalMax'>选择图片</a>
-                    </div>
-                <?php }else{ ?>
-                    <?php if($value){ ?>
-                        <li>
-                            <input name="<?= $name?>" value="<?= $value?>" type="hidden">
-                            <div class="img-box">
-                                <a href="<?= $value ?>" data-fancybox="rfUploadImg">
-                                    <div class="backgroundCover" style="background-image: url(<?= $value?>);height: 110px"></div>
-                                </a>
-                                <i class="delimg" data-multiple="<?= $config['pick']['multiple'] ?>"></i>
-                            </div>
-                        </li>
-                    <?php } ?>
-                    <li class="upload-box upload-album-<?= $boxId ?>" <?php if(!empty($value)){?> style="display: none"<?php } ?>  data-select="<?= $config['select']?>"></li>
-                    <div class="halfOpacityBlackBG absoluteFullSize" style="display: none;width: 110px;height: 110px;">
-                        <a class="fontColorWhite uploadWebuploader" href="javascript:void(0)" style="left:25%;top: 25%;position: absolute;">上传图片</a>
-                        <a class="fontColorWhite" href="<?= Url::to(['/file/attachment', 'boxId' => $boxId, 'multiple' => false])?>" style="right:25%;top: 55%;position: absolute;" data-toggle='modal' data-target='#ajaxModalMax'>选择图片</a>
-                    </div>
-                <?php } ?>
-            </ul>
+                </ul>
+            </div>
         </div>
     </div>
-</div>
-<script>
-    var mergeUrl = "<?= \yii\helpers\Url::to(['/file/merge']) ?>";
-</script>
+    <script>
+        var mergeUrl = "<?= \yii\helpers\Url::to(['/file/merge']) ?>";
+    </script>
 
 <?php $this->registerJs(<<<Js
     $('.upload-album-{$boxId}').mouseenter(function(e){
@@ -64,6 +64,11 @@
             obj.parent().find('.halfOpacityBlackBG').show();
         }
     });
+
+    // 移除图像蒙层
+    $('.photo-list').mouseleave(function(e){
+        $(e.currentTarget).parent().find('.halfOpacityBlackBG').hide();
+    });
     
     $(".upload-album-{$boxId}").InitMultiUploader({$jsConfig});
     var sortable = Sortable.create(document.getElementById('{$boxId}'),{});
diff --git a/common/widgets/webuploader/views/ajax-list/list.php b/common/widgets/webuploader/views/selector.php
similarity index 94%
rename from common/widgets/webuploader/views/ajax-list/list.php
rename to common/widgets/webuploader/views/selector.php
index a6139dd0c..a00e5ccd4 100644
--- a/common/widgets/webuploader/views/ajax-list/list.php
+++ b/common/widgets/webuploader/views/selector.php
@@ -4,18 +4,12 @@
 use yii\helpers\ArrayHelper;
 ?>
 
-<style>
-    .normalPaddingRight .active {
-        border: 2px solid #1ab394 !important;
-    }
-</style>
-
 <!--模板列表-->
 <script type="text/html" id="rfAttachmentlistModel">
     {{each data as value i}}
     <div class="normalPaddingRight" style="width:20%;margin-top: 10px;">
-        <div class="borderColorGray separateChildrenWithLine whiteBG rfAttachmentActive" style="margin-bottom: 20px;" data-url="{{value.base_url}}">
-            <div class="normalPadding rule-ajax-img">
+        <div class="borderColorGray separateChildrenWithLine whiteBG rfAttachmentActive" data-url="{{value.base_url}}">
+            <div class="normalPadding">
                 {{if value.upload_type == "images"}}
                 <div style="background-image: url({{value.base_url}}); height: 160px;" class="backgroundCover relativePosition mainPostCover">
                     <div class="bottomBar">{{value.name}}</div>
@@ -59,7 +53,7 @@
     <div class="inlineBlockContainer col3 vAlignTop" id="rfAttachmentList">
         <?php foreach ($models as $model){ ?>
             <div class="normalPaddingRight" style="width:20%;margin-top: 10px;">
-                <div class="borderColorGray separateChildrenWithLine whiteBG rfAttachmentActive" style="margin-bottom: 20px;" data-url="<?= $model['base_url']?>">
+                <div class="borderColorGray separateChildrenWithLine whiteBG rfAttachmentActive" data-url="<?= $model['base_url']?>">
                     <div class="normalPadding">
                         <?php if ($model['upload_type'] == 'images'){?>
                             <div style="background-image: url(<?= $model['base_url']?>); height: 160px;" class="backgroundCover relativePosition mainPostCover">
@@ -77,7 +71,7 @@
             </div>
         <?php } ?>
     </div>
-    <div class="row text-center" id="loadingAttachment">
+    <div class="row text-center m-t" id="loadingAttachment">
         <span onclick="rfGetAttachment()" class="btn btn-white">加载更多</span>
     </div>
 </div>
@@ -182,7 +176,7 @@ function rfAttachmentSearch() {
     function rfGetAttachment() {
         $.ajax({
             type:"get",
-            url:"<?= Url::to(['/file/ajax-attachment'])?>",
+            url:"<?= Url::to(['/file/selector', 'json' => true])?>",
             dataType: "json",
             data: {
                 page:page,
diff --git a/composer.json b/composer.json
index 551b88501..2013777ec 100644
--- a/composer.json
+++ b/composer.json
@@ -21,10 +21,10 @@
         "yiisoft/yii2-authclient": "~2.1.0",
         "yiisoft/yii2-redis": "^2.0",
         "yiisoft/yii2-queue": "dev-master",
-        "omnipay/common": "^2.5",
-        "lokielse/omnipay-alipay": "dev-legacy",
-        "lokielse/omnipay-wechatpay": "^1.0",
-        "lokielse/omnipay-unionpay": "^0.4",
+        "omnipay/common": "^3.0",
+        "lokielse/omnipay-alipay": "^3.0",
+        "lokielse/omnipay-wechatpay": "^3.0",
+        "lokielse/omnipay-unionpay": "^3.0",
         "kartik-v/yii2-widget-datepicker": "@dev",
         "kartik-v/yii2-widget-timepicker": "*",
         "kartik-v/yii2-widget-colorinput": "*",
@@ -38,7 +38,7 @@
         "overtrue/pinyin": "~3.0",
         "overtrue/easy-sms": "^1.0",
         "overtrue/flysystem-qiniu": "^1.0",
-        "e282486518/yii2-console-migration": "*",
+        "e282486518/yii2-console-migration": "@dev",
         "xj/yii2-oauth": "~2.0.0",
         "ramsey/uuid": "^3.7",
         "moontoast/math": "^1.1",
@@ -50,7 +50,8 @@
         "jpush/jpush": "*",
         "omnilight/yii2-scheduling": "*",
         "league/flysystem": "^1.0",
-        "xxtime/flysystem-aliyun-oss": "^1.2"
+        "xxtime/flysystem-aliyun-oss": "^1.2",
+        "hashids/hashids": "^3.0"
     },
     "require-dev": {
         "yiisoft/yii2-debug": "~2.0.0",
diff --git a/composer.lock b/composer.lock
index db67f1ac2..d56a84a15 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7a0aded7e3a64c1fbfd8663bdab0505b",
+    "content-hash": "58855c38efe953a0641b14873ab8f0fb",
     "packages": [
         {
             "name": "2amigos/qrcode-library",
@@ -281,17 +281,16 @@
         },
         {
             "name": "bower-asset/bootstrap",
-            "version": "v3.4.0",
+            "version": "v3.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twbs/bootstrap.git",
-                "reference": "4c547f2175b9a05aa43551f6927da83fe249ce42"
+                "reference": "68b0d231a13201eb14acd3dc84e51543d16e5f7e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twbs/bootstrap/zipball/4c547f2175b9a05aa43551f6927da83fe249ce42",
-                "reference": "4c547f2175b9a05aa43551f6927da83fe249ce42",
-                "shasum": null
+                "url": "https://api.github.com/repos/twbs/bootstrap/zipball/68b0d231a13201eb14acd3dc84e51543d16e5f7e",
+                "reference": "68b0d231a13201eb14acd3dc84e51543d16e5f7e"
             },
             "require": {
                 "bower-asset/jquery": ">=1.9.1,<4.0"
@@ -312,8 +311,7 @@
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/RobinHerbots/Inputmask/zipball/5e670ad62f50c738388d4dcec78d2888505ad77b",
-                "reference": "5e670ad62f50c738388d4dcec78d2888505ad77b",
-                "shasum": null
+                "reference": "5e670ad62f50c738388d4dcec78d2888505ad77b"
             },
             "require": {
                 "bower-asset/jquery": ">=1.7"
@@ -334,8 +332,7 @@
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/9e8ec3d10fad04748176144f108d7355662ae75e",
-                "reference": "9e8ec3d10fad04748176144f108d7355662ae75e",
-                "shasum": null
+                "reference": "9e8ec3d10fad04748176144f108d7355662ae75e"
             },
             "type": "bower-asset",
             "license": [
@@ -353,8 +350,7 @@
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/bestiejs/punycode.js/zipball/38c8d3131a82567bfef18da09f7f4db68c84f8a3",
-                "reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3",
-                "shasum": null
+                "reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3"
             },
             "type": "bower-asset"
         },
@@ -369,8 +365,7 @@
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/yiisoft/jquery-pjax/zipball/aef7b953107264f00234902a3880eb50dafc48be",
-                "reference": "aef7b953107264f00234902a3880eb50dafc48be",
-                "shasum": null
+                "reference": "aef7b953107264f00234902a3880eb50dafc48be"
             },
             "require": {
                 "bower-asset/jquery": ">=1.8"
@@ -446,6 +441,64 @@
             ],
             "time": "2018-03-26T11:24:36+00:00"
         },
+        {
+            "name": "clue/stream-filter",
+            "version": "v1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/clue/php-stream-filter.git",
+                "reference": "d80fdee9b3a7e0d16fc330a22f41f3ad0eeb09d0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/clue/php-stream-filter/zipball/d80fdee9b3a7e0d16fc330a22f41f3ad0eeb09d0",
+                "reference": "d80fdee9b3a7e0d16fc330a22f41f3ad0eeb09d0",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "php": ">=5.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.0 || ^4.8"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Clue\\StreamFilter\\": "src/"
+                },
+                "files": [
+                    "src/functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@lueck.tv"
+                }
+            ],
+            "description": "A simple and modern approach to stream filtering in PHP",
+            "homepage": "https://github.com/clue/php-stream-filter",
+            "keywords": [
+                "bucket brigade",
+                "callback",
+                "filter",
+                "php_user_filter",
+                "stream",
+                "stream_filter_append",
+                "stream_filter_register"
+            ],
+            "time": "2017-08-18T09:54:01+00:00"
+        },
         {
             "name": "doctrine/lexer",
             "version": "v1.0.1",
@@ -508,16 +561,16 @@
         },
         {
             "name": "e282486518/yii2-console-migration",
-            "version": "v1.3.0",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/e282486518/yii2-console-migration.git",
-                "reference": "5eab26b9c6d723ad1992cbc1bc3c8146aeb8080f"
+                "reference": "d904e7d38e67b42851f929a3605d588cd99e8b0f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/e282486518/yii2-console-migration/zipball/5eab26b9c6d723ad1992cbc1bc3c8146aeb8080f",
-                "reference": "5eab26b9c6d723ad1992cbc1bc3c8146aeb8080f",
+                "url": "https://api.github.com/repos/e282486518/yii2-console-migration/zipball/d904e7d38e67b42851f929a3605d588cd99e8b0f",
+                "reference": "d904e7d38e67b42851f929a3605d588cd99e8b0f",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -548,20 +601,20 @@
                 "migration",
                 "yii2"
             ],
-            "time": "2016-12-01T12:04:39+00:00"
+            "time": "2018-05-08T10:08:57+00:00"
         },
         {
             "name": "easywechat-composer/easywechat-composer",
-            "version": "1.1.4",
+            "version": "1.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mingyoung/easywechat-composer.git",
-                "reference": "f0c96f2cda1e672e3ad2fd34a192a503943c69fe"
+                "reference": "970144fd245e62869edd60db6cc477053219d891"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mingyoung/easywechat-composer/zipball/f0c96f2cda1e672e3ad2fd34a192a503943c69fe",
-                "reference": "f0c96f2cda1e672e3ad2fd34a192a503943c69fe",
+                "url": "https://api.github.com/repos/mingyoung/easywechat-composer/zipball/970144fd245e62869edd60db6cc477053219d891",
+                "reference": "970144fd245e62869edd60db6cc477053219d891",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -576,7 +629,7 @@
             },
             "require-dev": {
                 "composer/composer": "^1.0",
-                "phpunit/phpunit": "^7.0"
+                "phpunit/phpunit": "^6.5 || ^7.0"
             },
             "type": "composer-plugin",
             "extra": {
@@ -598,7 +651,7 @@
                 }
             ],
             "description": "The composer plugin for EasyWeChat",
-            "time": "2018-11-10T01:49:23+00:00"
+            "time": "2019-02-22T07:59:50+00:00"
         },
         {
             "name": "egulias/email-validator",
@@ -716,108 +769,6 @@
             ],
             "time": "2018-02-23T01:58:20+00:00"
         },
-        {
-            "name": "guzzle/guzzle",
-            "version": "v3.9.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/guzzle3.git",
-                "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9",
-                "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
-            },
-            "require": {
-                "ext-curl": "*",
-                "php": ">=5.3.3",
-                "symfony/event-dispatcher": "~2.1"
-            },
-            "replace": {
-                "guzzle/batch": "self.version",
-                "guzzle/cache": "self.version",
-                "guzzle/common": "self.version",
-                "guzzle/http": "self.version",
-                "guzzle/inflection": "self.version",
-                "guzzle/iterator": "self.version",
-                "guzzle/log": "self.version",
-                "guzzle/parser": "self.version",
-                "guzzle/plugin": "self.version",
-                "guzzle/plugin-async": "self.version",
-                "guzzle/plugin-backoff": "self.version",
-                "guzzle/plugin-cache": "self.version",
-                "guzzle/plugin-cookie": "self.version",
-                "guzzle/plugin-curlauth": "self.version",
-                "guzzle/plugin-error-response": "self.version",
-                "guzzle/plugin-history": "self.version",
-                "guzzle/plugin-log": "self.version",
-                "guzzle/plugin-md5": "self.version",
-                "guzzle/plugin-mock": "self.version",
-                "guzzle/plugin-oauth": "self.version",
-                "guzzle/service": "self.version",
-                "guzzle/stream": "self.version"
-            },
-            "require-dev": {
-                "doctrine/cache": "~1.3",
-                "monolog/monolog": "~1.0",
-                "phpunit/phpunit": "3.7.*",
-                "psr/log": "~1.0",
-                "symfony/class-loader": "~2.1",
-                "zendframework/zend-cache": "2.*,<2.3",
-                "zendframework/zend-log": "2.*,<2.3"
-            },
-            "suggest": {
-                "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated."
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.9-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Guzzle": "src/",
-                    "Guzzle\\Tests": "tests/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                },
-                {
-                    "name": "Guzzle Community",
-                    "homepage": "https://github.com/guzzle/guzzle/contributors"
-                }
-            ],
-            "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle",
-            "homepage": "http://guzzlephp.org/",
-            "keywords": [
-                "client",
-                "curl",
-                "framework",
-                "http",
-                "http client",
-                "rest",
-                "web service"
-            ],
-            "abandoned": "guzzlehttp/guzzle",
-            "time": "2015-03-18T18:23:50+00:00"
-        },
         {
             "name": "guzzlehttp/guzzle",
             "version": "6.3.3",
@@ -1019,6 +970,78 @@
             ],
             "time": "2018-12-04T20:46:45+00:00"
         },
+        {
+            "name": "hashids/hashids",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ivanakimov/hashids.php.git",
+                "reference": "b6c61142bfe36d43740a5419d11c351dddac0458"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ivanakimov/hashids.php/zipball/b6c61142bfe36d43740a5419d11c351dddac0458",
+                "reference": "b6c61142bfe36d43740a5419d11c351dddac0458",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "php": "^7.1.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.0"
+            },
+            "suggest": {
+                "ext-bcmath": "Required to use BC Math arbitrary precision mathematics (*).",
+                "ext-gmp": "Required to use GNU multiple precision mathematics (*)."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hashids\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Akimov",
+                    "email": "ivan@barreleye.com",
+                    "homepage": "https://twitter.com/IvanAkimov"
+                },
+                {
+                    "name": "Vincent Klaiber",
+                    "email": "hello@vinkla.com",
+                    "homepage": "https://vinkla.com"
+                }
+            ],
+            "description": "Generate short, unique, non-sequential ids (like YouTube and Bitly) from numbers",
+            "homepage": "http://hashids.org/php",
+            "keywords": [
+                "bitly",
+                "decode",
+                "encode",
+                "hash",
+                "hashid",
+                "hashids",
+                "ids",
+                "obfuscate",
+                "youtube"
+            ],
+            "time": "2018-03-12T16:30:09+00:00"
+        },
         {
             "name": "imagine/imagine",
             "version": "v0.5.0",
@@ -1794,16 +1817,16 @@
         },
         {
             "name": "linslin/yii2-curl",
-            "version": "1.2.1",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/linslin/Yii2-Curl.git",
-                "reference": "492ffc03e78458357210d692f36a0cd74a888825"
+                "reference": "734c40b520729c79af2937283864f8c999e86879"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/linslin/Yii2-Curl/zipball/492ffc03e78458357210d692f36a0cd74a888825",
-                "reference": "492ffc03e78458357210d692f36a0cd74a888825",
+                "url": "https://api.github.com/repos/linslin/Yii2-Curl/zipball/734c40b520729c79af2937283864f8c999e86879",
+                "reference": "734c40b520729c79af2937283864f8c999e86879",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1814,6 +1837,7 @@
             },
             "require": {
                 "ext-curl": "*",
+                "ext-json": "*",
                 "yiisoft/yii2": "*"
             },
             "require-dev": {
@@ -1847,20 +1871,20 @@
                 "restful",
                 "yii2"
             ],
-            "time": "2017-10-23T07:43:10+00:00"
+            "time": "2019-02-25T10:56:34+00:00"
         },
         {
             "name": "lokielse/omnipay-alipay",
-            "version": "dev-legacy",
+            "version": "v3.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lokielse/omnipay-alipay.git",
-                "reference": "a597b39951270711a84df928411854f36a64f99d"
+                "reference": "7eabb7d0db1bb0f966dac45c2a5ffe4bbb9b0a04"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lokielse/omnipay-alipay/zipball/a597b39951270711a84df928411854f36a64f99d",
-                "reference": "a597b39951270711a84df928411854f36a64f99d",
+                "url": "https://api.github.com/repos/lokielse/omnipay-alipay/zipball/7eabb7d0db1bb0f966dac45c2a5ffe4bbb9b0a04",
+                "reference": "7eabb7d0db1bb0f966dac45c2a5ffe4bbb9b0a04",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1870,16 +1894,22 @@
                 ]
             },
             "require": {
-                "omnipay/common": "~2.0"
+                "omnipay/common": "^3.0",
+                "php-http/guzzle6-adapter": "*"
             },
             "require-dev": {
-                "omnipay/tests": "~2.0"
+                "omnipay/tests": "^3.0",
+                "squizlabs/php_codesniffer": "3.*"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Omnipay\\Alipay\\": "src/"
-                }
+                    "Omnipay\\Alipay\\": "src/",
+                    "Omnipay\\Alipay\\Tests\\": "tests/"
+                },
+                "files": [
+                    "src/Common/helpers.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1902,20 +1932,20 @@
                 "payment",
                 "purchase"
             ],
-            "time": "2016-12-07T08:08:39+00:00"
+            "time": "2019-02-27T07:19:07+00:00"
         },
         {
             "name": "lokielse/omnipay-unionpay",
-            "version": "v0.4.1",
+            "version": "v3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lokielse/omnipay-unionpay.git",
-                "reference": "f732c4add32a6be1e80958132e93a0b5e1c2e982"
+                "reference": "dd71b00b8dcc3cd775a1aaca31da7dffd66f6bd3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lokielse/omnipay-unionpay/zipball/f732c4add32a6be1e80958132e93a0b5e1c2e982",
-                "reference": "f732c4add32a6be1e80958132e93a0b5e1c2e982",
+                "url": "https://api.github.com/repos/lokielse/omnipay-unionpay/zipball/dd71b00b8dcc3cd775a1aaca31da7dffd66f6bd3",
+                "reference": "dd71b00b8dcc3cd775a1aaca31da7dffd66f6bd3",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1925,10 +1955,12 @@
                 ]
             },
             "require": {
-                "omnipay/common": "~2.0"
+                "omnipay/common": "^3.0",
+                "php-http/guzzle6-adapter": "*"
             },
             "require-dev": {
-                "omnipay/tests": "~2.0"
+                "omnipay/tests": "^3.0",
+                "squizlabs/php_codesniffer": "3.*"
             },
             "type": "library",
             "autoload": {
@@ -1950,29 +1982,32 @@
             "homepage": "https://github.com/lokielse/omnipay-unionpay",
             "keywords": [
                 "gateway",
+                "laravel",
                 "merchant",
                 "omnipay",
                 "pay",
                 "payment",
                 "purchase",
+                "sdk",
                 "union",
                 "unionpay",
+                "无跳转支付",
                 "银联"
             ],
-            "time": "2017-10-20T09:58:53+00:00"
+            "time": "2018-05-21T14:31:04+00:00"
         },
         {
             "name": "lokielse/omnipay-wechatpay",
-            "version": "v1.0.23",
+            "version": "v3.0.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lokielse/omnipay-wechatpay.git",
-                "reference": "d16156fc5086124cbaadbefa5b7e23e5d5fef757"
+                "reference": "228ffe3f73d217e1c08765e9838ed1bfa70a19b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lokielse/omnipay-wechatpay/zipball/d16156fc5086124cbaadbefa5b7e23e5d5fef757",
-                "reference": "d16156fc5086124cbaadbefa5b7e23e5d5fef757",
+                "url": "https://api.github.com/repos/lokielse/omnipay-wechatpay/zipball/228ffe3f73d217e1c08765e9838ed1bfa70a19b7",
+                "reference": "228ffe3f73d217e1c08765e9838ed1bfa70a19b7",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1982,10 +2017,12 @@
                 ]
             },
             "require": {
-                "omnipay/common": "~2.0"
+                "omnipay/common": "^3.0",
+                "php-http/guzzle6-adapter": "*"
             },
             "require-dev": {
-                "omnipay/tests": "~2.0"
+                "omnipay/tests": "^3.0",
+                "squizlabs/php_codesniffer": "3.*"
             },
             "type": "library",
             "autoload": {
@@ -2017,7 +2054,7 @@
                 "wechat",
                 "微信支付"
             ],
-            "time": "2018-01-25T02:37:49+00:00"
+            "time": "2018-11-02T06:03:53+00:00"
         },
         {
             "name": "markbaker/complex",
@@ -2196,6 +2233,94 @@
             ],
             "time": "2018-11-04T22:12:12+00:00"
         },
+        {
+            "name": "moneyphp/money",
+            "version": "v3.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/moneyphp/money.git",
+                "reference": "f6085de6c565e98d2f9a7311a605987b54e06d5e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/moneyphp/money/zipball/f6085de6c565e98d2f9a7311a605987b54e06d5e",
+                "reference": "f6085de6c565e98d2f9a7311a605987b54e06d5e",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "ext-json": "*",
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "cache/taggable-cache": "^0.4.0",
+                "doctrine/instantiator": "^1.0.5",
+                "ext-bcmath": "*",
+                "ext-gmp": "*",
+                "ext-intl": "*",
+                "florianv/exchanger": "^1.0",
+                "florianv/swap": "^3.0",
+                "leanphp/phpspec-code-coverage": "^3.0 || ^4.0",
+                "moneyphp/iso-currencies": "^3.0",
+                "php-http/message": "^1.4",
+                "php-http/mock-client": "^1.0.0",
+                "phpspec/phpspec": "^3.0",
+                "phpunit/phpunit": "^5.7 || ^6.4 || ^7.0",
+                "psr/cache": "^1.0",
+                "symfony/phpunit-bridge": "^4"
+            },
+            "suggest": {
+                "ext-bcmath": "Calculate without integer limits",
+                "ext-gmp": "Calculate without integer limits",
+                "ext-intl": "Format Money objects with intl",
+                "florianv/exchanger": "Exchange rates library for PHP",
+                "florianv/swap": "Exchange rates library for PHP",
+                "psr/cache-implementation": "Used for Currency caching"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Money\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                },
+                {
+                    "name": "Mathias Verraes",
+                    "email": "mathias@verraes.net",
+                    "homepage": "http://verraes.net"
+                },
+                {
+                    "name": "Frederik Bosch",
+                    "email": "f.bosch@genkgo.nl"
+                }
+            ],
+            "description": "PHP implementation of Fowler's Money pattern",
+            "homepage": "http://moneyphp.org",
+            "keywords": [
+                "Value Object",
+                "money",
+                "vo"
+            ],
+            "time": "2019-02-07T18:01:35+00:00"
+        },
         {
             "name": "monolog/monolog",
             "version": "1.24.0",
@@ -2443,16 +2568,16 @@
         },
         {
             "name": "omnipay/common",
-            "version": "2.5.2",
+            "version": "v3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/omnipay-common.git",
-                "reference": "54910f2ece6b1be64f5e53e2111dd1254d50ee49"
+                "reference": "66b7934abd2d54cde8b24c5d0b1a5e733339a7e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/omnipay-common/zipball/54910f2ece6b1be64f5e53e2111dd1254d50ee49",
-                "reference": "54910f2ece6b1be64f5e53e2111dd1254d50ee49",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-common/zipball/66b7934abd2d54cde8b24c5d0b1a5e733339a7e9",
+                "reference": "66b7934abd2d54cde8b24c5d0b1a5e733339a7e9",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -2462,61 +2587,34 @@
                 ]
             },
             "require": {
-                "guzzle/guzzle": "~3.9",
-                "php": ">=5.3.2",
-                "symfony/http-foundation": "~2.1|~3.0"
+                "moneyphp/money": "^3.1",
+                "php": "^5.6|^7",
+                "php-http/client-implementation": "^1",
+                "php-http/discovery": "^1.2.1",
+                "php-http/message": "^1.5",
+                "symfony/http-foundation": "^2.1|^3|^4"
             },
             "require-dev": {
-                "omnipay/tests": "~2.0",
-                "squizlabs/php_codesniffer": "~1.5"
+                "omnipay/tests": "^3",
+                "php-http/mock-client": "^1",
+                "phpro/grumphp": "^0.14",
+                "squizlabs/php_codesniffer": "^3"
+            },
+            "suggest": {
+                "league/omnipay": "The default Omnipay package provides a default HTTP Adapter."
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5.x-dev"
-                },
-                "gateways": [
-                    "AuthorizeNet_AIM",
-                    "AuthorizeNet_SIM",
-                    "Buckaroo_CreditCard",
-                    "Buckaroo_Ideal",
-                    "Buckaroo_PayPal",
-                    "CardSave",
-                    "Coinbase",
-                    "Dummy",
-                    "Eway_Rapid",
-                    "FirstData_Connect",
-                    "GoCardless",
-                    "Manual",
-                    "Migs_ThreeParty",
-                    "Migs_TwoParty",
-                    "Mollie",
-                    "MultiSafepay",
-                    "Netaxept",
-                    "NetBanx",
-                    "PayFast",
-                    "Payflow_Pro",
-                    "PaymentExpress_PxPay",
-                    "PaymentExpress_PxPost",
-                    "PayPal_Express",
-                    "PayPal_Pro",
-                    "Pin",
-                    "SagePay_Direct",
-                    "SagePay_Server",
-                    "SecurePay_DirectPost",
-                    "Stripe",
-                    "TargetPay_Directebanking",
-                    "TargetPay_Ideal",
-                    "TargetPay_Mrcash",
-                    "WorldPay"
-                ]
+                    "dev-master": "3.0.x-dev"
+                }
             },
             "autoload": {
-                "psr-0": {
-                    "Omnipay\\Common\\": "src/"
+                "psr-4": {
+                    "Omnipay\\Common\\": "src/Common"
                 },
                 "classmap": [
-                    "src/Omnipay/Omnipay.php"
+                    "src/Omnipay.php"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2528,9 +2626,20 @@
                     "name": "Adrian Macneil",
                     "email": "adrian@adrianmacneil.com"
                 },
+                {
+                    "name": "Barry vd. Heuvel",
+                    "email": "barryvdh@gmail.com"
+                },
                 {
                     "name": "Omnipay Contributors",
                     "homepage": "https://github.com/thephpleague/omnipay-common/contributors"
+                },
+                {
+                    "name": "Jason Judge",
+                    "email": "jason.judge@consil.co.uk"
+                },
+                {
+                    "name": "Del"
                 }
             ],
             "description": "Common components for Omnipay payment processing library",
@@ -2543,20 +2652,20 @@
                 "payment",
                 "purchase"
             ],
-            "time": "2016-11-07T06:10:23+00:00"
+            "time": "2018-05-15T08:36:43+00:00"
         },
         {
             "name": "overtrue/easy-sms",
-            "version": "1.1.8",
+            "version": "1.1.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/overtrue/easy-sms.git",
-                "reference": "078abd528fa0c7ca365ad7783a0fdf53143e11a5"
+                "reference": "25e8ec71696b72a3c9d500a36292ba1b5fee06c2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/overtrue/easy-sms/zipball/078abd528fa0c7ca365ad7783a0fdf53143e11a5",
-                "reference": "078abd528fa0c7ca365ad7783a0fdf53143e11a5",
+                "url": "https://api.github.com/repos/overtrue/easy-sms/zipball/25e8ec71696b72a3c9d500a36292ba1b5fee06c2",
+                "reference": "25e8ec71696b72a3c9d500a36292ba1b5fee06c2",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -2590,7 +2699,7 @@
                 }
             ],
             "description": "The easiest way to send short message.",
-            "time": "2019-01-11T02:05:23+00:00"
+            "time": "2019-02-27T13:36:46+00:00"
         },
         {
             "name": "overtrue/flysystem-qiniu",
@@ -2694,16 +2803,16 @@
         },
         {
             "name": "overtrue/socialite",
-            "version": "2.0.6",
+            "version": "2.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/overtrue/socialite.git",
-                "reference": "1b3bc250204df1e9edab44bbcbf856cc526fccb3"
+                "reference": "4014295c54cd8b3c2263ab5a2f47b7b5148babbf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/overtrue/socialite/zipball/1b3bc250204df1e9edab44bbcbf856cc526fccb3",
-                "reference": "1b3bc250204df1e9edab44bbcbf856cc526fccb3",
+                "url": "https://api.github.com/repos/overtrue/socialite/zipball/4014295c54cd8b3c2263ab5a2f47b7b5148babbf",
+                "reference": "4014295c54cd8b3c2263ab5a2f47b7b5148babbf",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -2746,7 +2855,7 @@
                 "wechat",
                 "weibo"
             ],
-            "time": "2019-02-15T08:08:22+00:00"
+            "time": "2019-03-05T05:45:34+00:00"
         },
         {
             "name": "overtrue/wechat",
@@ -2827,8 +2936,395 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
-                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "php": "^7"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*|5.*",
+                "vimeo/psalm": "^1"
+            },
+            "suggest": {
+                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com",
+                    "homepage": "https://paragonie.com"
+                }
+            ],
+            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+            "keywords": [
+                "csprng",
+                "polyfill",
+                "pseudorandom",
+                "random"
+            ],
+            "time": "2018-07-02T15:55:56+00:00"
+        },
+        {
+            "name": "php-http/discovery",
+            "version": "1.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/discovery.git",
+                "reference": "684855f2c2e9d0a61868b8f8d6bd0295c8a4b651"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/discovery/zipball/684855f2c2e9d0a61868b8f8d6bd0295c8a4b651",
+                "reference": "684855f2c2e9d0a61868b8f8d6bd0295c8a4b651",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "php": "^5.5 || ^7.0"
+            },
+            "conflict": {
+                "nyholm/psr7": "<1.0"
+            },
+            "require-dev": {
+                "php-http/httplug": "^1.0 || ^2.0",
+                "php-http/message-factory": "^1.0",
+                "phpspec/phpspec": "^2.4",
+                "puli/composer-plugin": "1.0.0-beta10"
+            },
+            "suggest": {
+                "php-http/message": "Allow to use Guzzle, Diactoros or Slim Framework factories",
+                "puli/composer-plugin": "Sets up Puli which is recommended for Discovery to work. Check http://docs.php-http.org/en/latest/discovery.html for more details."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Http\\Discovery\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                }
+            ],
+            "description": "Finds installed HTTPlug implementations and PSR-7 message factories",
+            "homepage": "http://php-http.org",
+            "keywords": [
+                "adapter",
+                "client",
+                "discovery",
+                "factory",
+                "http",
+                "message",
+                "psr7"
+            ],
+            "time": "2019-02-23T07:42:53+00:00"
+        },
+        {
+            "name": "php-http/guzzle6-adapter",
+            "version": "v2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/guzzle6-adapter.git",
+                "reference": "6074a4b1f4d5c21061b70bab3b8ad484282fe31f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/guzzle6-adapter/zipball/6074a4b1f4d5c21061b70bab3b8ad484282fe31f",
+                "reference": "6074a4b1f4d5c21061b70bab3b8ad484282fe31f",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "guzzlehttp/guzzle": "^6.0",
+                "php": "^7.1",
+                "php-http/httplug": "^2.0",
+                "psr/http-client": "^1.0"
+            },
+            "provide": {
+                "php-http/async-client-implementation": "1.0",
+                "php-http/client-implementation": "1.0",
+                "psr/http-client-implementation": "1.0"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "php-http/client-integration-tests": "^2.0",
+                "phpunit/phpunit": "^7.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Http\\Adapter\\Guzzle6\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                },
+                {
+                    "name": "David de Boer",
+                    "email": "david@ddeboer.nl"
+                }
+            ],
+            "description": "Guzzle 6 HTTP Adapter",
+            "homepage": "http://httplug.io",
+            "keywords": [
+                "Guzzle",
+                "http"
+            ],
+            "time": "2018-12-16T14:44:03+00:00"
+        },
+        {
+            "name": "php-http/httplug",
+            "version": "v2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/httplug.git",
+                "reference": "b3842537338c949f2469557ef4ad4bdc47b58603"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/httplug/zipball/b3842537338c949f2469557ef4ad4bdc47b58603",
+                "reference": "b3842537338c949f2469557ef4ad4bdc47b58603",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "php": "^7.0",
+                "php-http/promise": "^1.0",
+                "psr/http-client": "^1.0",
+                "psr/http-message": "^1.0"
+            },
+            "require-dev": {
+                "henrikbjorn/phpspec-code-coverage": "^1.0",
+                "phpspec/phpspec": "^2.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Http\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Eric GELOEN",
+                    "email": "geloen.eric@gmail.com"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                }
+            ],
+            "description": "HTTPlug, the HTTP client abstraction for PHP",
+            "homepage": "http://httplug.io",
+            "keywords": [
+                "client",
+                "http"
+            ],
+            "time": "2018-10-31T09:14:44+00:00"
+        },
+        {
+            "name": "php-http/message",
+            "version": "1.7.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/message.git",
+                "reference": "b159ffe570dffd335e22ef0b91a946eacb182fa1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/message/zipball/b159ffe570dffd335e22ef0b91a946eacb182fa1",
+                "reference": "b159ffe570dffd335e22ef0b91a946eacb182fa1",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "clue/stream-filter": "^1.4",
+                "php": "^5.4 || ^7.0",
+                "php-http/message-factory": "^1.0.2",
+                "psr/http-message": "^1.0"
+            },
+            "provide": {
+                "php-http/message-factory-implementation": "1.0"
+            },
+            "require-dev": {
+                "akeneo/phpspec-skip-example-extension": "^1.0",
+                "coduo/phpspec-data-provider-extension": "^1.0",
+                "ext-zlib": "*",
+                "guzzlehttp/psr7": "^1.0",
+                "henrikbjorn/phpspec-code-coverage": "^1.0",
+                "phpspec/phpspec": "^2.4",
+                "slim/slim": "^3.0",
+                "zendframework/zend-diactoros": "^1.0"
+            },
+            "suggest": {
+                "ext-zlib": "Used with compressor/decompressor streams",
+                "guzzlehttp/psr7": "Used with Guzzle PSR-7 Factories",
+                "slim/slim": "Used with Slim Framework PSR-7 implementation",
+                "zendframework/zend-diactoros": "Used with Diactoros Factories"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Http\\Message\\": "src/"
+                },
+                "files": [
+                    "src/filters.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                }
+            ],
+            "description": "HTTP Message related tools",
+            "homepage": "http://php-http.org",
+            "keywords": [
+                "http",
+                "message",
+                "psr-7"
+            ],
+            "time": "2018-11-01T09:32:41+00:00"
+        },
+        {
+            "name": "php-http/message-factory",
+            "version": "v1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/message-factory.git",
+                "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/message-factory/zipball/a478cb11f66a6ac48d8954216cfed9aa06a501a1",
+                "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "php": ">=5.4",
+                "psr/http-message": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                }
+            ],
+            "description": "Factory interfaces for PSR-7 HTTP Message",
+            "homepage": "http://php-http.org",
+            "keywords": [
+                "factory",
+                "http",
+                "message",
+                "stream",
+                "uri"
+            ],
+            "time": "2015-12-19T14:08:53+00:00"
+        },
+        {
+            "name": "php-http/promise",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/promise.git",
+                "reference": "dc494cdc9d7160b9a09bd5573272195242ce7980"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/promise/zipball/dc494cdc9d7160b9a09bd5573272195242ce7980",
+                "reference": "dc494cdc9d7160b9a09bd5573272195242ce7980",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -2837,36 +3333,41 @@
                     }
                 ]
             },
-            "require": {
-                "php": "^7"
-            },
             "require-dev": {
-                "phpunit/phpunit": "4.*|5.*",
-                "vimeo/psalm": "^1"
-            },
-            "suggest": {
-                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+                "henrikbjorn/phpspec-code-coverage": "^1.0",
+                "phpspec/phpspec": "^2.4"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Http\\Promise\\": "src/"
+                }
+            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
             "authors": [
                 {
-                    "name": "Paragon Initiative Enterprises",
-                    "email": "security@paragonie.com",
-                    "homepage": "https://paragonie.com"
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                },
+                {
+                    "name": "Joel Wurtz",
+                    "email": "joel.wurtz@gmail.com"
                 }
             ],
-            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+            "description": "Promise used for asynchronous HTTP requests",
+            "homepage": "http://httplug.io",
             "keywords": [
-                "csprng",
-                "polyfill",
-                "pseudorandom",
-                "random"
+                "promise"
             ],
-            "time": "2018-07-02T15:55:56+00:00"
+            "time": "2016-01-26T13:27:02+00:00"
         },
         {
             "name": "phpoffice/phpspreadsheet",
@@ -3131,6 +3632,61 @@
             ],
             "time": "2017-02-14T16:28:37+00:00"
         },
+        {
+            "name": "psr/http-client",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-client.git",
+                "reference": "496a823ef742b632934724bf769560c2a5c7c44e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/496a823ef742b632934724bf769560c2a5c7c44e",
+                "reference": "496a823ef742b632934724bf769560c2a5c7c44e",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "php": "^7.0",
+                "psr/http-message": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP clients",
+            "homepage": "https://github.com/php-fig/http-client",
+            "keywords": [
+                "http",
+                "http-client",
+                "psr",
+                "psr-18"
+            ],
+            "time": "2018-10-30T23:29:13+00:00"
+        },
         {
             "name": "psr/http-message",
             "version": "1.0.1",
@@ -3552,16 +4108,16 @@
         },
         {
             "name": "symfony/cache",
-            "version": "v4.2.3",
+            "version": "v4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "7c5b85bcc5f87dd7938123be12ce3323be6cde5a"
+                "reference": "b5c650406953f2f44a37c4f3ac66152fafc22c66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/7c5b85bcc5f87dd7938123be12ce3323be6cde5a",
-                "reference": "7c5b85bcc5f87dd7938123be12ce3323be6cde5a",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/b5c650406953f2f44a37c4f3ac66152fafc22c66",
+                "reference": "b5c650406953f2f44a37c4f3ac66152fafc22c66",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -3631,7 +4187,7 @@
                 "caching",
                 "psr6"
             ],
-            "time": "2019-01-31T15:08:08+00:00"
+            "time": "2019-02-23T15:17:42+00:00"
         },
         {
             "name": "symfony/contracts",
@@ -3707,84 +4263,18 @@
             ],
             "time": "2018-12-05T08:06:11+00:00"
         },
-        {
-            "name": "symfony/event-dispatcher",
-            "version": "v2.8.49",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "a77e974a5fecb4398833b0709210e3d5e334ffb0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a77e974a5fecb4398833b0709210e3d5e334ffb0",
-                "reference": "a77e974a5fecb4398833b0709210e3d5e334ffb0",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "^2.0.5|~3.0.0",
-                "symfony/dependency-injection": "~2.6|~3.0.0",
-                "symfony/expression-language": "~2.6|~3.0.0",
-                "symfony/stopwatch": "~2.3|~3.0.0"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\EventDispatcher\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony EventDispatcher Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-11-21T14:20:20+00:00"
-        },
         {
             "name": "symfony/http-foundation",
-            "version": "v3.4.22",
+            "version": "v4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "9a81d2330ea255ded06a69b4f7fb7804836e7a05"
+                "reference": "850a667d6254ccf6c61d853407b16f21c4579c77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9a81d2330ea255ded06a69b4f7fb7804836e7a05",
-                "reference": "9a81d2330ea255ded06a69b4f7fb7804836e7a05",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/850a667d6254ccf6c61d853407b16f21c4579c77",
+                "reference": "850a667d6254ccf6c61d853407b16f21c4579c77",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -3794,17 +4284,17 @@
                 ]
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/polyfill-mbstring": "~1.1",
-                "symfony/polyfill-php70": "~1.6"
+                "php": "^7.1.3",
+                "symfony/polyfill-mbstring": "~1.1"
             },
             "require-dev": {
-                "symfony/expression-language": "~2.8|~3.0|~4.0"
+                "predis/predis": "~1.0",
+                "symfony/expression-language": "~3.4|~4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -3831,7 +4321,7 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-27T09:04:14+00:00"
+            "time": "2019-02-26T08:03:39+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -3962,74 +4452,9 @@
             ],
             "time": "2018-09-21T13:07:52+00:00"
         },
-        {
-            "name": "symfony/polyfill-php70",
-            "version": "v1.10.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/6b88000cdd431cd2e940caa2cb569201f3f84224",
-                "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
-            },
-            "require": {
-                "paragonie/random_compat": "~1.0|~2.0|~9.99",
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.9-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php70\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2018-09-21T06:26:08+00:00"
-        },
         {
             "name": "symfony/process",
-            "version": "v4.2.3",
+            "version": "v4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
@@ -4151,7 +4576,7 @@
         },
         {
             "name": "symfony/var-exporter",
-            "version": "v4.2.3",
+            "version": "v4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-exporter.git",
@@ -4367,16 +4792,16 @@
         },
         {
             "name": "yiisoft/yii2",
-            "version": "2.0.16",
+            "version": "2.0.16.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/yiisoft/yii2-framework.git",
-                "reference": "789de9783d41e6ca10fffc3644a43a764f79b399"
+                "reference": "089198cced57c4b8c9545ddc56001a1bd114b2dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/789de9783d41e6ca10fffc3644a43a764f79b399",
-                "reference": "789de9783d41e6ca10fffc3644a43a764f79b399",
+                "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/089198cced57c4b8c9545ddc56001a1bd114b2dd",
+                "reference": "089198cced57c4b8c9545ddc56001a1bd114b2dd",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -4469,7 +4894,7 @@
                 "framework",
                 "yii2"
             ],
-            "time": "2019-01-30T23:54:16+00:00"
+            "time": "2019-02-28T07:03:06+00:00"
         },
         {
             "name": "yiisoft/yii2-authclient",
@@ -4661,12 +5086,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/yiisoft/yii2-elasticsearch.git",
-                "reference": "decb81344d1168d31e370fc03450ee4a344dade5"
+                "reference": "58466a83a86f3af3ad80949427592f4e55ff3c81"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-elasticsearch/zipball/decb81344d1168d31e370fc03450ee4a344dade5",
-                "reference": "decb81344d1168d31e370fc03450ee4a344dade5",
+                "url": "https://api.github.com/repos/yiisoft/yii2-elasticsearch/zipball/58466a83a86f3af3ad80949427592f4e55ff3c81",
+                "reference": "58466a83a86f3af3ad80949427592f4e55ff3c81",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -4708,7 +5133,7 @@
                 "search",
                 "yii2"
             ],
-            "time": "2019-01-17T21:39:05+00:00"
+            "time": "2019-02-22T21:34:45+00:00"
         },
         {
             "name": "yiisoft/yii2-httpclient",
@@ -5152,8 +5577,7 @@
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/twitter/typeahead.js/zipball/588440f66559714280628a4f9799f0c4eb880a4a",
-                "reference": "588440f66559714280628a4f9799f0c4eb880a4a",
-                "shasum": null
+                "reference": "588440f66559714280628a4f9799f0c4eb880a4a"
             },
             "require": {
                 "bower-asset/jquery": ">=1.7"
@@ -5162,16 +5586,16 @@
         },
         {
             "name": "codeception/base",
-            "version": "2.5.3",
+            "version": "2.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/base.git",
-                "reference": "ceff0b4fee4846b6bd8b5a37abbbb1acd6e78f58"
+                "reference": "41f2257227130faa1a43c476c72f8031f9504d7b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/base/zipball/ceff0b4fee4846b6bd8b5a37abbbb1acd6e78f58",
-                "reference": "ceff0b4fee4846b6bd8b5a37abbbb1acd6e78f58",
+                "url": "https://api.github.com/repos/Codeception/base/zipball/41f2257227130faa1a43c476c72f8031f9504d7b",
+                "reference": "41f2257227130faa1a43c476c72f8031f9504d7b",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -5254,20 +5678,20 @@
                 "functional testing",
                 "unit testing"
             ],
-            "time": "2019-02-02T16:29:38+00:00"
+            "time": "2019-02-20T21:29:36+00:00"
         },
         {
             "name": "codeception/phpunit-wrapper",
-            "version": "7.6.1",
+            "version": "7.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/phpunit-wrapper.git",
-                "reference": "ed4b12beb167dc2ecea293b4f6df6c20ce8d280f"
+                "reference": "ab04a956264291505ea84998f43cf91639b4575d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/ed4b12beb167dc2ecea293b4f6df6c20ce8d280f",
-                "reference": "ed4b12beb167dc2ecea293b4f6df6c20ce8d280f",
+                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/ab04a956264291505ea84998f43cf91639b4575d",
+                "reference": "ab04a956264291505ea84998f43cf91639b4575d",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -5278,13 +5702,13 @@
             },
             "require": {
                 "phpunit/php-code-coverage": "^6.0",
-                "phpunit/phpunit": ">=7.1 <7.6",
+                "phpunit/phpunit": "7.5.*",
                 "sebastian/comparator": "^3.0",
                 "sebastian/diff": "^3.0"
             },
             "require-dev": {
                 "codeception/specify": "*",
-                "vlucas/phpdotenv": "^2.4"
+                "vlucas/phpdotenv": "^3.0"
             },
             "type": "library",
             "autoload": {
@@ -5303,20 +5727,20 @@
                 }
             ],
             "description": "PHPUnit classes used by Codeception",
-            "time": "2019-01-13T10:34:39+00:00"
+            "time": "2019-02-26T20:35:32+00:00"
         },
         {
             "name": "codeception/stub",
-            "version": "2.0.4",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Stub.git",
-                "reference": "f50bc271f392a2836ff80690ce0c058efe1ae03e"
+                "reference": "853657f988942f7afb69becf3fd0059f192c705a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Stub/zipball/f50bc271f392a2836ff80690ce0c058efe1ae03e",
-                "reference": "f50bc271f392a2836ff80690ce0c058efe1ae03e",
+                "url": "https://api.github.com/repos/Codeception/Stub/zipball/853657f988942f7afb69becf3fd0059f192c705a",
+                "reference": "853657f988942f7afb69becf3fd0059f192c705a",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -5326,7 +5750,7 @@
                 ]
             },
             "require": {
-                "phpunit/phpunit": ">=4.8 <8.0"
+                "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3"
             },
             "type": "library",
             "autoload": {
@@ -5339,7 +5763,7 @@
                 "MIT"
             ],
             "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
-            "time": "2018-07-26T11:55:37+00:00"
+            "time": "2019-03-02T15:35:10+00:00"
         },
         {
             "name": "codeception/verify",
@@ -6124,16 +6548,16 @@
         },
         {
             "name": "phpunit/php-timer",
-            "version": "2.0.0",
+            "version": "2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f"
+                "reference": "8b389aebe1b8b0578430bda0c7c95a829608e059"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b8454ea6958c3dee38453d3bd571e023108c91f",
-                "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b389aebe1b8b0578430bda0c7c95a829608e059",
+                "reference": "8b389aebe1b8b0578430bda0c7c95a829608e059",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -6151,7 +6575,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
@@ -6175,7 +6599,7 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2018-02-01T13:07:23+00:00"
+            "time": "2019-02-20T10:12:59+00:00"
         },
         {
             "name": "phpunit/php-token-stream",
@@ -6234,16 +6658,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "7.5.5",
+            "version": "7.5.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "23a200a60552cb9ba483a8d1e106c70fb0be0bb9"
+                "reference": "09c85e14994df92e5ff1f5ec0b481bdb7d3d3df9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/23a200a60552cb9ba483a8d1e106c70fb0be0bb9",
-                "reference": "23a200a60552cb9ba483a8d1e106c70fb0be0bb9",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/09c85e14994df92e5ff1f5ec0b481bdb7d3d3df9",
+                "reference": "09c85e14994df92e5ff1f5ec0b481bdb7d3d3df9",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -6320,7 +6744,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2019-02-15T14:00:34+00:00"
+            "time": "2019-02-18T09:24:50+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -6956,16 +7380,16 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v4.2.3",
+            "version": "v4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "ee4462581eb54bf34b746e4a5d522a4f21620160"
+                "reference": "61d85c5af2fc058014c7c89504c3944e73a086f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/ee4462581eb54bf34b746e4a5d522a4f21620160",
-                "reference": "ee4462581eb54bf34b746e4a5d522a4f21620160",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/61d85c5af2fc058014c7c89504c3944e73a086f0",
+                "reference": "61d85c5af2fc058014c7c89504c3944e73a086f0",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -7015,20 +7439,20 @@
             ],
             "description": "Symfony BrowserKit Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-16T21:31:25+00:00"
+            "time": "2019-02-23T15:17:42+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v4.2.3",
+            "version": "v4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "1f0ad51dfde4da8a6070f06adc58b4e37cbb37a4"
+                "reference": "9dc2299a016497f9ee620be94524e6c0af0280a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/1f0ad51dfde4da8a6070f06adc58b4e37cbb37a4",
-                "reference": "1f0ad51dfde4da8a6070f06adc58b4e37cbb37a4",
+                "url": "https://api.github.com/repos/symfony/console/zipball/9dc2299a016497f9ee620be94524e6c0af0280a9",
+                "reference": "9dc2299a016497f9ee620be94524e6c0af0280a9",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -7093,11 +7517,11 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-25T14:35:16+00:00"
+            "time": "2019-02-23T15:17:42+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v4.2.3",
+            "version": "v4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
@@ -7156,16 +7580,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v4.2.3",
+            "version": "v4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "d8476760b04cdf7b499c8718aa437c20a9155103"
+                "reference": "53c97769814c80a84a8403efcf3ae7ae966d53bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/d8476760b04cdf7b499c8718aa437c20a9155103",
-                "reference": "d8476760b04cdf7b499c8718aa437c20a9155103",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/53c97769814c80a84a8403efcf3ae7ae966d53bb",
+                "reference": "53c97769814c80a84a8403efcf3ae7ae966d53bb",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -7215,20 +7639,90 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-16T20:35:37+00:00"
+            "time": "2019-02-23T15:17:42+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v4.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "3354d2e6af986dd71f68b4e5cf4a933ab58697fb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3354d2e6af986dd71f68b4e5cf4a933ab58697fb",
+                "reference": "3354d2e6af986dd71f68b4e5cf4a933ab58697fb",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "php": "^7.1.3",
+                "symfony/contracts": "^1.0"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<3.4"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "~3.4|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/expression-language": "~3.4|~4.0",
+                "symfony/stopwatch": "~3.4|~4.0"
+            },
+            "suggest": {
+                "symfony/dependency-injection": "",
+                "symfony/http-kernel": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony EventDispatcher Component",
+            "homepage": "https://symfony.com",
+            "time": "2019-02-23T15:17:42+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v4.2.3",
+            "version": "v4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "ef71816cbb264988bb57fe6a73f610888b9aa70c"
+                "reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/ef71816cbb264988bb57fe6a73f610888b9aa70c",
-                "reference": "ef71816cbb264988bb57fe6a73f610888b9aa70c",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/267b7002c1b70ea80db0833c3afe05f0fbde580a",
+                "reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -7270,20 +7764,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-16T20:35:37+00:00"
+            "time": "2019-02-23T15:42:05+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v4.2.3",
+            "version": "v4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "d461670ee145092b7e2a56c1da7118f19cadadb0"
+                "reference": "761fa560a937fd7686e5274ff89dcfa87a5047df"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/d461670ee145092b7e2a56c1da7118f19cadadb0",
-                "reference": "d461670ee145092b7e2a56c1da7118f19cadadb0",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/761fa560a937fd7686e5274ff89dcfa87a5047df",
+                "reference": "761fa560a937fd7686e5274ff89dcfa87a5047df",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -7335,7 +7829,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-16T20:35:37+00:00"
+            "time": "2019-02-23T15:17:42+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -7607,10 +8101,10 @@
     "stability-flags": {
         "yiisoft/yii2-elasticsearch": 20,
         "yiisoft/yii2-queue": 20,
-        "lokielse/omnipay-alipay": 20,
         "kartik-v/yii2-widget-datepicker": 20,
         "kartik-v/yii2-widget-select2": 20,
-        "kartik-v/yii2-widget-datetimepicker": 20
+        "kartik-v/yii2-widget-datetimepicker": 20,
+        "e282486518/yii2-console-migration": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
diff --git a/composer.phar b/composer.phar
index ba0824e62..b8ce13f23 100644
Binary files a/composer.phar and b/composer.phar differ
diff --git a/docs/guide-zh-CN/README.md b/docs/guide-zh-CN/README.md
index b8d5ecc71..3ce0e4f27 100644
--- a/docs/guide-zh-CN/README.md
+++ b/docs/guide-zh-CN/README.md
@@ -13,7 +13,6 @@
 
 - [目录结构](sys-catalog.md)
 - [开发规范](sys-exploit.md)
-- [系统常用](sys-method.md)
 - [全局说明](sys-global-description.md)
 - [表单控件](sys-widget.md)
 - [组件调用](sys-subassembly.md)
@@ -66,6 +65,7 @@
 - [StringHelper](helper-string.md) - 字符串辅助类
 - [UrlHelper](helper-url.md) - Url生成辅助类
 - RegularHelper - 正则验证辅助类
+- HashidsHelper - ID加密辅助类
 - UploadHelper - 上传辅助类
 - [ResultDataHelper](helper-result-data.md) - 格式化数据返回辅助类
 - [ExcelHelper](helper-excel.md) - Excel导入导出辅助类
diff --git a/docs/guide-zh-CN/addon-helper.md b/docs/guide-zh-CN/addon-helper.md
index a305ab9b9..779bf7231 100644
--- a/docs/guide-zh-CN/addon-helper.md
+++ b/docs/guide-zh-CN/addon-helper.md
@@ -20,26 +20,6 @@ Yii::$app->params['addon'];
 Yii::$app->params['addonInfo'];
 ```
 
-示例
-
-```
-Array
-(
-    [name] => RfExample
-    [oldRoute] => curd/index
-    [moduleId] => backend
-    [oldController] => curd
-    [oldAction] => index
-    [controller] => Curd
-    [action] => Index
-    [controllerName] => CurdController
-    [actionName] => actionIndex
-    [rootPath] => \addons\RfExample
-    [rootAbsolutePath] => E:\local\rageframe-advanced/addons/RfExample
-    [controllersPath] => \addons\RfExample\backend\controllers\CurdController
-)
-```
-
 #### 获取模块导航和菜单信息
 
 ```
diff --git a/docs/guide-zh-CN/helper-addon-auth.md b/docs/guide-zh-CN/helper-addon-auth.md
index e0f98e4e1..e91e90df9 100644
--- a/docs/guide-zh-CN/helper-addon-auth.md
+++ b/docs/guide-zh-CN/helper-addon-auth.md
@@ -30,7 +30,7 @@ AddonAuthHelper::verify($route);
 ```
 /**
  * 过滤自己拥有的权限
- * 传递权限数组返回自己拥有的权限
+ * 传递权限数组返回自己拥有的权限数组
  
  * @param array $route
  * @return array|bool
diff --git a/docs/guide-zh-CN/helper-auth.md b/docs/guide-zh-CN/helper-auth.md
index 4491aaac8..fb48c41d2 100644
--- a/docs/guide-zh-CN/helper-auth.md
+++ b/docs/guide-zh-CN/helper-auth.md
@@ -28,7 +28,7 @@ AuthHelper::verify($route);
 ```
 /**
  * 过滤自己拥有的权限
- * 传递权限数组返回自己拥有的权限
+ * 传递权限数组返回自己拥有的权限数组
  
  * @param array $route
  * @return array|bool
diff --git a/docs/guide-zh-CN/helper-html.md b/docs/guide-zh-CN/helper-html.md
index 4fa7b31d3..c3fbf46bf 100644
--- a/docs/guide-zh-CN/helper-html.md
+++ b/docs/guide-zh-CN/helper-html.md
@@ -63,7 +63,7 @@ HtmlHelper::whether(1);
 /**
  * 点击大图
  *
- * @param string $imgSrc
+ * @param string $imgSrc 图片地址
  * @param int $width 宽度 默认45px
  * @param int $height 高度 默认45px
  */
diff --git a/docs/guide-zh-CN/start-installation.md b/docs/guide-zh-CN/start-installation.md
index 6db7e6fd6..efcec1cee 100644
--- a/docs/guide-zh-CN/start-installation.md
+++ b/docs/guide-zh-CN/start-installation.md
@@ -12,7 +12,7 @@
 - PHP cURL 扩展
 - PHP OpenSSL 扩展
 - PHP fileinfo 拓展 素材管理模块需要用到
-- Mysql >= 5.7
+- Mysql >= 5.6
 - Apache 或 Nginx
 - Composer (用于管理第三方扩展包)
 - 安装CA证书 (windows开发环境下)
@@ -79,8 +79,8 @@ php composer.phar update
 
 后台地址：当前域名/backend
 
-微信地址：当前域名/wechat/
+微信地址：当前域名/wechat
 
-Api地址：当前域名/api/
+Api地址：当前域名/api
 
 
diff --git a/docs/guide-zh-CN/start-update-log.md b/docs/guide-zh-CN/start-update-log.md
index a823f0873..c415dc0fe 100644
--- a/docs/guide-zh-CN/start-update-log.md
+++ b/docs/guide-zh-CN/start-update-log.md
@@ -4,6 +4,21 @@
 > 创建一个Git版本库，并创建二个分支比如A、B，A分支默认为你的二开分支、B分支为你的版本库分支。  
 > 等需要升级的时候，把版本库分支(B)升级为最新的版本，然后切换到A分支，把B分支合并过来，解决掉合并冲突即可。
 
+### v2.2.32
+updated 2019.3.11
+
+- 增加: ID加密辅助类 HashidsHelper
+- 优化: 图片/文件选择和微信资源选择
+- 优化: 插件模块的应用入口生成二维码改为jq生成，加快生成速度
+- 修复: 卸载插件模块时未卸载规则关键字
+- 修复: 插件模块Url辅助类不支持 string 类型生成
+- 修复: js组件fancybox多图浏览时候动画失调
+- 修复: 数据迁移报错
+- 修复: api下用户信息 sex 字段未更改为 gender 字段的bug
+- 修复: 微信素材选择第一次可能会出现无法选中的情况
+- 修复: 公用支付扩展由于版本落后导致报错
+- 升级: Yii2版本到2.0.16.1
+
 ### v2.2.21
 updated 2019.2.18
 
diff --git a/docs/guide-zh-CN/sys-global-description.md b/docs/guide-zh-CN/sys-global-description.md
index 9c443a565..1cfebdd8f 100644
--- a/docs/guide-zh-CN/sys-global-description.md
+++ b/docs/guide-zh-CN/sys-global-description.md
@@ -5,12 +5,12 @@
 - 控制台
   - 数据迁移
   - 定时任务
-- 别名
-- 变量
-  - api
-  - 后台
-  - 微信
-  - 前台
+- 公用
+  - params 说明和注释
+- 后台
+  - params 说明和注释
+- api
+  - params 说明和注释
 
 ### 控制台
 
@@ -70,6 +70,315 @@ $schedule->command('send-message/index')->cron('* * * * *');
 
 更多使用文档：https://github.com/omnilight/yii2-scheduling
 
-### 别名
+### 公共
 
-> TODO
\ No newline at end of file
+##### params 说明和注释
+
+> 实际内容参考代码
+
+```
+return [
+    'adminEmail' => 'admin@example.com',
+    'supportEmail' => 'support@example.com',
+    'user.passwordResetTokenExpire' => 3600,
+
+    // 全局上传配置
+    'uploadConfig' => [
+        // 图片
+        'images' => [
+            'originalName' => false, // 是否保留原名
+            'fullPath' => true, // 是否开启返回完整的文件路径
+            'takeOverUrl' => '', // 配置后，接管所有的上传地址
+            'drive' => 'local', // 默认本地 可修改 qiniu/oss 上传
+            'maxSize' => 1024 * 1024 * 2,// 图片最大上传大小,默认2M
+            'extensions' => ["png", "jpg", "jpeg", "gif", "bmp"],// 可上传图片后缀不填写即为不限
+            'path' => 'images/', // 图片创建路径
+            'subName' => 'Y/m/d', // 图片上传子目录规则
+            'prefix' => 'image_', // 图片名称前缀
+            'compress' => false, // 是否开启压缩
+            'compressibility' => [ // 100不压缩 值越大越清晰 注意先后顺序
+                1024 * 100 => 100, // 0 - 100k 内不压缩
+                1024 * 1024 => 30, // 100k - 1M 区间压缩质量到30
+                1024 * 1024 * 2  => 20, // 1M - 2M 区间压缩质量到20
+                1024 * 1024 * 1024  => 10, // 2M - 1G 区间压缩质量到20
+            ],
+        ],
+        // 视频
+        'videos' => [
+            'originalName' => true, // 是否保留原名
+            'fullPath' => true, // 是否开启返回完整的文件路径
+            'takeOverUrl' => '', // 配置后，接管所有的上传地址
+            'drive' => 'local', // 默认本地 可修改 qiniu/oss 上传
+            'maxSize' => 1024 * 1024 * 10,// 最大上传大小,默认10M
+            'extensions' => ['mp4'],// 可上传文件后缀不填写即为不限
+            'path' => 'videos/',// 创建路径
+            'subName' => 'Y/m/d',// 上传子目录规则
+            'prefix' => 'video_',// 名称前缀
+        ],
+        // 语音
+        'voices' => [
+            'originalName' => true, // 是否保留原名
+            'fullPath' => true, // 是否开启返回完整的文件路径
+            'takeOverUrl' => '', // 配置后，接管所有的上传地址
+            'drive' => 'local', // 默认本地 可修改 qiniu/oss 上传
+            'maxSize' => 1024 * 1024 * 50,// 最大上传大小,默认50M
+            'extensions' => ['amr', 'mp3'],// 可上传文件后缀不填写即为不限
+            'path' => 'voices/',// 创建路径
+            'subName' => 'Y/m/d',// 上传子目录规则
+            'prefix' => 'voice_',// 名称前缀
+        ],
+        // 文件
+        'files' => [
+            'originalName' => true, // 是否保留原名
+            'fullPath' => true, // 是否开启返回完整的文件路径
+            'takeOverUrl' => '', // 配置后，接管所有的上传地址
+            'drive' => 'local', // 默认本地 可修改 qiniu/oss 上传
+            'maxSize' => 1024 * 1024 * 50,// 最大上传大小,默认50M
+            'extensions' => [],// 可上传文件后缀不填写即为不限
+            'path' => 'files/',// 创建路径
+            'subName' => 'Y/m/d',// 上传子目录规则
+            'prefix' => 'file_',// 名称前缀
+        ],
+        // 缩略图
+        'thumb' => [
+            'path' => 'thumb/',// 图片创建路径
+        ],
+    ],
+
+    /** ------ 微信配置 ------ **/
+
+    // 微信配置 具体可参考EasyWechat
+    'wechatConfig' => [],
+    // 微信支付配置 具体可参考EasyWechat
+    'wechatPaymentConfig' => [],
+    // 微信小程序配置 具体可参考EasyWechat
+    'wechatMiniProgramConfig' => [],
+    // 微信开放平台第三方平台配置 具体可参考EasyWechat
+    'wechatOpenPlatformConfig' => [],
+    // 微信企业微信配置 具体可参考EasyWechat
+    'wechatWorkConfig' => [],
+    // 微信企业微信开放平台 具体可参考EasyWechat
+    'wechatOpenWorkConfig' => [],
+
+    /** ------ 微信自定义接口配置------------------- **/
+
+    'userApiPath' => Yii::getAlias('@root') . '/backend/modules/wechat/userapis', // 自定义接口路径
+    'userApiNamespace' => '\backend\modules\wechat\userapis', // 命名空间
+    'userApiCachePrefixKey' => 'reply:user-api:', // 缓存前缀
+];
+```
+
+### 后台
+
+##### params 说明和注释
+
+> 实际内容参考代码
+
+```
+return [
+    'adminEmail' => 'admin@example.com',
+    'adminAcronym' => 'RF',
+    'adminTitle' => 'RageFrame',
+
+    /** ------ 总管理员配置 ------ **/
+    'adminAccount' => 1,// 系统管理员账号id
+
+    /** ------ 日志记录 ------ **/
+    'user.log' => true,
+    'user.log.level' => ['error'], // 级别 ['info', 'warning', 'error']
+    'user.log.noPostData' => [ // 安全考虑,不接收Post存储到日志的路由
+        'app-backend/site/login',
+        'sys/manager/up-password',
+        'sys/manager/ajax-edit',
+        'member/member/ajax-edit',
+    ],
+    'user.log.except.code' => [], // 不记录的code
+
+    /** ------ 开发者信息 ------ **/
+    'exploitDeveloper' => '简言',
+    'exploitFullName' => 'RageFrame应用开发引擎',
+    'exploitOfficialWebsite' => '<a href="http://www.rageframe.com" target="_blank">www.rageframe.com</a>',
+    'exploitGitHub' => '<a href="https://github.com/jianyan74/rageframe2" target="_blank">https://github.com/jianyan74/rageframe2</a>',
+
+    /** ------ 备份配置配置 ------ **/
+    'dataBackupPath' => Yii::getAlias('@root') . '/common/backup', // 数据库备份根路径
+    'dataBackPartSize' => 20971520,// 数据库备份卷大小
+    'dataBackCompress' => 1,// 压缩级别
+    'dataBackCompressLevel' => 9,// 数据库备份文件压缩级别
+    'dataBackLock' => 'backup.lock',// 数据库备份缓存文件名
+
+    /**
+     * 不需要验证的路由全称
+     *
+     * 注意: 前面以绝对路径/为开头
+     */
+    'noAuthRoute' => [
+        '/main/index',// 系统主页
+        '/main/system',// 系统首页
+        '/ueditor/index',// 百度编辑器配置及上传
+        '/menu-provinces/index',// 微信个性化菜单省市区
+        '/wechat/common/select-news',// 微信自动回复获取图文
+        '/wechat/common/select-attachment',// 微信自动回复获取图片/视频/
+        '/wechat/analysis/image',// 微信显示素材图片
+        '/wechat/qrcode/qr',// 二维码管理的二维码
+    ],
+
+    'isMobile' => false,
+
+    /** ------ 配置文本类型 ------ **/
+    'configTypeList' => [
+        'text' => "文本框",
+        'password' => "密码框",
+        'secretKeyText' => "密钥文本框",
+        'textarea' => "文本域",
+        'date' => "日期",
+        'time' => "时间",
+        'datetime' => "日期时间",
+        'dropDownList' => "下拉文本框",
+        'radioList' => "单选按钮",
+        'checkboxList' => "复选框",
+        'baiduUEditor' => "百度编辑器",
+        'image' => "图片上传",
+        'images' => "多图上传",
+        'file' => "文件上传",
+        'files' => "多文件上传",
+    ],
+
+    /** ------ 插件类型 ------ **/
+    'addonsGroup' => [
+        'plug' => [
+            'name' => 'plug',
+            'title' => '功能扩展',
+            'icon' => 'fa fa-puzzle-piece',
+        ],
+        'business' => [
+            'name' => 'business',
+            'title' => '主要业务',
+            'icon' => 'fa fa-random',
+        ],
+        'customer' => [
+            'name' => 'customer',
+            'title' => '客户关系',
+            'icon' => 'fa fa-rocket',
+        ],
+        'activity' => [
+            'name' => 'activity',
+            'title' => '营销及活动',
+            'icon' => 'fa fa-tachometer',
+        ],
+        'services' => [
+            'name' => 'services',
+            'title' => '常用服务及工具',
+            'icon' => 'fa fa-magnet',
+        ],
+        'biz' => [
+            'name' => 'biz',
+            'title' => '行业解决方案',
+            'icon' => 'fa fa-diamond',
+        ],
+        'h5game' => [
+            'name' => 'h5game',
+            'title' => 'H5游戏',
+            'icon' => 'fa fa-gamepad',
+        ],
+    ],
+
+    /** ------ 微信配置-------------------**/
+
+    // 素材类型
+    'wechatMediaType' => [
+        'news'  => '微信图文',
+        'image' => '图片',
+        'voice' => '语音',
+        'video' => '视频',
+    ],
+
+    // 微信级别
+    'wechatLevel' => [
+        '1' => '普通订阅号',
+        '2' => '普通服务号',
+        '3' => '认证订阅号',
+        '4' => '认证服务号/认证媒体/政府订阅号',
+    ],
+
+    /** ------ 微信个性化菜单 ------ **/
+
+    // 性别
+    'individuationMenuSex' => [
+        '' => '不限',
+        1 => '男',
+        2 => '女',
+    ],
+
+    // 客户端版本
+    'individuationMenuClientPlatformType' => [
+        '' => '不限',
+        1 => 'IOS(苹果)',
+        2 => 'Android(安卓)',
+        3 => 'Others(其他)',
+    ],
+
+    // 语言
+    'individuationMenuLanguage' => [
+        '' => '不限',
+        'zh_CN' => '简体中文',
+        'zh_TW' => '繁体中文TW',
+        'zh_HK' => '繁体中文HK',
+        'en' => '英文',
+        'id' => '印尼',
+        'ms' => '马来',
+        'es' => '西班牙',
+        'ko' => '韩国',
+        'it' => '意大利',
+        'ja' => '日本',
+        'pl' => '波兰',
+        'pt' => '葡萄牙',
+        'ru' => '俄国',
+        'th' => '泰文',
+        'vi' => '越南',
+        'ar' => '阿拉伯语',
+        'hi' => '北印度',
+        'he' => '希伯来',
+        'tr' => '土耳其',
+        'de' => '德语',
+        'fr' => '法语',
+    ],
+];
+```
+### api
+
+##### params 说明和注释
+
+> 实际内容参考代码
+
+```
+return [
+    /** ------ 日志记录 ------ **/
+    'user.log' => true,
+    'user.log.level' => YII_DEBUG ? ['info', 'warning', 'error'] : ['warning', 'error'], // 级别 ['info', 'warning', 'error']
+    'user.log.noPostData' => [ // 安全考虑,不接收Post存储到日志的路由
+        'v1/site/login',
+    ],
+    'user.log.except.code' => [], // 不记录的code
+    
+    /** ------ token相关 ------ **/
+    
+    // token有效期是否验证 默认开启验证
+    'user.accessTokenValidity' => true,
+    // token有效期 默认 2 小时
+    'user.accessTokenExpire' => 2 * 60 * 60,
+    // refresh token有效期是否验证 默认开启验证
+    'user.refreshTokenValidity' => true,
+    // refresh token有效期 默认30天
+    'user.refreshTokenExpire' => 30 * 24 * 60 * 60,
+    // 签名验证默认关闭验证，如果开启需了解签名生成及验证
+    'user.httpSignValidity' => false,
+    // 签名授权公钥秘钥
+    'user.httpSignAccount' => [
+        'doormen' => 'e3de3825cfbf',
+    ],
+
+    // 默认分页数量
+    'user.pageSize' => 10,
+];
+```
\ No newline at end of file
diff --git a/docs/guide-zh-CN/sys-js-method.md b/docs/guide-zh-CN/sys-js-method.md
index a892fda71..da677f4a3 100644
--- a/docs/guide-zh-CN/sys-js-method.md
+++ b/docs/guide-zh-CN/sys-js-method.md
@@ -51,7 +51,7 @@ rfSuccess(title,text)
 ```
 <tr id = "<?= $model['id']?>">
     <td>
-        <input type="text" class="form-control" value="<?= $model['sort']?>" onblur="rfSort(this)">
+         <?= \common\helpers\HtmlHelper::sort($model['sort']); ?>
     </td>
     <td>
         <?= \common\helpers\HtmlHelper::status($model['status']); ?>
diff --git a/docs/guide-zh-CN/sys-method.md b/docs/guide-zh-CN/sys-method.md
deleted file mode 100644
index 40fae330f..000000000
--- a/docs/guide-zh-CN/sys-method.md
+++ /dev/null
@@ -1,92 +0,0 @@
-## 系统常用
-
-目录
-
-- 公用方法
-  - 获取单个配置信息
-  - 获取全部配置信息
-  - 打印调试
-  - 行为日志记录
-  - 微信接口验证及报错获取
-  - 解析 model 报错
-- 控制器底层方法
-  - 解析 model 报错
-- 全局函数
-  - 打印调试
-
-### 公用方法
-
-##### 获取单个配置信息
-
-```
-// 注意$fildName 为你的配置标识,默认从缓存读取
-Yii::$app->debris->config($fildName);
-
-// 强制不从缓存读取
-Yii::$app->debris->config($fildName, true);
-```
-
-##### 获取全部配置信息
-
-```
-// 注意默认从缓存读取
-Yii::$app->debris->configAll();
-
-// 强制不从缓存读取
-Yii::$app->debris->configAll(true);
-```
-
-##### 打印调试
-
-```
-Yii::$app->debris->p();
-```
-
-##### 行为日志记录
-
-```
-/**
- * 行为日志
- *
- * @param string $behavior 行为标识
- * @param string $remark 备注 注意长度为255
- * @param bool $noRecordData 是否记录 post 数据 [true||false]
- * @throws \yii\base\InvalidConfigException
- */
-Yii::$app->services->sys->log($behavior, $remark, $noRecordData)
-```
-
-##### 微信接口验证及报错
-
-```
-// 默认直接报错
-Yii::$app->debris->getWechatError($message);
-
-// 如果想不直接报错并返回报错信息
-$error = Yii::$app->debris->getWechatError($message, false);
-```
-
-##### 解析 model 报错
-
-```
-// 注意 $firstErrors 为 $model->getFirstErrors();
-Yii::$app->debris->analyErr($firstErrors);
-```
-
-### 控制器底层方法
-
-##### 解析 model 报错
-
-```
-// 注意 $firstErrors 为 $model->getFirstErrors();
-$this->analyErr($firstErrors);
-```
-
-### 全局函数
-
-##### 打印调试
-
-```
-// 注意只能在开发模式下使用，生产模式没有此函数
-p($array);
-```
diff --git a/docs/guide-zh-CN/sys-restful-api.md b/docs/guide-zh-CN/sys-restful-api.md
index 433651ec8..991305adc 100644
--- a/docs/guide-zh-CN/sys-restful-api.md
+++ b/docs/guide-zh-CN/sys-restful-api.md
@@ -20,23 +20,7 @@
 
 ### 速率和参数配置
 
-> 可自行修改 `api/config/params.php` 配置
-
-```
-return [
-    // 是否开启api log 日志记录
-    'user.log' => true,
-    'user.log.noPostData' => [ // 安全考虑，不接收Post存储到日志的路由
-        'v1/site/login',
-    ],
-    // token有效期是否验证 默认不验证
-    'user.accessTokenValidity' => false,
-    // api接口token有效期 默认2天
-    'user.accessTokenExpire' => 2 * 24 * 3600,
-    // 默认分页数量
-    'user.pageSize' => 10,
-];
-```
+> 可自行修改 `common\models\common\RateLimit` 配置
 
 ### 不需要速率控制设置
 
diff --git a/docs/guide-zh-CN/sys-subassembly.md b/docs/guide-zh-CN/sys-subassembly.md
index 4cb116a76..da42e7818 100644
--- a/docs/guide-zh-CN/sys-subassembly.md
+++ b/docs/guide-zh-CN/sys-subassembly.md
@@ -2,12 +2,78 @@
 
 目录
 
+- 基本组件
+  - 获取单个配置信息
+  - 获取全部配置信息
+  - 打印调试
+  - 行为日志记录
+  - 微信接口验证及报错获取
+  - 解析 model 报错
 - 生成二维码
 - IP地址转地区
 - Curl
 - 中文转拼音
 - Glide
 
+### 基本组件
+
+##### 获取单个配置信息
+
+```
+// 注意$fildName 为你的配置标识,默认从缓存读取
+Yii::$app->debris->config($fildName);
+
+// 强制不从缓存读取
+Yii::$app->debris->config($fildName, true);
+```
+
+##### 获取全部配置信息
+
+```
+// 注意默认从缓存读取
+Yii::$app->debris->configAll();
+
+// 强制不从缓存读取
+Yii::$app->debris->configAll(true);
+```
+
+##### 打印调试
+
+```
+Yii::$app->debris->p();
+```
+
+##### 行为日志记录
+
+```
+/**
+ * 行为日志
+ *
+ * @param string $behavior 行为标识
+ * @param string $remark 备注 注意长度为255
+ * @param bool $noRecordData 是否记录 post 数据 [true||false]
+ * @throws \yii\base\InvalidConfigException
+ */
+Yii::$app->services->sys->log($behavior, $remark, $noRecordData)
+```
+
+##### 微信接口验证及报错
+
+```
+// 默认直接报错
+Yii::$app->debris->getWechatError($message);
+
+// 如果想不直接报错并返回报错信息
+$error = Yii::$app->debris->getWechatError($message, false);
+```
+
+##### 解析 model 报错
+
+```
+// 注意 $firstErrors 为 $model->getFirstErrors();
+Yii::$app->debris->analyErr($firstErrors);
+```
+
 ### 生成二维码
 
 ```
diff --git a/docs/guide-zh-CN/sys-widget.md b/docs/guide-zh-CN/sys-widget.md
index aad506ee5..cb2351b6c 100644
--- a/docs/guide-zh-CN/sys-widget.md
+++ b/docs/guide-zh-CN/sys-widget.md
@@ -112,7 +112,7 @@ HTML;
 
 ### 图片上传控件
 
-> 注意OSS/七牛暂不支持切片和缩略图操作
+> 注意OSS/七牛暂不支持切片和缩略图操作，以下是完整案例
 
 ```
 <?= $form->field($model, 'cover')->widget('common\widgets\webuploader\Images', [
@@ -134,7 +134,7 @@ HTML;
                     'height' => 200,
                 ],
             ],
-            'drive' => 'local',// 默认本地 qiniu/oss 上传
+            'drive' => 'local',// 默认本地 支持 qiniu/oss 上传
         ],
          'chunked' => false,// 开启分片上传
          'chunkSize' => 512 * 1024,// 分片大小
diff --git a/environments/dev/storage/web/index.php b/environments/dev/storage/web/index.php
new file mode 100644
index 000000000..229d90059
--- /dev/null
+++ b/environments/dev/storage/web/index.php
@@ -0,0 +1,25 @@
+<?php
+defined('YII_DEBUG') or define('YII_DEBUG', true);
+defined('YII_ENV') or define('YII_ENV', 'dev');
+
+require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../vendor/yiisoft/yii2/Yii.php';
+require __DIR__ . '/../../common/config/bootstrap.php';
+
+$config = yii\helpers\ArrayHelper::merge(
+    require __DIR__ . '/../../common/config/main.php',
+    require __DIR__ . '/../../common/config/main-local.php',
+    require __DIR__ . '/../../storage/config/main.php'
+);
+
+/**
+ * 打印
+ *
+ * @param $array
+ */
+function p($array){
+    echo "<pre>";
+    print_r($array);
+}
+
+(new yii\web\Application($config))->run();
diff --git a/environments/dev/storage/web/robots.txt b/environments/dev/storage/web/robots.txt
new file mode 100644
index 000000000..77470cb39
--- /dev/null
+++ b/environments/dev/storage/web/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
\ No newline at end of file
diff --git a/environments/prod/storage/web/index.php b/environments/prod/storage/web/index.php
new file mode 100644
index 000000000..df108856f
--- /dev/null
+++ b/environments/prod/storage/web/index.php
@@ -0,0 +1,15 @@
+<?php
+defined('YII_DEBUG') or define('YII_DEBUG', false);
+defined('YII_ENV') or define('YII_ENV', 'prod');
+
+require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../vendor/yiisoft/yii2/Yii.php';
+require __DIR__ . '/../../common/config/bootstrap.php';
+
+$config = yii\helpers\ArrayHelper::merge(
+    require __DIR__ . '/../../common/config/main.php',
+    require __DIR__ . '/../../common/config/main-local.php',
+    require __DIR__ . '/../../storage/config/main.php'
+);
+
+(new yii\web\Application($config))->run();
diff --git a/environments/prod/storage/web/robots.txt b/environments/prod/storage/web/robots.txt
new file mode 100644
index 000000000..14267e903
--- /dev/null
+++ b/environments/prod/storage/web/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Allow: /
\ No newline at end of file
diff --git a/web/backend/resources/dist/css/rageframe.css b/web/backend/resources/dist/css/rageframe.css
index fac858291..148e56113 100644
--- a/web/backend/resources/dist/css/rageframe.css
+++ b/web/backend/resources/dist/css/rageframe.css
@@ -117,7 +117,7 @@ nav.page-tabs .page-tabs-content {
     margin: 20px 0;
 }
 
-/* MARGINS & PADDINGS */
+/* 内边距 & 外边距 */
 
 .p-xxs {
     padding: 5px;
@@ -605,14 +605,11 @@ nav.page-tabs .page-tabs-content {
     color: #f6f6f6;
 }
 
-.rfTopMenu {
+.rfTopMenu,
+.pointer{
     cursor:pointer;
 }
 
-.rfAddonMenu {
-    padding: 15px 20px 10px 10px;
-}
-
 .rfAddonMenu .nav > li > a {
     padding: 8px 15px;
     font-size: 14px;
@@ -626,6 +623,11 @@ nav.page-tabs .page-tabs-content {
     font-size: 16px;
 }
 
+.rfAddonAddMenu{
+    margin-left:-15px;
+    margin-bottom:10px;
+}
+
 .rfHeaderFont,
 .rfHeaderFont:hover {
      padding-right: 7px;
@@ -636,6 +638,11 @@ nav.page-tabs .page-tabs-content {
     font-size: 10px;
 }
 
+.normalPaddingRight .active {
+    border: 2px solid #1ab394 !important;
+    box-sizing: border-box;
+}
+
 .rf-auto {
     overflow: auto;
 }
@@ -663,17 +670,6 @@ nav.page-tabs .page-tabs-content {
     height: 100px;
 }
 
-.rf-qr-p {
-    padding:6px;
-    border:1px solid #CCC;
-    border-radius:4px;
-}
-
-.rule-ajax-img:hover{
-    background-color:#000;
-    background: rgba(0, 0, 0, 0.5);
-}
-
 .rule-photo-list{
     margin: 0;
 }
@@ -916,7 +912,7 @@ nav.page-tabs .page-tabs-content {
 
 .box-body,
 .box-footer{
-    padding:  10px 20px;
+    padding:  20px 20px;
 }
 
 .box-header{
@@ -1033,6 +1029,24 @@ a:hover, a:active, a:focus {
     color: rgb(62, 142, 247);
 }
 
+.table-bordered {
+    border: 1px solid #e7eaec;
+}
+
+.table-bordered > thead > tr > th, .table-bordered > tbody > tr > th, .table-bordered > tfoot > tr > th, .table-bordered > thead > tr > td, .table-bordered > tbody > tr > td, .table-bordered > tfoot > tr > td {
+    border: 1px solid #e7eaec;
+    border-top-color: rgb(213, 212, 212);
+}
+
+.skin-blue-light .sidebar-menu > li > a,
+.skin-black-light .sidebar-menu > li > a,
+.skin-purple-light .sidebar-menu > li > a,
+.skin-green-light .sidebar-menu > li > a,
+.skin-red-light .sidebar-menu > li > a,
+.skin-yellow-light .sidebar-menu > li > a{
+    font-weight: 500;
+}
+
 /* ====== 替换其他组件样式 ====== */
 
 .select2-container .select2-selection--single .select2-selection__rendered {
@@ -1063,7 +1077,7 @@ a:hover, a:active, a:focus {
 /* ====== 替换基础样式 ====== */
 
 .modal-body {
-    padding: 20px 30px 10px 30px;
+    padding: 20px 30px;
     overflow: auto;
 }
 
@@ -1104,6 +1118,11 @@ body {
     vertical-align: middle;
 }
 
+.pagination {
+    margin: 0;
+    border-radius: 0;
+}
+
 .pagination > .active > a, .pagination > .active > a:focus, .pagination > .active > a:hover, .pagination > .active > span, .pagination > .active > span:focus, .pagination > .active > span:hover {
     background-color: #62a8ea;
     border-color: #62a8ea;
@@ -1116,3 +1135,368 @@ body {
 .text-success {
     color: #18bc9c;
 }
+
+/**  关于素材库/自定义菜单 **/
+
+/** ====================================重载==================================== **/
+a {
+    color: inherit;
+}
+/** ====================================间距==================================== **/
+
+.postToolbar{
+    font-size: 15px;
+}
+
+/*!*小盒子内容区的样式，display:inline-block：实现 效果*!*/
+.inlineBlockContainer .normalPaddingRight{
+    width:100%;
+    display:inline-block
+}
+
+.separateFromNextBlock {
+    margin-bottom: 10px;
+}
+.separateFromNextBlockFar {
+    margin-bottom: 20px;
+}
+.separateFromNextInlineBlock {
+    margin-right: 10px;
+}
+.separateFromNextInlineBlockFurther {
+    margin-right: 20px;
+}
+.separateChildrenWithLine > *:not(:last-child) {
+    border-bottom: 1px solid #e7eaec;
+}
+.separateChildren.further > * {
+    margin-bottom: 20px;
+}
+.separateInlineChildren > *:not(:last-child) {
+    margin-right: 10px;
+}
+.separateInlineChildren.includeLastOne > *:last-child {
+    margin-right: 10px;
+}
+.separateInlineChildren.closer > * {
+    margin-right: 5px;
+}
+.separateInlineChildren.closer.includeLastOne > *:last-child {
+    margin-right: 5px;
+}
+
+.normalPaddingTop {
+    padding-top: 5px;
+}
+
+.normalPadding {
+    padding: 10px;
+}
+.normalPaddingJustH {
+    padding-left: 10px;
+    padding-right: 10px;
+}
+.normalPaddingJustV {
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+.normalPaddingRight {
+    padding-right: 10px;
+}
+.noPaddingH {
+    padding-left: 0;
+    padding-right: 0;
+}
+.noPaddingV {
+    padding-top: 0;
+    padding-bottom: 0;
+}
+.farPadding {
+    padding: 20px;
+}
+.farPaddingJustH {
+    padding-left: 20px;
+    padding-right: 20px;
+}
+.farPaddingJustV {
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
+/** ====================================边框==================================== **/
+.borderColorGray {
+    border: 1px solid #e7eaec !important;
+}
+.borderBottomColorGray {
+    border-bottom: 1px solid #e7eaec !important;
+}
+.borderRightColorGray {
+    border-right: 1px solid #e7eaec !important;
+}
+/** ====================================布局==================================== **/
+.displayAsBlock {
+    display: block;
+}
+.displayAsInlineBlock {
+    display: inline-block;
+}
+.relativePosition {
+    position: relative;
+}
+.absolutePosition {
+    position: absolute;
+}
+.fullWidth {
+    width: 100%;
+}
+.fullHeight {
+    height: 100%;
+}
+.maxWidthFull {
+    max-width: 100%;
+}
+.maxHeightFull {
+    max-height: 100%;
+}
+.absoluteFullSize {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    top: 0;
+}
+.hAbsoluteCenter {
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
+}
+.vAbsoluteMiddle {
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+}
+.absoluteCenter {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translateX(-50%) translateY(-50%);
+}
+/** 伸缩盒子布局 **/
+.flex-row {
+    display: flex;
+}
+.flex-row > * {
+    display: block;
+}
+.flex-col {
+    flex: 1;
+}
+.flex-hAlignCenter {
+    justify-content: center;
+}
+.flex-hAlignBalance {
+    justify-content: space-between;
+}
+.flex-autoWidthRowElem {
+    flex: initial;
+    width: auto;
+}
+.flex-vAlignCenter {
+    align-items: center;
+}
+.flex-vAlignEnd {
+    align-items: flex-end;
+}
+.flex-vDirection {
+    flex-direction: column;
+}
+.hAlignCenter {
+    text-align: center;
+}
+.overflowHidden {
+    overflow: hidden;
+}
+.inlineBlockContainer {
+    font-size: 0;
+}
+.inlineBlockContainer > * {
+    font-size: 13px;
+    display: inline-block;
+    box-sizing: border-box;
+}
+.inlineBlockContainer.vAlignTop > * {
+    vertical-align: top;
+}
+.inlineBlockContainer.col2 > * {
+    width: 50%;
+}
+.inlineBlockContainer.col3 > * {
+    width: 33.3%;
+}
+.inlineBlockContainer.col4 > * {
+    width: 25%;
+}
+.inlineBlockContainer.col5 > * {
+    width: 20%;
+}
+/** ==================================背景================================== **/
+.whiteBG {
+    background-color: white;
+}
+.backgroundCover {
+    background-size: cover;
+    background-position: center center;
+}
+.halfOpacityBlackBG {
+    background-color: rgba(0, 0, 0, 0.5);
+}
+/** ==================================文本================================== **/
+.fontSizeXS {
+    font-size: 12px !important;
+}
+.fontSizeS {
+    font-size: 13px !important;
+}
+.fontSizeM {
+    font-size: 14px !important;
+}
+.fontSizeMM {
+    font-size: 15px !important;
+}
+.fontSizeL {
+    font-size: 16px !important;
+}
+.fontSizeXL {
+    font-size: 18px !important;
+}
+.fontSizeXXL {
+    font-size: 20px !important;
+}
+.fontSizeXXXL {
+    font-size: 22px !important;
+}
+.fontColorGray {
+    color: #999 !important;
+}
+.fontColorWhite {
+    color: #fff !important;
+}
+/** ====================================组件==================================== **/
+.cursorPointer {
+    cursor: pointer;
+}
+.appInput {
+    border: none;
+    padding: 5px 10px;
+}
+.appInput.largeSize {
+    line-height: 46px;
+    font-size: 22px;
+}
+.appTextarea {
+    padding: 5px;
+    -webkit-appearance: none;
+    resize: none;
+    box-sizing: border-box;
+    border: 1px solid #e7eaec;
+}
+.tabBarItem {
+    line-height: 50px;
+    width: 10em;
+    display: inline-block;
+    border-bottom: 3px solid transparent;
+    text-align: center;
+    cursor: pointer;
+}
+.tabBarItem.active {
+    color: #428bca;
+    border-bottom: 3px solid #428bca;
+}
+.bottomBar {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    background-color: rgba(0, 0, 0, 0.5);
+    color: white;
+    padding: 10px;
+}
+.appFileInput {
+    width: 0;
+    height: 0;
+    -webkit-appearance: none;
+}
+input[type=file].appFileInput:focus {
+    outline: none;
+    outline-offset: initial;
+}
+/** ==================================== 通用 ==================================== **/
+.mainPostCover {
+    background-color: #ececec;
+}
+.subPostCover {
+    display: inline-block;
+    width: 80px;
+    height: 80px;
+    background-color: #ececec;
+}
+
+/** ==================================== 自定义菜单 ==================================== **/
+
+.menuView{
+    height: 500px;
+    position: relative;
+    background-color: white;
+}
+
+.menuView .btn-white{
+    line-height: 25px;
+    font-size: 14px;
+    margin-bottom: 0;
+    border-radius: 0;
+    background: #FAFAFA;;
+}
+
+.menuView .btn-white:hover{
+    border: 1px solid #079200;
+    background-color: #fff;
+    color: #079200;
+}
+
+.custommenu{
+    position: relative;
+}
+.custommenu_sub_container{
+    position: absolute;
+    width: 100%;
+    bottom: 100%;
+}
+
+.ng-binding {
+    font-size: 15px;
+    line-height: 30px;
+}
+
+.phone-header {
+    position: relative;
+    background: transparent url(../img/bg_mobile_head_default.png);
+    background-position: 0 0;
+    overflow: hidden;
+    text-align: center;
+    padding-top: 30px;
+    font-size: 15px;
+    color: #fff;
+    border: 1px solid #e7e7eb;
+}
+
+.phone-foot{
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    border-top: 1px solid #e7e7eb;
+    background: url(../img/bg-mobile-foot-default.png);
+    background-position:0 -3px;
+    background-repeat: no-repeat;
+    padding-left: 43px;
+    margin-bottom: 0;
+}
diff --git a/web/backend/resources/dist/css/wechat.css b/web/backend/resources/dist/css/wechat.css
deleted file mode 100644
index 56a908dac..000000000
--- a/web/backend/resources/dist/css/wechat.css
+++ /dev/null
@@ -1,363 +0,0 @@
-/** Added by Wangzq**/
-/** ====================================重载==================================== **/
-a {
-    color: inherit;
-}
-/** ====================================间距==================================== **/
-
-.postToolbar{
-    font-size: 15px;
-}
-
-/*!*小盒子内容区的样式，display:inline-block：实现 效果*!*/
-.inlineBlockContainer .normalPaddingRight{
-    width:100%;
-    display:inline-block
-}
-
-.separateFromNextBlock {
-    margin-bottom: 10px;
-}
-.separateFromNextBlockFar {
-    margin-bottom: 20px;
-}
-.separateFromNextInlineBlock {
-    margin-right: 10px;
-}
-.separateFromNextInlineBlockFurther {
-    margin-right: 20px;
-}
-.separateChildrenWithLine > *:not(:last-child) {
-    border-bottom: 1px solid #e7eaec;
-}
-.separateChildren.further > * {
-    margin-bottom: 20px;
-}
-.separateInlineChildren > *:not(:last-child) {
-    margin-right: 10px;
-}
-.separateInlineChildren.includeLastOne > *:last-child {
-    margin-right: 10px;
-}
-.separateInlineChildren.closer > * {
-    margin-right: 5px;
-}
-.separateInlineChildren.closer.includeLastOne > *:last-child {
-    margin-right: 5px;
-}
-
-.normalPaddingTop {
-    padding-top: 5px;
-}
-
-.normalPadding {
-    padding: 10px;
-}
-.normalPaddingJustH {
-    padding-left: 10px;
-    padding-right: 10px;
-}
-.normalPaddingJustV {
-    padding-top: 10px;
-    padding-bottom: 10px;
-}
-.normalPaddingRight {
-    padding-right: 10px;
-}
-.noPaddingH {
-    padding-left: 0;
-    padding-right: 0;
-}
-.noPaddingV {
-    padding-top: 0;
-    padding-bottom: 0;
-}
-.farPadding {
-    padding: 20px;
-}
-.farPaddingJustH {
-    padding-left: 20px;
-    padding-right: 20px;
-}
-.farPaddingJustV {
-    padding-top: 20px;
-    padding-bottom: 20px;
-}
-/** ====================================边框==================================== **/
-.borderColorGray {
-    border: 1px solid #e7eaec !important;
-}
-.borderBottomColorGray {
-    border-bottom: 1px solid #e7eaec !important;
-}
-.borderRightColorGray {
-    border-right: 1px solid #e7eaec !important;
-}
-/** ====================================布局==================================== **/
-.displayAsBlock {
-    display: block;
-}
-.displayAsInlineBlock {
-    display: inline-block;
-}
-.relativePosition {
-    position: relative;
-}
-.absolutePosition {
-    position: absolute;
-}
-.fullWidth {
-    width: 100%;
-}
-.fullHeight {
-    height: 100%;
-}
-.maxWidthFull {
-    max-width: 100%;
-}
-.maxHeightFull {
-    max-height: 100%;
-}
-.absoluteFullSize {
-    position: absolute;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    top: 0;
-}
-.hAbsoluteCenter {
-    position: absolute;
-    left: 50%;
-    transform: translateX(-50%);
-}
-.vAbsoluteMiddle {
-    position: absolute;
-    top: 50%;
-    transform: translateY(-50%);
-}
-.absoluteCenter {
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    transform: translateX(-50%) translateY(-50%);
-}
-/** 伸缩盒子布局 **/
-.flex-row {
-    display: flex;
-}
-.flex-row > * {
-    display: block;
-}
-.flex-col {
-    flex: 1;
-}
-.flex-hAlignCenter {
-    justify-content: center;
-}
-.flex-hAlignBalance {
-    justify-content: space-between;
-}
-.flex-autoWidthRowElem {
-    flex: initial;
-    width: auto;
-}
-.flex-vAlignCenter {
-    align-items: center;
-}
-.flex-vAlignEnd {
-    align-items: flex-end;
-}
-.flex-vDirection {
-    flex-direction: column;
-}
-.hAlignCenter {
-    text-align: center;
-}
-.overflowHidden {
-    overflow: hidden;
-}
-.inlineBlockContainer {
-    font-size: 0;
-}
-.inlineBlockContainer > * {
-    font-size: 13px;
-    display: inline-block;
-    box-sizing: border-box;
-}
-.inlineBlockContainer.vAlignTop > * {
-    vertical-align: top;
-}
-.inlineBlockContainer.col2 > * {
-    width: 50%;
-}
-.inlineBlockContainer.col3 > * {
-    width: 33.3%;
-}
-.inlineBlockContainer.col4 > * {
-    width: 25%;
-}
-.inlineBlockContainer.col5 > * {
-    width: 20%;
-}
-/** ==================================背景================================== **/
-.whiteBG {
-    background-color: white;
-}
-.backgroundCover {
-    background-size: cover;
-    background-position: center center;
-}
-.halfOpacityBlackBG {
-    background-color: rgba(0, 0, 0, 0.5);
-}
-/** ==================================文本================================== **/
-.fontSizeXS {
-    font-size: 12px !important;
-}
-.fontSizeS {
-    font-size: 13px !important;
-}
-.fontSizeM {
-    font-size: 14px !important;
-}
-.fontSizeMM {
-    font-size: 15px !important;
-}
-.fontSizeL {
-    font-size: 16px !important;
-}
-.fontSizeXL {
-    font-size: 18px !important;
-}
-.fontSizeXXL {
-    font-size: 20px !important;
-}
-.fontSizeXXXL {
-    font-size: 22px !important;
-}
-.fontColorGray {
-    color: #999 !important;
-}
-.fontColorWhite {
-    color: #fff !important;
-}
-/** ====================================组件==================================== **/
-.cursorPointer {
-    cursor: pointer;
-}
-.appInput {
-    border: none;
-    padding: 5px 10px;
-}
-.appInput.largeSize {
-    line-height: 46px;
-    font-size: 22px;
-}
-.appTextarea {
-    padding: 5px;
-    -webkit-appearance: none;
-    resize: none;
-    box-sizing: border-box;
-    border: 1px solid #e7eaec;
-}
-.tabBarItem {
-    line-height: 50px;
-    width: 10em;
-    display: inline-block;
-    border-bottom: 3px solid transparent;
-    text-align: center;
-    cursor: pointer;
-}
-.tabBarItem.active {
-    color: #428bca;
-    border-bottom: 3px solid #428bca;
-}
-.bottomBar {
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    background-color: rgba(0, 0, 0, 0.5);
-    color: white;
-    padding: 10px;
-}
-.appFileInput {
-    width: 0;
-    height: 0;
-    -webkit-appearance: none;
-}
-input[type=file].appFileInput:focus {
-    outline: none;
-    outline-offset: initial;
-}
-/** ==================================== 通用 ==================================== **/
-.mainPostCover {
-    background-color: #ececec;
-}
-.subPostCover {
-    display: inline-block;
-    width: 80px;
-    height: 80px;
-    background-color: #ececec;
-}
-
-/** ==================================== 自定义菜单 ==================================== **/
-
-.menuView{
-    height: 500px;
-    position: relative;
-    background-color: white;
-}
-
-.menuView .btn-white{
-    line-height: 25px;
-    font-size: 14px;
-    margin-bottom: 0;
-    border-radius: 0;
-    background: #FAFAFA;;
-}
-
-.menuView .btn-white:hover{
-    border: 1px solid #079200;
-    background-color: #fff;
-    color: #079200;
-}
-
-.custommenu{
-    position: relative;
-}
-.custommenu_sub_container{
-    position: absolute;
-    width: 100%;
-    bottom: 100%;
-}
-
-.ng-binding {
-    font-size: 15px;
-    line-height: 30px;
-}
-
-.phone-header {
-    position: relative;
-    background: transparent url(../img/bg_mobile_head_default.png);
-    background-position: 0 0;
-    overflow: hidden;
-    text-align: center;
-    padding-top: 30px;
-    font-size: 15px;
-    color: #fff;
-    border: 1px solid #e7e7eb;
-}
-
-.phone-foot{
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    border-top: 1px solid #e7e7eb;
-    background: url(../img/bg-mobile-foot-default.png);
-    background-position:0 -3px;
-    background-repeat: no-repeat;
-    padding-left: 43px;
-    margin-bottom: 0;
-}
\ No newline at end of file
diff --git a/web/backend/resources/dist/js/rageframe.js b/web/backend/resources/dist/js/rageframe.js
index 6c2348d6c..491cf92bf 100644
--- a/web/backend/resources/dist/js/rageframe.js
+++ b/web/backend/resources/dist/js/rageframe.js
@@ -190,6 +190,15 @@ function rfText(text) {
     }
 }
 
+// 选中
+$(document).on("click",".rfWechatAttachmentActive",function() {
+    if (!$(this).hasClass('active')){
+        $(this).addClass('active');
+    }else{
+        $(this).removeClass('active');
+    }
+});
+
 // 初始化上传
 $(function() {
     //初始化上传控件
diff --git a/web/backend/resources/plugins/fancybox/jquery.fancybox.min.css b/web/backend/resources/plugins/fancybox/jquery.fancybox.min.css
index b5271e5b1..7cc60b295 100644
--- a/web/backend/resources/plugins/fancybox/jquery.fancybox.min.css
+++ b/web/backend/resources/plugins/fancybox/jquery.fancybox.min.css
@@ -1 +1 @@
-@charset "UTF-8";body.fancybox-active{overflow:hidden}body.fancybox-iosfix{position:fixed;left:0;right:0}.fancybox-is-hidden{position:absolute;top:-9999px;left:-9999px;visibility:hidden}.fancybox-container{position:fixed;top:0;left:0;width:100%;height:100%;z-index:99992;-webkit-tap-highlight-color:transparent;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-transform:translateZ(0);transform:translateZ(0);font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,sans-serif}.fancybox-bg,.fancybox-inner,.fancybox-outer,.fancybox-stage{position:absolute;top:0;right:0;bottom:0;left:0}.fancybox-outer{overflow-y:auto;-webkit-overflow-scrolling:touch}.fancybox-bg{background:#1e1e1e;opacity:0;transition-duration:inherit;transition-property:opacity;transition-timing-function:cubic-bezier(.47,0,.74,.71)}.fancybox-is-open .fancybox-bg{opacity:.87;transition-timing-function:cubic-bezier(.22,.61,.36,1)}.fancybox-caption-wrap,.fancybox-infobar,.fancybox-toolbar{position:absolute;direction:ltr;z-index:99997;opacity:0;visibility:hidden;transition:opacity .25s,visibility 0s linear .25s;box-sizing:border-box}.fancybox-show-caption .fancybox-caption-wrap,.fancybox-show-infobar .fancybox-infobar,.fancybox-show-toolbar .fancybox-toolbar{opacity:1;visibility:visible;transition:opacity .25s,visibility 0s}.fancybox-infobar{top:0;left:0;font-size:13px;padding:0 10px;height:44px;min-width:44px;line-height:44px;color:#ccc;text-align:center;pointer-events:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-touch-callout:none;-webkit-tap-highlight-color:transparent;-webkit-font-smoothing:subpixel-antialiased;mix-blend-mode:exclusion}.fancybox-toolbar{top:0;right:0;margin:0;padding:0}.fancybox-stage{overflow:hidden;direction:ltr;z-index:99994;-webkit-transform:translateZ(0)}.fancybox-slide{position:absolute;top:0;left:0;width:100%;height:100%;margin:0;padding:0;overflow:auto;outline:none;white-space:normal;box-sizing:border-box;text-align:center;z-index:99994;-webkit-overflow-scrolling:touch;display:none;-webkit-backface-visibility:hidden;backface-visibility:hidden;transition-property:opacity,-webkit-transform;transition-property:transform,opacity;transition-property:transform,opacity,-webkit-transform}.fancybox-slide:before{content:"";display:inline-block;vertical-align:middle;height:100%;width:0}.fancybox-is-sliding .fancybox-slide,.fancybox-slide--current,.fancybox-slide--next,.fancybox-slide--previous{display:block}.fancybox-slide--image{overflow:visible}.fancybox-slide--image:before{display:none}.fancybox-slide--video .fancybox-content,.fancybox-slide--video iframe{background:#000}.fancybox-slide--map .fancybox-content,.fancybox-slide--map iframe{background:#e5e3df}.fancybox-slide--next{z-index:99995}.fancybox-slide>*{display:inline-block;position:relative;padding:24px;margin:44px 0;border-width:0;vertical-align:middle;text-align:left;background-color:#fff;overflow:auto;box-sizing:border-box}.fancybox-slide>base,.fancybox-slide>link,.fancybox-slide>meta,.fancybox-slide>script,.fancybox-slide>style,.fancybox-slide>title{display:none}.fancybox-slide .fancybox-image-wrap{position:absolute;top:0;left:0;margin:0;padding:0;border:0;z-index:99995;background:transparent;cursor:default;overflow:visible;-webkit-transform-origin:top left;transform-origin:top left;background-size:100% 100%;background-repeat:no-repeat;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.fancybox-can-zoomOut .fancybox-image-wrap{cursor:zoom-out}.fancybox-can-zoomIn .fancybox-image-wrap{cursor:zoom-in}.fancybox-can-drag .fancybox-image-wrap{cursor:-webkit-grab;cursor:grab}.fancybox-is-dragging .fancybox-image-wrap{cursor:-webkit-grabbing;cursor:grabbing}.fancybox-image,.fancybox-spaceball{position:absolute;top:0;left:0;width:100%;height:100%;margin:0;padding:0;border:0;max-width:none;max-height:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.fancybox-spaceball{z-index:1}.fancybox-slide--iframe .fancybox-content{padding:0;width:80%;height:80%;max-width:calc(100% - 100px);max-height:calc(100% - 88px);overflow:visible;background:#fff}.fancybox-iframe{display:block;padding:0;border:0;height:100%}.fancybox-error,.fancybox-iframe{margin:0;width:100%;background:#fff}.fancybox-error{padding:40px;max-width:380px;cursor:default}.fancybox-error p{margin:0;padding:0;color:#444;font-size:16px;line-height:20px}.fancybox-button{box-sizing:border-box;display:inline-block;vertical-align:top;width:44px;height:44px;margin:0;padding:10px;border:0;border-radius:0;background:rgba(30,30,30,.6);color:#ccc;transition:color .3s ease;cursor:pointer}.fancybox-button[disabled]{cursor:default;opacity:.6}.fancybox-button:hover:not([disabled]){color:#fff}.fancybox-button svg{display:block;position:relative;overflow:visible;shape-rendering:geometricPrecision}.fancybox-button svg path{fill:currentColor;stroke:currentColor;stroke-linejoin:round;stroke-width:3}.fancybox-button--share svg path{stroke-width:1}.fancybox-button--pause svg path:nth-child(1),.fancybox-button--play svg path:nth-child(2),.fancybox-navigation{display:none}.fancybox-show-nav .fancybox-navigation{display:block}.fancybox-navigation button{position:absolute;top:50%;margin:-50px 0 0;z-index:99997;background:transparent;width:60px;height:100px;padding:17px}.fancybox-navigation button:before{content:"";position:absolute;top:30px;right:10px;width:40px;height:40px;background:rgba(30,30,30,.6)}.fancybox-navigation .fancybox-button--arrow_left{left:0}.fancybox-navigation .fancybox-button--arrow_right{right:0}.fancybox-close-small{position:absolute;top:0;right:0;width:44px;height:44px;padding:0;margin:0;border:0;border-radius:0;background:transparent;z-index:10;cursor:pointer}.fancybox-close-small:after{content:"×";position:absolute;top:5px;right:5px;width:30px;height:30px;font:20px/30px Arial,Helvetica Neue,Helvetica,sans-serif;color:#888;font-weight:300;text-align:center;border-radius:50%;border-width:0;background-color:transparent;transition:background-color .25s;box-sizing:border-box;z-index:2}.fancybox-close-small:focus{outline:none}.fancybox-close-small:focus:after{outline:1px dotted #888}.fancybox-close-small:hover:after{color:#555;background:#eee}.fancybox-slide--iframe .fancybox-close-small,.fancybox-slide--image .fancybox-close-small{top:0;right:-44px}.fancybox-slide--iframe .fancybox-close-small:after,.fancybox-slide--image .fancybox-close-small:after{font-size:35px;color:#aaa}.fancybox-slide--iframe .fancybox-close-small:hover:after,.fancybox-slide--image .fancybox-close-small:hover:after{color:#fff;background:transparent}.fancybox-is-scaling .fancybox-close-small,.fancybox-is-zoomable.fancybox-can-drag .fancybox-close-small{display:none}.fancybox-caption-wrap{bottom:0;left:0;right:0;padding:60px 2vw 0;background:linear-gradient(180deg,transparent 0,rgba(0,0,0,.1) 20%,rgba(0,0,0,.2) 40%,rgba(0,0,0,.6) 80%,rgba(0,0,0,.8));pointer-events:none}.fancybox-caption{padding:30px 0;border-top:1px solid hsla(0,0%,100%,.4);font-size:14px;color:#fff;line-height:20px;-webkit-text-size-adjust:none}.fancybox-caption a,.fancybox-caption button,.fancybox-caption select{pointer-events:all;position:relative}.fancybox-caption a{color:#fff;text-decoration:underline}.fancybox-slide>.fancybox-loading{border:6px solid hsla(0,0%,39%,.4);border-top:6px solid hsla(0,0%,100%,.6);border-radius:100%;height:50px;width:50px;-webkit-animation:a .8s infinite linear;animation:a .8s infinite linear;background:transparent;position:absolute;top:50%;left:50%;margin-top:-30px;margin-left:-30px;z-index:99999}@-webkit-keyframes a{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes a{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fancybox-animated{transition-timing-function:cubic-bezier(0,0,.25,1)}.fancybox-fx-slide.fancybox-slide--previous{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0);opacity:0}.fancybox-fx-slide.fancybox-slide--next{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0);opacity:0}.fancybox-fx-slide.fancybox-slide--current{-webkit-transform:translateZ(0);transform:translateZ(0);opacity:1}.fancybox-fx-fade.fancybox-slide--next,.fancybox-fx-fade.fancybox-slide--previous{opacity:0;transition-timing-function:cubic-bezier(.19,1,.22,1)}.fancybox-fx-fade.fancybox-slide--current{opacity:1}.fancybox-fx-zoom-in-out.fancybox-slide--previous{-webkit-transform:scale3d(1.5,1.5,1.5);transform:scale3d(1.5,1.5,1.5);opacity:0}.fancybox-fx-zoom-in-out.fancybox-slide--next{-webkit-transform:scale3d(.5,.5,.5);transform:scale3d(.5,.5,.5);opacity:0}.fancybox-fx-zoom-in-out.fancybox-slide--current{-webkit-transform:scaleX(1);transform:scaleX(1);opacity:1}.fancybox-fx-rotate.fancybox-slide--previous{-webkit-transform:rotate(-1turn);transform:rotate(-1turn);opacity:0}.fancybox-fx-rotate.fancybox-slide--next{-webkit-transform:rotate(1turn);transform:rotate(1turn);opacity:0}.fancybox-fx-rotate.fancybox-slide--current{-webkit-transform:rotate(0deg);transform:rotate(0deg);opacity:1}.fancybox-fx-circular.fancybox-slide--previous{-webkit-transform:scale3d(0,0,0) translate3d(-100%,0,0);transform:scale3d(0,0,0) translate3d(-100%,0,0);opacity:0}.fancybox-fx-circular.fancybox-slide--next{-webkit-transform:scale3d(0,0,0) translate3d(100%,0,0);transform:scale3d(0,0,0) translate3d(100%,0,0);opacity:0}.fancybox-fx-circular.fancybox-slide--current{-webkit-transform:scaleX(1) translateZ(0);transform:scaleX(1) translateZ(0);opacity:1}.fancybox-fx-tube.fancybox-slide--previous{-webkit-transform:translate3d(-100%,0,0) scale(.1) skew(-10deg);transform:translate3d(-100%,0,0) scale(.1) skew(-10deg)}.fancybox-fx-tube.fancybox-slide--next{-webkit-transform:translate3d(100%,0,0) scale(.1) skew(10deg);transform:translate3d(100%,0,0) scale(.1) skew(10deg)}.fancybox-fx-tube.fancybox-slide--current{-webkit-transform:translateZ(0) scale(1);transform:translateZ(0) scale(1)}.fancybox-share{padding:30px;border-radius:3px;background:#f4f4f4;max-width:90%}.fancybox-share h1{color:#222;margin:0 0 20px;font-size:33px;font-weight:700;text-align:center}.fancybox-share p{margin:0;padding:0;text-align:center}.fancybox-share_button{display:inline-block;text-decoration:none;margin:0 10px 10px 0;padding:10px 20px;box-shadow:0 1px 2px rgba(0,0,0,.2);border-radius:3px;background:#fff;white-space:nowrap;font-size:16px;line-height:23px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;min-width:140px;color:#888;transition:all .2s}.fancybox-share_button:focus,.fancybox-share_button:hover{box-shadow:0 1px 2px rgba(0,0,0,.5);text-decoration:none;color:#555}.fancybox-share_button svg{margin-right:5px;width:23px;height:23px;vertical-align:top}.fancybox-thumbs{display:none;position:absolute;top:0;bottom:0;right:0;width:212px;margin:0;padding:2px;background:#fff;-webkit-tap-highlight-color:transparent;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar;box-sizing:border-box;z-index:99995}.fancybox-show-thumbs .fancybox-thumbs{display:block}.fancybox-show-thumbs .fancybox-inner{right:212px}.fancybox-thumbs>ul{list-style:none;position:absolute;position:relative;width:100%;height:100%;margin:0;padding:0;overflow-x:hidden;overflow-y:auto;font-size:0;white-space:nowrap}.fancybox-thumbs>ul>li{float:left;overflow:hidden;padding:0;margin:2px;width:100px;height:75px;max-width:calc(50% - 4px);max-height:calc(100% - 8px);position:relative;cursor:pointer;outline:none;-webkit-tap-highlight-color:transparent;-webkit-backface-visibility:hidden;backface-visibility:hidden;box-sizing:border-box}li.fancybox-thumbs-loading{background:rgba(0,0,0,.1)}.fancybox-thumbs>ul>li>img{position:absolute;top:0;left:0;min-width:100%;min-height:100%;max-width:none;max-height:none;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.fancybox-thumbs>ul>li:before{content:"";position:absolute;top:0;right:0;bottom:0;left:0;border:4px solid #4ea7f9;z-index:99991;opacity:0;transition:all .2s cubic-bezier(.25,.46,.45,.94)}.fancybox-thumbs>ul>li.fancybox-thumbs-active:before{opacity:1}@media (max-width:800px){.fancybox-thumbs{width:110px}.fancybox-show-thumbs .fancybox-inner{right:110px}.fancybox-thumbs>ul>li{max-width:calc(100% - 10px)}}
\ No newline at end of file
+body.compensate-for-scrollbar{overflow:hidden}.fancybox-active{height:auto}.fancybox-is-hidden{left:-9999px;margin:0;position:absolute!important;top:-9999px;visibility:hidden}.fancybox-container{-webkit-backface-visibility:hidden;height:100%;left:0;outline:none;position:fixed;-webkit-tap-highlight-color:transparent;top:0;-ms-touch-action:manipulation;touch-action:manipulation;transform:translateZ(0);width:100%;z-index:99992}.fancybox-container *{box-sizing:border-box}.fancybox-bg,.fancybox-inner,.fancybox-outer,.fancybox-stage{bottom:0;left:0;position:absolute;right:0;top:0}.fancybox-outer{-webkit-overflow-scrolling:touch;overflow-y:auto}.fancybox-bg{background:#1e1e1e;opacity:0;transition-duration:inherit;transition-property:opacity;transition-timing-function:cubic-bezier(.47,0,.74,.71)}.fancybox-is-open .fancybox-bg{opacity:.9;transition-timing-function:cubic-bezier(.22,.61,.36,1)}.fancybox-caption,.fancybox-infobar,.fancybox-navigation .fancybox-button,.fancybox-toolbar{direction:ltr;opacity:0;position:absolute;transition:opacity .25s ease,visibility 0s ease .25s;visibility:hidden;z-index:99997}.fancybox-show-caption .fancybox-caption,.fancybox-show-infobar .fancybox-infobar,.fancybox-show-nav .fancybox-navigation .fancybox-button,.fancybox-show-toolbar .fancybox-toolbar{opacity:1;transition:opacity .25s ease 0s,visibility 0s ease 0s;visibility:visible}.fancybox-infobar{color:#ccc;font-size:13px;-webkit-font-smoothing:subpixel-antialiased;height:44px;left:0;line-height:44px;min-width:44px;mix-blend-mode:difference;padding:0 10px;pointer-events:none;top:0;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.fancybox-toolbar{right:0;top:0}.fancybox-stage{direction:ltr;overflow:visible;transform:translateZ(0);z-index:99994}.fancybox-is-open .fancybox-stage{overflow:hidden}.fancybox-slide{-webkit-backface-visibility:hidden;display:none;height:100%;left:0;outline:none;overflow:auto;-webkit-overflow-scrolling:touch;padding:44px;position:absolute;text-align:center;top:0;transition-property:transform,opacity;white-space:normal;width:100%;z-index:99994}.fancybox-slide:before{content:"";display:inline-block;font-size:0;height:100%;vertical-align:middle;width:0}.fancybox-is-sliding .fancybox-slide,.fancybox-slide--current,.fancybox-slide--next,.fancybox-slide--previous{display:block}.fancybox-slide--image{overflow:hidden;padding:44px 0}.fancybox-slide--image:before{display:none}.fancybox-slide--html{padding:6px}.fancybox-content{background:#fff;display:inline-block;margin:0;max-width:100%;overflow:auto;-webkit-overflow-scrolling:touch;padding:44px;position:relative;text-align:left;vertical-align:middle}.fancybox-slide--image .fancybox-content{animation-timing-function:cubic-bezier(.5,0,.14,1);-webkit-backface-visibility:hidden;background:transparent;background-repeat:no-repeat;background-size:100% 100%;left:0;max-width:none;overflow:visible;padding:0;position:absolute;top:0;transform-origin:top left;transition-property:transform,opacity;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;z-index:99995}.fancybox-can-zoomOut .fancybox-content{cursor:zoom-out}.fancybox-can-zoomIn .fancybox-content{cursor:zoom-in}.fancybox-can-pan .fancybox-content,.fancybox-can-swipe .fancybox-content{cursor:grab}.fancybox-is-grabbing .fancybox-content{cursor:grabbing}.fancybox-container [data-selectable=true]{cursor:text}.fancybox-image,.fancybox-spaceball{background:transparent;border:0;height:100%;left:0;margin:0;max-height:none;max-width:none;padding:0;position:absolute;top:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;width:100%}.fancybox-spaceball{z-index:1}.fancybox-slide--iframe .fancybox-content,.fancybox-slide--map .fancybox-content,.fancybox-slide--pdf .fancybox-content,.fancybox-slide--video .fancybox-content{height:100%;overflow:visible;padding:0;width:100%}.fancybox-slide--video .fancybox-content{background:#000}.fancybox-slide--map .fancybox-content{background:#e5e3df}.fancybox-slide--iframe .fancybox-content{background:#fff}.fancybox-iframe,.fancybox-video{background:transparent;border:0;display:block;height:100%;margin:0;overflow:hidden;padding:0;width:100%}.fancybox-iframe{left:0;position:absolute;top:0}.fancybox-error{background:#fff;cursor:default;max-width:400px;padding:40px;width:100%}.fancybox-error p{color:#444;font-size:16px;line-height:20px;margin:0;padding:0}.fancybox-button{background:rgba(30,30,30,.6);border:0;border-radius:0;box-shadow:none;cursor:pointer;display:inline-block;height:44px;margin:0;padding:10px;position:relative;transition:color .2s;vertical-align:top;visibility:inherit;width:44px}.fancybox-button,.fancybox-button:link,.fancybox-button:visited{color:#ccc}.fancybox-button:hover{color:#fff}.fancybox-button:focus{outline:none}.fancybox-button.fancybox-focus{outline:1px dotted}.fancybox-button[disabled],.fancybox-button[disabled]:hover{color:#888;cursor:default;outline:none}.fancybox-button div{height:100%}.fancybox-button svg{display:block;height:100%;overflow:visible;position:relative;width:100%}.fancybox-button svg path{fill:currentColor;stroke-width:0}.fancybox-button--fsenter svg:nth-child(2),.fancybox-button--fsexit svg:first-child,.fancybox-button--pause svg:first-child,.fancybox-button--play svg:nth-child(2){display:none}.fancybox-progress{background:#ff5268;height:2px;left:0;position:absolute;right:0;top:0;transform:scaleX(0);transform-origin:0;transition-property:transform;transition-timing-function:linear;z-index:99998}.fancybox-close-small{background:transparent;border:0;border-radius:0;color:#ccc;cursor:pointer;opacity:.8;padding:8px;position:absolute;right:-12px;top:-44px;z-index:401}.fancybox-close-small:hover{color:#fff;opacity:1}.fancybox-slide--html .fancybox-close-small{color:currentColor;padding:10px;right:0;top:0}.fancybox-slide--image.fancybox-is-scaling .fancybox-content{overflow:hidden}.fancybox-is-scaling .fancybox-close-small,.fancybox-is-zoomable.fancybox-can-pan .fancybox-close-small{display:none}.fancybox-navigation .fancybox-button{background-clip:content-box;height:100px;opacity:0;position:absolute;top:calc(50% - 50px);width:70px}.fancybox-navigation .fancybox-button div{padding:7px}.fancybox-navigation .fancybox-button--arrow_left{left:0;left:env(safe-area-inset-left);padding:31px 26px 31px 6px}.fancybox-navigation .fancybox-button--arrow_right{padding:31px 6px 31px 26px;right:0;right:env(safe-area-inset-right)}.fancybox-caption{background:linear-gradient(0deg,rgba(0,0,0,.85) 0,rgba(0,0,0,.3) 50%,rgba(0,0,0,.15) 65%,rgba(0,0,0,.075) 75.5%,rgba(0,0,0,.037) 82.85%,rgba(0,0,0,.019) 88%,transparent);bottom:0;color:#eee;font-size:14px;font-weight:400;left:0;line-height:1.5;padding:75px 44px 25px;pointer-events:none;right:0;text-align:center;z-index:99996}@supports (padding:max(0px)){.fancybox-caption{padding:75px max(44px,env(safe-area-inset-right)) max(25px,env(safe-area-inset-bottom)) max(44px,env(safe-area-inset-left))}}.fancybox-caption--separate{margin-top:-50px}.fancybox-caption__body{max-height:50vh;overflow:auto;pointer-events:all}.fancybox-caption a,.fancybox-caption a:link,.fancybox-caption a:visited{color:#ccc;text-decoration:none}.fancybox-caption a:hover{color:#fff;text-decoration:underline}.fancybox-loading{animation:a 1s linear infinite;background:transparent;border:4px solid #888;border-bottom-color:#fff;border-radius:50%;height:50px;left:50%;margin:-25px 0 0 -25px;opacity:.7;padding:0;position:absolute;top:50%;width:50px;z-index:99999}@keyframes a{to{transform:rotate(1turn)}}.fancybox-animated{transition-timing-function:cubic-bezier(0,0,.25,1)}.fancybox-fx-slide.fancybox-slide--previous{opacity:0;transform:translate3d(-100%,0,0)}.fancybox-fx-slide.fancybox-slide--next{opacity:0;transform:translate3d(100%,0,0)}.fancybox-fx-slide.fancybox-slide--current{opacity:1;transform:translateZ(0)}.fancybox-fx-fade.fancybox-slide--next,.fancybox-fx-fade.fancybox-slide--previous{opacity:0;transition-timing-function:cubic-bezier(.19,1,.22,1)}.fancybox-fx-fade.fancybox-slide--current{opacity:1}.fancybox-fx-zoom-in-out.fancybox-slide--previous{opacity:0;transform:scale3d(1.5,1.5,1.5)}.fancybox-fx-zoom-in-out.fancybox-slide--next{opacity:0;transform:scale3d(.5,.5,.5)}.fancybox-fx-zoom-in-out.fancybox-slide--current{opacity:1;transform:scaleX(1)}.fancybox-fx-rotate.fancybox-slide--previous{opacity:0;transform:rotate(-1turn)}.fancybox-fx-rotate.fancybox-slide--next{opacity:0;transform:rotate(1turn)}.fancybox-fx-rotate.fancybox-slide--current{opacity:1;transform:rotate(0deg)}.fancybox-fx-circular.fancybox-slide--previous{opacity:0;transform:scale3d(0,0,0) translate3d(-100%,0,0)}.fancybox-fx-circular.fancybox-slide--next{opacity:0;transform:scale3d(0,0,0) translate3d(100%,0,0)}.fancybox-fx-circular.fancybox-slide--current{opacity:1;transform:scaleX(1) translateZ(0)}.fancybox-fx-tube.fancybox-slide--previous{transform:translate3d(-100%,0,0) scale(.1) skew(-10deg)}.fancybox-fx-tube.fancybox-slide--next{transform:translate3d(100%,0,0) scale(.1) skew(10deg)}.fancybox-fx-tube.fancybox-slide--current{transform:translateZ(0) scale(1)}@media (max-height:576px){.fancybox-slide{padding-left:6px;padding-right:6px}.fancybox-slide--image{padding:6px 0}.fancybox-close-small{right:-6px}.fancybox-slide--image .fancybox-close-small{background:#4e4e4e;color:#f2f4f6;height:36px;opacity:1;padding:6px;right:0;top:0;width:36px}.fancybox-caption{padding-left:12px;padding-right:12px}@supports (padding:max(0px)){.fancybox-caption{padding-left:max(12px,env(safe-area-inset-left));padding-right:max(12px,env(safe-area-inset-right))}}}.fancybox-share{background:#f4f4f4;border-radius:3px;max-width:90%;padding:30px;text-align:center}.fancybox-share h1{color:#222;font-size:35px;font-weight:700;margin:0 0 20px}.fancybox-share p{margin:0;padding:0}.fancybox-share__button{border:0;border-radius:3px;display:inline-block;font-size:14px;font-weight:700;line-height:40px;margin:0 5px 10px;min-width:130px;padding:0 15px;text-decoration:none;transition:all .2s;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;white-space:nowrap}.fancybox-share__button:link,.fancybox-share__button:visited{color:#fff}.fancybox-share__button:hover{text-decoration:none}.fancybox-share__button--fb{background:#3b5998}.fancybox-share__button--fb:hover{background:#344e86}.fancybox-share__button--pt{background:#bd081d}.fancybox-share__button--pt:hover{background:#aa0719}.fancybox-share__button--tw{background:#1da1f2}.fancybox-share__button--tw:hover{background:#0d95e8}.fancybox-share__button svg{height:25px;margin-right:7px;position:relative;top:-1px;vertical-align:middle;width:25px}.fancybox-share__button svg path{fill:#fff}.fancybox-share__input{background:transparent;border:0;border-bottom:1px solid #d7d7d7;border-radius:0;color:#5d5b5b;font-size:14px;margin:10px 0 0;outline:none;padding:10px 15px;width:100%}.fancybox-thumbs{background:#ddd;bottom:0;display:none;margin:0;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar;padding:2px 2px 4px;position:absolute;right:0;-webkit-tap-highlight-color:rgba(0,0,0,0);top:0;width:212px;z-index:99995}.fancybox-thumbs-x{overflow-x:auto;overflow-y:hidden}.fancybox-show-thumbs .fancybox-thumbs{display:block}.fancybox-show-thumbs .fancybox-inner{right:212px}.fancybox-thumbs__list{font-size:0;height:100%;list-style:none;margin:0;overflow-x:hidden;overflow-y:auto;padding:0;position:absolute;position:relative;white-space:nowrap;width:100%}.fancybox-thumbs-x .fancybox-thumbs__list{overflow:hidden}.fancybox-thumbs-y .fancybox-thumbs__list::-webkit-scrollbar{width:7px}.fancybox-thumbs-y .fancybox-thumbs__list::-webkit-scrollbar-track{background:#fff;border-radius:10px;box-shadow:inset 0 0 6px rgba(0,0,0,.3)}.fancybox-thumbs-y .fancybox-thumbs__list::-webkit-scrollbar-thumb{background:#2a2a2a;border-radius:10px}.fancybox-thumbs__list a{-webkit-backface-visibility:hidden;backface-visibility:hidden;background-color:rgba(0,0,0,.1);background-position:50%;background-repeat:no-repeat;background-size:cover;cursor:pointer;float:left;height:75px;margin:2px;max-height:calc(100% - 8px);max-width:calc(50% - 4px);outline:none;overflow:hidden;padding:0;position:relative;-webkit-tap-highlight-color:transparent;width:100px}.fancybox-thumbs__list a:before{border:6px solid #ff5268;bottom:0;content:"";left:0;opacity:0;position:absolute;right:0;top:0;transition:all .2s cubic-bezier(.25,.46,.45,.94);z-index:99991}.fancybox-thumbs__list a:focus:before{opacity:.5}.fancybox-thumbs__list a.fancybox-thumbs-active:before{opacity:1}@media (max-width:576px){.fancybox-thumbs{width:110px}.fancybox-show-thumbs .fancybox-inner{right:110px}.fancybox-thumbs__list a{max-width:calc(100% - 10px)}}
\ No newline at end of file
diff --git a/web/backend/resources/plugins/fancybox/jquery.fancybox.min.js b/web/backend/resources/plugins/fancybox/jquery.fancybox.min.js
index f1f07db9c..b3b309863 100644
--- a/web/backend/resources/plugins/fancybox/jquery.fancybox.min.js
+++ b/web/backend/resources/plugins/fancybox/jquery.fancybox.min.js
@@ -1,12 +1,13 @@
 // ==================================================
-// fancyBox v3.2.1
+// fancyBox v3.5.6
 //
 // Licensed GPLv3 for open source use
 // or fancyBox Commercial License for commercial use
 //
 // http://fancyapps.com/fancybox/
-// Copyright 2017 fancyApps
+// Copyright 2018 fancyApps
 //
 // ==================================================
-!function(t,e,n,o){"use strict";function a(t){var e=n(t.currentTarget),o=t.data?t.data.options:{},a=e.attr("data-fancybox")||"",i=0,s=[];t.isDefaultPrevented()||(t.preventDefault(),a?(s=o.selector?n(o.selector):t.data?t.data.items:[],s=s.length?s.filter('[data-fancybox="'+a+'"]'):n('[data-fancybox="'+a+'"]'),i=s.index(e),i<0&&(i=0)):s=[e],n.fancybox.open(s,o,i))}if(n){if(n.fn.fancybox)return void("console"in t&&console.log("fancyBox already initialized"));var i={loop:!1,margin:[44,0],gutter:50,keyboard:!0,arrows:!0,infobar:!0,toolbar:!0,buttons:["slideShow","fullScreen","thumbs","share","close"],idleTime:3,smallBtn:"auto",protect:!1,modal:!1,image:{preload:"auto"},ajax:{settings:{data:{fancybox:!0}}},iframe:{tpl:'<iframe id="fancybox-frame{rnd}" name="fancybox-frame{rnd}" class="fancybox-iframe" frameborder="0" vspace="0" hspace="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen allowtransparency="true" src=""></iframe>',preload:!0,css:{},attr:{scrolling:"auto"}},defaultType:"image",animationEffect:"zoom",animationDuration:500,zoomOpacity:"auto",transitionEffect:"fade",transitionDuration:366,slideClass:"",baseClass:"",baseTpl:'<div class="fancybox-container" role="dialog" tabindex="-1"><div class="fancybox-bg"></div><div class="fancybox-inner"><div class="fancybox-infobar"><span data-fancybox-index></span>&nbsp;/&nbsp;<span data-fancybox-count></span></div><div class="fancybox-toolbar">{{buttons}}</div><div class="fancybox-navigation">{{arrows}}</div><div class="fancybox-stage"></div><div class="fancybox-caption-wrap"><div class="fancybox-caption"></div></div></div></div>',spinnerTpl:'<div class="fancybox-loading"></div>',errorTpl:'<div class="fancybox-error"><p>{{ERROR}}<p></div>',btnTpl:{download:'<a download data-fancybox-download class="fancybox-button fancybox-button--download" title="{{DOWNLOAD}}"><svg viewBox="0 0 40 40"><path d="M20,23 L20,8 L20,23 L13,16 L20,23 L27,16 L20,23 M9,28 L31,28" /></svg></a>',close:'<button data-fancybox-close class="fancybox-button fancybox-button--close" title="{{CLOSE}}"><svg viewBox="0 0 40 40"><path d="M10,10 L30,30 M30,10 L10,30" /></svg></button>',smallBtn:'<button data-fancybox-close class="fancybox-close-small" title="{{CLOSE}}"></button>',arrowLeft:'<button data-fancybox-prev class="fancybox-button fancybox-button--arrow_left" title="{{PREV}}"><svg viewBox="0 0 40 40"><path d="M10,20 L30,20 L10,20 L18,28 L10,20 L18,12 L10,20"></path></svg></button>',arrowRight:'<button data-fancybox-next class="fancybox-button fancybox-button--arrow_right" title="{{NEXT}}"><svg viewBox="0 0 40 40"><path d="M30,20 L10,20 L30,20 L22,28 L30,20 L22,12 L30,20"></path></svg></button>'},parentEl:"body",autoFocus:!1,backFocus:!0,trapFocus:!0,fullScreen:{autoStart:!1},touch:{vertical:!0,momentum:!0},hash:null,media:{},slideShow:{autoStart:!1,speed:4e3},thumbs:{autoStart:!1,hideOnClose:!0,parentEl:".fancybox-container"},onInit:n.noop,beforeLoad:n.noop,afterLoad:n.noop,beforeShow:n.noop,afterShow:n.noop,beforeClose:n.noop,afterClose:n.noop,onActivate:n.noop,onDeactivate:n.noop,clickContent:function(t,e){return"image"===t.type&&"zoom"},clickSlide:"close",clickOutside:"close",dblclickContent:!1,dblclickSlide:!1,dblclickOutside:!1,mobile:{margin:0,clickContent:function(t,e){return"image"===t.type&&"toggleControls"},clickSlide:function(t,e){return"image"===t.type?"toggleControls":"close"},dblclickContent:function(t,e){return"image"===t.type&&"zoom"},dblclickSlide:function(t,e){return"image"===t.type&&"zoom"}},lang:"en",i18n:{en:{CLOSE:"Close",NEXT:"Next",PREV:"Previous",ERROR:"The requested content cannot be loaded. <br/> Please try again later.",PLAY_START:"Start slideshow",PLAY_STOP:"Pause slideshow",FULL_SCREEN:"Full screen",THUMBS:"Thumbnails",DOWNLOAD:"Download",SHARE:"Share"},de:{CLOSE:"Schliessen",NEXT:"Weiter",PREV:"Zurück",ERROR:"Die angeforderten Daten konnten nicht geladen werden. <br/> Bitte versuchen Sie es später nochmal.",PLAY_START:"Diaschau starten",PLAY_STOP:"Diaschau beenden",FULL_SCREEN:"Vollbild",THUMBS:"Vorschaubilder",DOWNLOAD:"Herunterladen",SHARE:"Teilen"}}},s=n(t),r=n(e),c=0,l=function(t){return t&&t.hasOwnProperty&&t instanceof n},u=function(){return t.requestAnimationFrame||t.webkitRequestAnimationFrame||t.mozRequestAnimationFrame||t.oRequestAnimationFrame||function(e){return t.setTimeout(e,1e3/60)}}(),d=function(){var t,n=e.createElement("fakeelement"),a={transition:"transitionend",OTransition:"oTransitionEnd",MozTransition:"transitionend",WebkitTransition:"webkitTransitionEnd"};for(t in a)if(n.style[t]!==o)return a[t]}(),f=function(t){return t&&t.length&&t[0].offsetHeight},p=function(t,o,a){var s=this;s.opts=n.extend(!0,{index:a},i,o||{}),n.fancybox.isMobile&&(s.opts=n.extend(!0,{},s.opts,s.opts.mobile)),o&&n.isArray(o.buttons)&&(s.opts.buttons=o.buttons),s.id=s.opts.id||++c,s.group=[],s.currIndex=parseInt(s.opts.index,10)||0,s.prevIndex=null,s.prevPos=null,s.currPos=0,s.firstRun=null,s.createGroup(t),s.group.length&&(s.$lastFocus=n(e.activeElement).blur(),s.slides={},s.init())};n.extend(p.prototype,{init:function(){var a,i,s,c=this,l=c.group[c.currIndex],u=l.opts,d=n.fancybox.scrollbarWidth;c.scrollTop=r.scrollTop(),c.scrollLeft=r.scrollLeft(),n.fancybox.getInstance()||(n("body").addClass("fancybox-active"),/iPad|iPhone|iPod/.test(navigator.userAgent)&&!t.MSStream?"image"!==l.type&&n("body").css("top",n("body").scrollTop()*-1).addClass("fancybox-iosfix"):!n.fancybox.isMobile&&e.body.scrollHeight>t.innerHeight&&(d===o&&(a=n('<div style="width:50px;height:50px;overflow:scroll;" />').appendTo("body"),d=n.fancybox.scrollbarWidth=a[0].offsetWidth-a[0].clientWidth,a.remove()),n("head").append('<style id="fancybox-style-noscroll" type="text/css">.compensate-for-scrollbar { margin-right: '+d+"px; }</style>"),n("body").addClass("compensate-for-scrollbar"))),s="",n.each(u.buttons,function(t,e){s+=u.btnTpl[e]||""}),i=n(c.translate(c,u.baseTpl.replace("{{buttons}}",s).replace("{{arrows}}",u.btnTpl.arrowLeft+u.btnTpl.arrowRight))).attr("id","fancybox-container-"+c.id).addClass("fancybox-is-hidden").addClass(u.baseClass).data("FancyBox",c).appendTo(u.parentEl),c.$refs={container:i},["bg","inner","infobar","toolbar","stage","caption","navigation"].forEach(function(t){c.$refs[t]=i.find(".fancybox-"+t)}),c.trigger("onInit"),c.activate(),c.jumpTo(c.currIndex)},translate:function(t,e){var n=t.opts.i18n[t.opts.lang];return e.replace(/\{\{(\w+)\}\}/g,function(t,e){var a=n[e];return a===o?t:a})},createGroup:function(t){var e=this,a=n.makeArray(t);n.each(a,function(t,a){var i,s,r,c,l={},u={};n.isPlainObject(a)?(l=a,u=a.opts||a):"object"===n.type(a)&&n(a).length?(i=n(a),u=i.data(),u=n.extend({},u,u.options||{}),u.$orig=i,l.src=u.src||i.attr("href"),l.type||l.src||(l.type="inline",l.src=a)):l={type:"html",src:a+""},l.opts=n.extend(!0,{},e.opts,u),n.isArray(u.buttons)&&(l.opts.buttons=u.buttons),s=l.type||l.opts.type,r=l.src||"",!s&&r&&(r.match(/(^data:image\/[a-z0-9+\/=]*,)|(\.(jp(e|g|eg)|gif|png|bmp|webp|svg|ico)((\?|#).*)?$)/i)?s="image":r.match(/\.(pdf)((\?|#).*)?$/i)?s="pdf":"#"===r.charAt(0)&&(s="inline")),s?l.type=s:e.trigger("objectNeedsType",l),l.index=e.group.length,l.opts.$orig&&!l.opts.$orig.length&&delete l.opts.$orig,!l.opts.$thumb&&l.opts.$orig&&(l.opts.$thumb=l.opts.$orig.find("img:first")),l.opts.$thumb&&!l.opts.$thumb.length&&delete l.opts.$thumb,"function"===n.type(e.opts.caption)&&(l.opts.caption=e.opts.caption.apply(a,[e,l])),l.opts.caption instanceof n||(l.opts.caption=l.opts.caption===o?"":l.opts.caption+""),"ajax"===s&&(c=r.split(/\s+/,2),c.length>1&&(l.src=c.shift(),l.opts.filter=c.shift())),"auto"==l.opts.smallBtn&&(n.inArray(s,["html","inline","ajax"])>-1?(l.opts.toolbar=!1,l.opts.smallBtn=!0):l.opts.smallBtn=!1),"pdf"===s&&(l.type="iframe",l.opts.iframe.preload=!1),l.opts.modal&&(l.opts=n.extend(!0,l.opts,{infobar:0,toolbar:0,smallBtn:0,keyboard:0,slideShow:0,fullScreen:0,thumbs:0,touch:0,clickContent:!1,clickSlide:!1,clickOutside:!1,dblclickContent:!1,dblclickSlide:!1,dblclickOutside:!1})),e.group.push(l)})},addEvents:function(){var o=this;o.removeEvents(),o.$refs.container.on("click.fb-close","[data-fancybox-close]",function(t){t.stopPropagation(),t.preventDefault(),o.close(t)}).on("click.fb-prev touchend.fb-prev","[data-fancybox-prev]",function(t){t.stopPropagation(),t.preventDefault(),o.previous()}).on("click.fb-next touchend.fb-next","[data-fancybox-next]",function(t){t.stopPropagation(),t.preventDefault(),o.next()}),s.on("orientationchange.fb resize.fb",function(t){t&&t.originalEvent&&"resize"===t.originalEvent.type?u(function(){o.update()}):(o.$refs.stage.hide(),setTimeout(function(){o.$refs.stage.show(),o.update()},600))}),r.on("focusin.fb",function(t){var a=n.fancybox?n.fancybox.getInstance():null;a.isClosing||!a.current||!a.current.opts.trapFocus||n(t.target).hasClass("fancybox-container")||n(t.target).is(e)||a&&"fixed"!==n(t.target).css("position")&&!a.$refs.container.has(t.target).length&&(t.stopPropagation(),a.focus(),s.scrollTop(o.scrollTop).scrollLeft(o.scrollLeft))}),r.on("keydown.fb",function(t){var e=o.current,a=t.keyCode||t.which;if(e&&e.opts.keyboard&&!n(t.target).is("input")&&!n(t.target).is("textarea"))return 8===a||27===a?(t.preventDefault(),void o.close(t)):37===a||38===a?(t.preventDefault(),void o.previous()):39===a||40===a?(t.preventDefault(),void o.next()):void o.trigger("afterKeydown",t,a)}),o.group[o.currIndex].opts.idleTime&&(o.idleSecondsCounter=0,r.on("mousemove.fb-idle mouseleave.fb-idle mousedown.fb-idle touchstart.fb-idle touchmove.fb-idle scroll.fb-idle keydown.fb-idle",function(t){o.idleSecondsCounter=0,o.isIdle&&o.showControls(),o.isIdle=!1}),o.idleInterval=t.setInterval(function(){o.idleSecondsCounter++,o.idleSecondsCounter>=o.group[o.currIndex].opts.idleTime&&(o.isIdle=!0,o.idleSecondsCounter=0,o.hideControls())},1e3))},removeEvents:function(){var e=this;s.off("orientationchange.fb resize.fb"),r.off("focusin.fb keydown.fb .fb-idle"),this.$refs.container.off(".fb-close .fb-prev .fb-next"),e.idleInterval&&(t.clearInterval(e.idleInterval),e.idleInterval=null)},previous:function(t){return this.jumpTo(this.currPos-1,t)},next:function(t){return this.jumpTo(this.currPos+1,t)},jumpTo:function(t,e,a){var i,s,r,c,l,u,d,p=this,h=p.group.length;if(!(p.isSliding||p.isClosing||p.isAnimating&&p.firstRun)){if(t=parseInt(t,10),s=p.current?p.current.opts.loop:p.opts.loop,!s&&(t<0||t>=h))return!1;if(i=p.firstRun=null===p.firstRun,!(h<2&&!i&&p.isSliding)){if(c=p.current,p.prevIndex=p.currIndex,p.prevPos=p.currPos,r=p.createSlide(t),h>1&&((s||r.index>0)&&p.createSlide(t-1),(s||r.index<h-1)&&p.createSlide(t+1)),p.current=r,p.currIndex=r.index,p.currPos=r.pos,p.trigger("beforeShow",i),p.updateControls(),u=n.fancybox.getTranslate(r.$slide),r.isMoved=(0!==u.left||0!==u.top)&&!r.$slide.hasClass("fancybox-animated"),r.forcedDuration=o,n.isNumeric(e)?r.forcedDuration=e:e=r.opts[i?"animationDuration":"transitionDuration"],e=parseInt(e,10),i)return r.opts.animationEffect&&e&&p.$refs.container.css("transition-duration",e+"ms"),p.$refs.container.removeClass("fancybox-is-hidden"),f(p.$refs.container),p.$refs.container.addClass("fancybox-is-open"),r.$slide.addClass("fancybox-slide--current"),p.loadSlide(r),void p.preload();n.each(p.slides,function(t,e){n.fancybox.stop(e.$slide)}),r.$slide.removeClass("fancybox-slide--next fancybox-slide--previous").addClass("fancybox-slide--current"),r.isMoved?(l=Math.round(r.$slide.width()),n.each(p.slides,function(t,o){var a=o.pos-r.pos;n.fancybox.animate(o.$slide,{top:0,left:a*l+a*o.opts.gutter},e,function(){o.$slide.removeAttr("style").removeClass("fancybox-slide--next fancybox-slide--previous"),o.pos===p.currPos&&(r.isMoved=!1,p.complete())})})):p.$refs.stage.children().removeAttr("style"),r.isLoaded?p.revealContent(r):p.loadSlide(r),p.preload(),c.pos!==r.pos&&(d="fancybox-slide--"+(c.pos>r.pos?"next":"previous"),c.$slide.removeClass("fancybox-slide--complete fancybox-slide--current fancybox-slide--next fancybox-slide--previous"),c.isComplete=!1,e&&(r.isMoved||r.opts.transitionEffect)&&(r.isMoved?c.$slide.addClass(d):(d="fancybox-animated "+d+" fancybox-fx-"+r.opts.transitionEffect,n.fancybox.animate(c.$slide,d,e,function(){c.$slide.removeClass(d).removeAttr("style")}))))}}},createSlide:function(t){var e,o,a=this;return o=t%a.group.length,o=o<0?a.group.length+o:o,!a.slides[t]&&a.group[o]&&(e=n('<div class="fancybox-slide"></div>').appendTo(a.$refs.stage),a.slides[t]=n.extend(!0,{},a.group[o],{pos:t,$slide:e,isLoaded:!1}),a.updateSlide(a.slides[t])),a.slides[t]},scaleToActual:function(t,e,a){var i,s,r,c,l,u=this,d=u.current,f=d.$content,p=parseInt(d.$slide.width(),10),h=parseInt(d.$slide.height(),10),g=d.width,b=d.height;"image"!=d.type||d.hasError||!f||u.isAnimating||(n.fancybox.stop(f),u.isAnimating=!0,t=t===o?.5*p:t,e=e===o?.5*h:e,i=n.fancybox.getTranslate(f),c=g/i.width,l=b/i.height,s=.5*p-.5*g,r=.5*h-.5*b,g>p&&(s=i.left*c-(t*c-t),s>0&&(s=0),s<p-g&&(s=p-g)),b>h&&(r=i.top*l-(e*l-e),r>0&&(r=0),r<h-b&&(r=h-b)),u.updateCursor(g,b),n.fancybox.animate(f,{top:r,left:s,scaleX:c,scaleY:l},a||330,function(){u.isAnimating=!1}),u.SlideShow&&u.SlideShow.isActive&&u.SlideShow.stop())},scaleToFit:function(t){var e,o=this,a=o.current,i=a.$content;"image"!=a.type||a.hasError||!i||o.isAnimating||(n.fancybox.stop(i),o.isAnimating=!0,e=o.getFitPos(a),o.updateCursor(e.width,e.height),n.fancybox.animate(i,{top:e.top,left:e.left,scaleX:e.width/i.width(),scaleY:e.height/i.height()},t||330,function(){o.isAnimating=!1}))},getFitPos:function(t){var e,o,a,i,s,r=this,c=t.$content,l=t.width,u=t.height,d=t.opts.margin;return!(!c||!c.length||!l&&!u)&&("number"===n.type(d)&&(d=[d,d]),2==d.length&&(d=[d[0],d[1],d[0],d[1]]),e=parseInt(r.$refs.stage.width(),10)-(d[1]+d[3]),o=parseInt(r.$refs.stage.height(),10)-(d[0]+d[2]),a=Math.min(1,e/l,o/u),i=Math.floor(a*l),s=Math.floor(a*u),{top:Math.floor(.5*(o-s))+d[0],left:Math.floor(.5*(e-i))+d[3],width:i,height:s})},update:function(){var t=this;n.each(t.slides,function(e,n){t.updateSlide(n)})},updateSlide:function(t){var e=this,o=t.$content;o&&(t.width||t.height)&&(n.fancybox.stop(o),n.fancybox.setTranslate(o,e.getFitPos(t)),t.pos===e.currPos&&e.updateCursor()),t.$slide.trigger("refresh"),e.trigger("onUpdate",t)},updateCursor:function(t,e){var n,a=this,i=a.$refs.container.removeClass("fancybox-is-zoomable fancybox-can-zoomIn fancybox-can-drag fancybox-can-zoomOut");a.current&&!a.isClosing&&(a.isZoomable()?(i.addClass("fancybox-is-zoomable"),n=t!==o&&e!==o?t<a.current.width&&e<a.current.height:a.isScaledDown(),n?i.addClass("fancybox-can-zoomIn"):a.current.opts.touch?i.addClass("fancybox-can-drag"):i.addClass("fancybox-can-zoomOut")):a.current.opts.touch&&i.addClass("fancybox-can-drag"))},isZoomable:function(){var t,e=this,o=e.current;if(o&&!e.isClosing)return!!("image"===o.type&&o.isLoaded&&!o.hasError&&("zoom"===o.opts.clickContent||n.isFunction(o.opts.clickContent)&&"zoom"===o.opts.clickContent(o))&&(t=e.getFitPos(o),o.width>t.width||o.height>t.height))},isScaledDown:function(){var t=this,e=t.current,o=e.$content,a=!1;return o&&(a=n.fancybox.getTranslate(o),a=a.width<e.width||a.height<e.height),a},canPan:function(){var t=this,e=t.current,n=e.$content,o=!1;return n&&(o=t.getFitPos(e),o=Math.abs(n.width()-o.width)>1||Math.abs(n.height()-o.height)>1),o},loadSlide:function(t){var e,o,a,i=this;if(!t.isLoading&&!t.isLoaded){switch(t.isLoading=!0,i.trigger("beforeLoad",t),e=t.type,o=t.$slide,o.off("refresh").trigger("onReset").addClass("fancybox-slide--"+(e||"unknown")).addClass(t.opts.slideClass),e){case"image":i.setImage(t);break;case"iframe":i.setIframe(t);break;case"html":i.setContent(t,t.src||t.content);break;case"inline":n(t.src).length?i.setContent(t,n(t.src)):i.setError(t);break;case"ajax":i.showLoading(t),a=n.ajax(n.extend({},t.opts.ajax.settings,{url:t.src,success:function(e,n){"success"===n&&i.setContent(t,e)},error:function(e,n){e&&"abort"!==n&&i.setError(t)}})),o.one("onReset",function(){a.abort()});break;default:i.setError(t)}return!0}},setImage:function(e){var o,a,i,s,r=this,c=e.opts.srcset||e.opts.image.srcset;if(c){i=t.devicePixelRatio||1,s=t.innerWidth*i,a=c.split(",").map(function(t){var e={};return t.trim().split(/\s+/).forEach(function(t,n){var o=parseInt(t.substring(0,t.length-1),10);return 0===n?e.url=t:void(o&&(e.value=o,e.postfix=t[t.length-1]))}),e}),a.sort(function(t,e){return t.value-e.value});for(var l=0;l<a.length;l++){var u=a[l];if("w"===u.postfix&&u.value>=s||"x"===u.postfix&&u.value>=i){o=u;break}}!o&&a.length&&(o=a[a.length-1]),o&&(e.src=o.url,e.width&&e.height&&"w"==o.postfix&&(e.height=e.width/e.height*o.value,e.width=o.value))}e.$content=n('<div class="fancybox-image-wrap"></div>').addClass("fancybox-is-hidden").appendTo(e.$slide),e.opts.preload!==!1&&e.opts.width&&e.opts.height&&(e.opts.thumb||e.opts.$thumb)?(e.width=e.opts.width,e.height=e.opts.height,e.$ghost=n("<img />").one("error",function(){n(this).remove(),e.$ghost=null,r.setBigImage(e)}).one("load",function(){r.afterLoad(e),r.setBigImage(e)}).addClass("fancybox-image").appendTo(e.$content).attr("src",e.opts.thumb||e.opts.$thumb.attr("src"))):r.setBigImage(e)},setBigImage:function(t){var e=this,o=n("<img />");t.$image=o.one("error",function(){e.setError(t)}).one("load",function(){clearTimeout(t.timouts),t.timouts=null,e.isClosing||(t.width=this.naturalWidth,t.height=this.naturalHeight,t.opts.image.srcset&&o.attr("sizes","100vw").attr("srcset",t.opts.image.srcset),e.hideLoading(t),t.$ghost?t.timouts=setTimeout(function(){t.timouts=null,t.$ghost.hide()},Math.min(300,Math.max(1e3,t.height/1600))):e.afterLoad(t))}).addClass("fancybox-image").attr("src",t.src).appendTo(t.$content),(o[0].complete||"complete"==o[0].readyState)&&o[0].naturalWidth&&o[0].naturalHeight?o.trigger("load"):o[0].error?o.trigger("error"):t.timouts=setTimeout(function(){o[0].complete||t.hasError||e.showLoading(t)},100)},setIframe:function(t){var e,a=this,i=t.opts.iframe,s=t.$slide;t.$content=n('<div class="fancybox-content'+(i.preload?" fancybox-is-hidden":"")+'"></div>').css(i.css).appendTo(s),e=n(i.tpl.replace(/\{rnd\}/g,(new Date).getTime())).attr(i.attr).appendTo(t.$content),i.preload?(a.showLoading(t),e.on("load.fb error.fb",function(e){this.isReady=1,t.$slide.trigger("refresh"),a.afterLoad(t)}),s.on("refresh.fb",function(){var n,a,s,r=t.$content,c=i.css.width,l=i.css.height;if(1===e[0].isReady){try{a=e.contents(),s=a.find("body")}catch(t){}s&&s.length&&(c===o&&(n=e[0].contentWindow.document.documentElement.scrollWidth,c=Math.ceil(s.outerWidth(!0)+(r.width()-n)),c+=r.outerWidth()-r.innerWidth()),l===o&&(l=Math.ceil(s.outerHeight(!0)),l+=r.outerHeight()-r.innerHeight()),c&&r.width(c),l&&r.height(l)),r.removeClass("fancybox-is-hidden")}})):this.afterLoad(t),e.attr("src",t.src),t.opts.smallBtn===!0&&t.$content.prepend(a.translate(t,t.opts.btnTpl.smallBtn)),s.one("onReset",function(){try{n(this).find("iframe").hide().attr("src","//about:blank")}catch(t){}n(this).empty(),t.isLoaded=!1})},setContent:function(t,e){var o=this;o.isClosing||(o.hideLoading(t),t.$slide.empty(),l(e)&&e.parent().length?(e.parent(".fancybox-slide--inline").trigger("onReset"),t.$placeholder=n("<div></div>").hide().insertAfter(e),e.css("display","inline-block")):t.hasError||("string"===n.type(e)&&(e=n("<div>").append(n.trim(e)).contents(),3===e[0].nodeType&&(e=n("<div>").html(e))),t.opts.filter&&(e=n("<div>").html(e).find(t.opts.filter))),t.$slide.one("onReset",function(){t.$placeholder&&(t.$placeholder.after(e.hide()).remove(),t.$placeholder=null),t.$smallBtn&&(t.$smallBtn.remove(),t.$smallBtn=null),t.hasError||(n(this).empty(),t.isLoaded=!1)}),t.$content=n(e).appendTo(t.$slide),this.afterLoad(t))},setError:function(t){t.hasError=!0,t.$slide.removeClass("fancybox-slide--"+t.type),this.setContent(t,this.translate(t,t.opts.errorTpl))},showLoading:function(t){var e=this;t=t||e.current,t&&!t.$spinner&&(t.$spinner=n(e.opts.spinnerTpl).appendTo(t.$slide))},hideLoading:function(t){var e=this;t=t||e.current,t&&t.$spinner&&(t.$spinner.remove(),delete t.$spinner)},afterLoad:function(t){var e=this;e.isClosing||(t.isLoading=!1,t.isLoaded=!0,e.trigger("afterLoad",t),e.hideLoading(t),t.opts.smallBtn&&!t.$smallBtn&&(t.$smallBtn=n(e.translate(t,t.opts.btnTpl.smallBtn)).appendTo(t.$content.filter("div,form").first())),t.opts.protect&&t.$content&&!t.hasError&&(t.$content.on("contextmenu.fb",function(t){return 2==t.button&&t.preventDefault(),!0}),"image"===t.type&&n('<div class="fancybox-spaceball"></div>').appendTo(t.$content)),e.revealContent(t))},revealContent:function(t){var e,a,i,s,r,c=this,l=t.$slide,u=!1;return e=t.opts[c.firstRun?"animationEffect":"transitionEffect"],i=t.opts[c.firstRun?"animationDuration":"transitionDuration"],i=parseInt(t.forcedDuration===o?i:t.forcedDuration,10),!t.isMoved&&t.pos===c.currPos&&i||(e=!1),"zoom"!==e||t.pos===c.currPos&&i&&"image"===t.type&&!t.hasError&&(u=c.getThumbPos(t))||(e="fade"),"zoom"===e?(r=c.getFitPos(t),r.scaleX=r.width/u.width,r.scaleY=r.height/u.height,delete r.width,delete r.height,s=t.opts.zoomOpacity,"auto"==s&&(s=Math.abs(t.width/t.height-u.width/u.height)>.1),s&&(u.opacity=.1,r.opacity=1),n.fancybox.setTranslate(t.$content.removeClass("fancybox-is-hidden"),u),f(t.$content),void n.fancybox.animate(t.$content,r,i,function(){c.complete()})):(c.updateSlide(t),e?(n.fancybox.stop(l),a="fancybox-animated fancybox-slide--"+(t.pos>=c.prevPos?"next":"previous")+" fancybox-fx-"+e,l.removeAttr("style").removeClass("fancybox-slide--current fancybox-slide--next fancybox-slide--previous").addClass(a),t.$content.removeClass("fancybox-is-hidden"),f(l),void n.fancybox.animate(l,"fancybox-slide--current",i,function(e){l.removeClass(a).removeAttr("style"),t.pos===c.currPos&&c.complete()},!0)):(f(l),t.$content.removeClass("fancybox-is-hidden"),void(t.pos===c.currPos&&c.complete())))},getThumbPos:function(o){var a,i=this,s=!1,r=function(e){for(var o,a=e[0],i=a.getBoundingClientRect(),s=[];null!==a.parentElement;)"hidden"!==n(a.parentElement).css("overflow")&&"auto"!==n(a.parentElement).css("overflow")||s.push(a.parentElement.getBoundingClientRect()),a=a.parentElement;return o=s.every(function(t){var e=Math.min(i.right,t.right)-Math.max(i.left,t.left),n=Math.min(i.bottom,t.bottom)-Math.max(i.top,t.top);return e>0&&n>0}),o&&i.bottom>0&&i.right>0&&i.left<n(t).width()&&i.top<n(t).height()},c=o.opts.$thumb,l=c?c.offset():0;return l&&c[0].ownerDocument===e&&r(c)&&(a=i.$refs.stage.offset(),s={top:l.top-a.top+parseFloat(c.css("border-top-width")||0),left:l.left-a.left+parseFloat(c.css("border-left-width")||0),width:c.width(),height:c.height(),scaleX:1,scaleY:1}),s},complete:function(){var t=this,o=t.current,a={};o.isMoved||!o.isLoaded||o.isComplete||(o.isComplete=!0,o.$slide.siblings().trigger("onReset"),f(o.$slide),o.$slide.addClass("fancybox-slide--complete"),n.each(t.slides,function(e,o){o.pos>=t.currPos-1&&o.pos<=t.currPos+1?a[o.pos]=o:o&&(n.fancybox.stop(o.$slide),o.$slide.off().remove())}),t.slides=a,t.updateCursor(),t.trigger("afterShow"),(n(e.activeElement).is("[disabled]")||o.opts.autoFocus&&"image"!=o.type&&"iframe"!==o.type)&&t.focus())},preload:function(){var t,e,n=this;n.group.length<2||(t=n.slides[n.currPos+1],e=n.slides[n.currPos-1],t&&"image"===t.type&&n.loadSlide(t),e&&"image"===e.type&&n.loadSlide(e))},focus:function(){var t,e=this.current;this.isClosing||(e&&e.isComplete&&(t=e.$slide.find("input[autofocus]:enabled:visible:first"),t.length||(t=e.$slide.find("button,:input,[tabindex],a").filter(":enabled:visible:first"))),t=t&&t.length?t:this.$refs.container,t.focus())},activate:function(){var t=this;n(".fancybox-container").each(function(){var e=n(this).data("FancyBox");e&&e.id!==t.id&&!e.isClosing&&(e.trigger("onDeactivate"),e.removeEvents(),e.isVisible=!1)}),t.isVisible=!0,(t.current||t.isIdle)&&(t.update(),t.updateControls()),t.trigger("onActivate"),t.addEvents()},close:function(t,e){var o,a,i,s,r,c,l=this,f=l.current,p=function(){l.cleanUp(t)};return!l.isClosing&&(l.isClosing=!0,l.trigger("beforeClose",t)===!1?(l.isClosing=!1,u(function(){l.update()}),!1):(l.removeEvents(),f.timouts&&clearTimeout(f.timouts),i=f.$content,o=f.opts.animationEffect,a=n.isNumeric(e)?e:o?f.opts.animationDuration:0,f.$slide.off(d).removeClass("fancybox-slide--complete fancybox-slide--next fancybox-slide--previous fancybox-animated"),f.$slide.siblings().trigger("onReset").remove(),a&&l.$refs.container.removeClass("fancybox-is-open").addClass("fancybox-is-closing"),l.hideLoading(f),l.hideControls(),l.updateCursor(),"zoom"!==o||t!==!0&&i&&a&&"image"===f.type&&!f.hasError&&(c=l.getThumbPos(f))||(o="fade"),"zoom"===o?(n.fancybox.stop(i),r=n.fancybox.getTranslate(i),r.width=r.width*r.scaleX,r.height=r.height*r.scaleY,s=f.opts.zoomOpacity,"auto"==s&&(s=Math.abs(f.width/f.height-c.width/c.height)>.1),s&&(c.opacity=0),r.scaleX=r.width/c.width,r.scaleY=r.height/c.height,r.width=c.width,r.height=c.height,n.fancybox.setTranslate(f.$content,r),n.fancybox.animate(f.$content,c,a,p),!0):(o&&a?t===!0?setTimeout(p,a):n.fancybox.animate(f.$slide.removeClass("fancybox-slide--current"),"fancybox-animated fancybox-slide--previous fancybox-fx-"+o,a,p):p(),!0)))},cleanUp:function(t){var o,a,i=this,r=n("body");i.current.$slide.trigger("onReset"),i.$refs.container.empty().remove(),i.trigger("afterClose",t),i.$lastFocus&&i.current.opts.backFocus&&i.$lastFocus.focus(),i.current=null,o=n.fancybox.getInstance(),o?o.activate():(s.scrollTop(i.scrollTop).scrollLeft(i.scrollLeft),r.removeClass("fancybox-active compensate-for-scrollbar"),r.hasClass("fancybox-iosfix")&&(a=parseInt(e.body.style.top,10),r.removeClass("fancybox-iosfix").css("top","").scrollTop(a*-1)),n("#fancybox-style-noscroll").remove())},trigger:function(t,e){var o,a=Array.prototype.slice.call(arguments,1),i=this,s=e&&e.opts?e:i.current;return s?a.unshift(s):s=i,a.unshift(i),n.isFunction(s.opts[t])&&(o=s.opts[t].apply(s,a)),o===!1?o:void("afterClose"!==t&&i.$refs?i.$refs.container.trigger(t+".fb",a):r.trigger(t+".fb",a))},updateControls:function(t){var e=this,n=e.current,o=n.index,a=n.opts.caption,i=e.$refs.container,s=e.$refs.caption;n.$slide.trigger("refresh"),e.$caption=a&&a.length?s.html(a):null,e.isHiddenControls||e.isIdle||e.showControls(),i.find("[data-fancybox-count]").html(e.group.length),i.find("[data-fancybox-index]").html(o+1),i.find("[data-fancybox-prev]").prop("disabled",!n.opts.loop&&o<=0),i.find("[data-fancybox-next]").prop("disabled",!n.opts.loop&&o>=e.group.length-1),"image"===n.type?i.find("[data-fancybox-download]").attr("href",n.opts.image.src||n.src):i.find("[data-fancybox-download]").hide()},hideControls:function(){this.isHiddenControls=!0,this.$refs.container.removeClass("fancybox-show-infobar fancybox-show-toolbar fancybox-show-caption fancybox-show-nav")},showControls:function(){var t=this,e=t.current?t.current.opts:t.opts,n=t.$refs.container;t.isHiddenControls=!1,t.idleSecondsCounter=0,n.toggleClass("fancybox-show-toolbar",!(!e.toolbar||!e.buttons)).toggleClass("fancybox-show-infobar",!!(e.infobar&&t.group.length>1)).toggleClass("fancybox-show-nav",!!(e.arrows&&t.group.length>1)).toggleClass("fancybox-is-modal",!!e.modal),t.$caption?n.addClass("fancybox-show-caption "):n.removeClass("fancybox-show-caption")},toggleControls:function(){this.isHiddenControls?this.showControls():this.hideControls()}}),n.fancybox={version:"3.2.1",defaults:i,getInstance:function(t){var e=n('.fancybox-container:not(".fancybox-is-closing"):last').data("FancyBox"),o=Array.prototype.slice.call(arguments,1);return e instanceof p&&("string"===n.type(t)?e[t].apply(e,o):"function"===n.type(t)&&t.apply(e,o),e)},open:function(t,e,n){return new p(t,e,n)},close:function(t){var e=this.getInstance();e&&(e.close(),t===!0&&this.close())},destroy:function(){this.close(!0),r.off("click.fb-start")},isMobile:e.createTouch!==o&&/Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent),use3d:function(){var n=e.createElement("div");return t.getComputedStyle&&t.getComputedStyle(n).getPropertyValue("transform")&&!(e.documentMode&&e.documentMode<11)}(),getTranslate:function(t){var e;if(!t||!t.length)return!1;if(e=t.eq(0).css("transform"),e&&e.indexOf("matrix")!==-1?(e=e.split("(")[1],e=e.split(")")[0],e=e.split(",")):e=[],e.length)e=e.length>10?[e[13],e[12],e[0],e[5]]:[e[5],e[4],e[0],e[3]],e=e.map(parseFloat);else{e=[0,0,1,1];var n=/\.*translate\((.*)px,(.*)px\)/i,o=n.exec(t.eq(0).attr("style"));o&&(e[0]=parseFloat(o[2]),e[1]=parseFloat(o[1]))}return{top:e[0],left:e[1],scaleX:e[2],scaleY:e[3],opacity:parseFloat(t.css("opacity")),width:t.width(),height:t.height()}},setTranslate:function(t,e){var n="",a={};if(t&&e)return e.left===o&&e.top===o||(n=(e.left===o?t.position().left:e.left)+"px, "+(e.top===o?t.position().top:e.top)+"px",n=this.use3d?"translate3d("+n+", 0px)":"translate("+n+")"),e.scaleX!==o&&e.scaleY!==o&&(n=(n.length?n+" ":"")+"scale("+e.scaleX+", "+e.scaleY+")"),n.length&&(a.transform=n),e.opacity!==o&&(a.opacity=e.opacity),e.width!==o&&(a.width=e.width),e.height!==o&&(a.height=e.height),t.css(a)},animate:function(t,e,a,i,s){n.isFunction(a)&&(i=a,a=null),n.isPlainObject(e)||t.removeAttr("style"),t.on(d||"transitionend",function(a){(!a||!a.originalEvent||t.is(a.originalEvent.target)&&"z-index"!=a.originalEvent.propertyName)&&(n.fancybox.stop(t),n.isPlainObject(e)?e.scaleX!==o&&e.scaleY!==o&&(t.css("transition-duration","0ms"),e.width=Math.round(t.width()*e.scaleX),e.height=Math.round(t.height()*e.scaleY),e.scaleX=1,e.scaleY=1,n.fancybox.setTranslate(t,e)):s!==!0&&t.removeClass(e),n.isFunction(i)&&i(a))}),n.isNumeric(a)&&t.css("transition-duration",a+"ms"),n.isPlainObject(e)?n.fancybox.setTranslate(t,e):t.addClass(e),e.scaleX&&t.hasClass("fancybox-image-wrap")&&t.parent().addClass("fancybox-is-scaling"),t.data("timer",setTimeout(function(){t.trigger("transitionend")},a+16))},stop:function(t){clearTimeout(t.data("timer")),t.off(d||"transitionend"),t.hasClass("fancybox-image-wrap")&&t.parent().removeClass("fancybox-is-scaling")}},n.fn.fancybox=function(t){var e;return t=t||{},e=t.selector||!1,e?n("body").off("click.fb-start",e).on("click.fb-start",e,{options:t},a):this.off("click.fb-start").on("click.fb-start",{items:this,options:t},a),this},r.on("click.fb-start","[data-fancybox]",a)}}(window,document,window.jQuery||jQuery),function(t){"use strict";var e=function(e,n,o){if(e)return o=o||"","object"===t.type(o)&&(o=t.param(o,!0)),t.each(n,function(t,n){e=e.replace("$"+t,n||"")}),o.length&&(e+=(e.indexOf("?")>0?"&":"?")+o),e},n={youtube:{matcher:/(youtube\.com|youtu\.be|youtube\-nocookie\.com)\/(watch\?(.*&)?v=|v\/|u\/|embed\/?)?(videoseries\?list=(.*)|[\w-]{11}|\?listType=(.*)&list=(.*))(.*)/i,params:{autoplay:1,autohide:1,fs:1,rel:0,hd:1,wmode:"transparent",enablejsapi:1,html5:1},paramPlace:8,type:"iframe",url:"//www.youtube.com/embed/$4",thumb:"//img.youtube.com/vi/$4/hqdefault.jpg"},vimeo:{matcher:/^.+vimeo.com\/(.*\/)?([\d]+)(.*)?/,params:{autoplay:1,hd:1,show_title:1,show_byline:1,show_portrait:0,fullscreen:1,api:1},paramPlace:3,type:"iframe",url:"//player.vimeo.com/video/$2"},metacafe:{matcher:/metacafe.com\/watch\/(\d+)\/(.*)?/,type:"iframe",url:"//www.metacafe.com/embed/$1/?ap=1"},dailymotion:{matcher:/dailymotion.com\/video\/(.*)\/?(.*)/,params:{additionalInfos:0,autoStart:1},type:"iframe",url:"//www.dailymotion.com/embed/video/$1"},vine:{matcher:/vine.co\/v\/([a-zA-Z0-9\?\=\-]+)/,type:"iframe",url:"//vine.co/v/$1/embed/simple"},instagram:{matcher:/(instagr\.am|instagram\.com)\/p\/([a-zA-Z0-9_\-]+)\/?/i,type:"image",url:"//$1/p/$2/media/?size=l"},gmap_place:{matcher:/(maps\.)?google\.([a-z]{2,3}(\.[a-z]{2})?)\/(((maps\/(place\/(.*)\/)?\@(.*),(\d+.?\d+?)z))|(\?ll=))(.*)?/i,type:"iframe",url:function(t){return"//maps.google."+t[2]+"/?ll="+(t[9]?t[9]+"&z="+Math.floor(t[10])+(t[12]?t[12].replace(/^\//,"&"):""):t[12])+"&output="+(t[12]&&t[12].indexOf("layer=c")>0?"svembed":"embed")}},gmap_search:{matcher:/(maps\.)?google\.([a-z]{2,3}(\.[a-z]{2})?)\/(maps\/search\/)(.*)/i,type:"iframe",url:function(t){return"//maps.google."+t[2]+"/maps?q="+t[5].replace("query=","q=").replace("api=1","")+"&output=embed";
-}}};t(document).on("objectNeedsType.fb",function(o,a,i){var s,r,c,l,u,d,f,p=i.src||"",h=!1;s=t.extend(!0,{},n,i.opts.media),t.each(s,function(n,o){if(c=p.match(o.matcher)){if(h=o.type,d={},o.paramPlace&&c[o.paramPlace]){u=c[o.paramPlace],"?"==u[0]&&(u=u.substring(1)),u=u.split("&");for(var a=0;a<u.length;++a){var s=u[a].split("=",2);2==s.length&&(d[s[0]]=decodeURIComponent(s[1].replace(/\+/g," ")))}}return l=t.extend(!0,{},o.params,i.opts[n],d),p="function"===t.type(o.url)?o.url.call(this,c,l,i):e(o.url,c,l),r="function"===t.type(o.thumb)?o.thumb.call(this,c,l,i):e(o.thumb,c),"vimeo"===n&&(p=p.replace("&%23","#")),!1}}),h?(i.src=p,i.type=h,i.opts.thumb||i.opts.$thumb&&i.opts.$thumb.length||(i.opts.thumb=r),"iframe"===h&&(t.extend(!0,i.opts,{iframe:{preload:!1,attr:{scrolling:"no"}}}),i.contentProvider=f,i.opts.slideClass+=" fancybox-slide--"+("gmap_place"==f||"gmap_search"==f?"map":"video"))):p&&(i.type=i.opts.defaultType)})}(window.jQuery||jQuery),function(t,e,n){"use strict";var o=function(){return t.requestAnimationFrame||t.webkitRequestAnimationFrame||t.mozRequestAnimationFrame||t.oRequestAnimationFrame||function(e){return t.setTimeout(e,1e3/60)}}(),a=function(){return t.cancelAnimationFrame||t.webkitCancelAnimationFrame||t.mozCancelAnimationFrame||t.oCancelAnimationFrame||function(e){t.clearTimeout(e)}}(),i=function(e){var n=[];e=e.originalEvent||e||t.e,e=e.touches&&e.touches.length?e.touches:e.changedTouches&&e.changedTouches.length?e.changedTouches:[e];for(var o in e)e[o].pageX?n.push({x:e[o].pageX,y:e[o].pageY}):e[o].clientX&&n.push({x:e[o].clientX,y:e[o].clientY});return n},s=function(t,e,n){return e&&t?"x"===n?t.x-e.x:"y"===n?t.y-e.y:Math.sqrt(Math.pow(t.x-e.x,2)+Math.pow(t.y-e.y,2)):0},r=function(t){if(t.is('a,area,button,[role="button"],input,label,select,summary,textarea')||n.isFunction(t.get(0).onclick)||t.data("selectable"))return!0;for(var e=0,o=t[0].attributes,a=o.length;e<a;e++)if("data-fancybox-"===o[e].nodeName.substr(0,14))return!0;return!1},c=function(e){var n=t.getComputedStyle(e)["overflow-y"],o=t.getComputedStyle(e)["overflow-x"],a=("scroll"===n||"auto"===n)&&e.scrollHeight>e.clientHeight,i=("scroll"===o||"auto"===o)&&e.scrollWidth>e.clientWidth;return a||i},l=function(t){for(var e=!1;;){if(e=c(t.get(0)))break;if(t=t.parent(),!t.length||t.hasClass("fancybox-stage")||t.is("body"))break}return e},u=function(t){var e=this;e.instance=t,e.$bg=t.$refs.bg,e.$stage=t.$refs.stage,e.$container=t.$refs.container,e.destroy(),e.$container.on("touchstart.fb.touch mousedown.fb.touch",n.proxy(e,"ontouchstart"))};u.prototype.destroy=function(){this.$container.off(".fb.touch")},u.prototype.ontouchstart=function(o){var a=this,c=n(o.target),u=a.instance,d=u.current,f=d.$content,p="touchstart"==o.type;if(p&&a.$container.off("mousedown.fb.touch"),!d||a.instance.isAnimating||a.instance.isClosing)return o.stopPropagation(),void o.preventDefault();if((!o.originalEvent||2!=o.originalEvent.button)&&c.length&&!r(c)&&!r(c.parent())&&!(o.originalEvent.clientX>c[0].clientWidth+c.offset().left)&&(a.startPoints=i(o),a.startPoints&&!(a.startPoints.length>1&&u.isSliding))){if(a.$target=c,a.$content=f,a.canTap=!0,a.opts=d.opts.touch,n(e).off(".fb.touch"),n(e).on(p?"touchend.fb.touch touchcancel.fb.touch":"mouseup.fb.touch mouseleave.fb.touch",n.proxy(a,"ontouchend")),n(e).on(p?"touchmove.fb.touch":"mousemove.fb.touch",n.proxy(a,"ontouchmove")),!a.opts&&!u.canPan()||!c.is(a.$stage)&&!a.$stage.find(c).length)return void(c.is("img")&&o.preventDefault());o.stopPropagation(),n.fancybox.isMobile&&(l(a.$target)||l(a.$target.parent()))||o.preventDefault(),a.canvasWidth=Math.round(d.$slide[0].clientWidth),a.canvasHeight=Math.round(d.$slide[0].clientHeight),a.startTime=(new Date).getTime(),a.distanceX=a.distanceY=a.distance=0,a.isPanning=!1,a.isSwiping=!1,a.isZooming=!1,a.sliderStartPos=a.sliderLastPos||{top:0,left:0},a.contentStartPos=n.fancybox.getTranslate(a.$content),a.contentLastPos=null,1!==a.startPoints.length||a.isZooming||(a.canTap=!u.isSliding,"image"===d.type&&(a.contentStartPos.width>a.canvasWidth+1||a.contentStartPos.height>a.canvasHeight+1)?(n.fancybox.stop(a.$content),a.$content.css("transition-duration","0ms"),a.isPanning=!0):a.isSwiping=!0,a.$container.addClass("fancybox-controls--isGrabbing")),2!==a.startPoints.length||u.isAnimating||d.hasError||"image"!==d.type||!d.isLoaded&&!d.$ghost||(a.isZooming=!0,a.isSwiping=!1,a.isPanning=!1,n.fancybox.stop(a.$content),a.$content.css("transition-duration","0ms"),a.centerPointStartX=.5*(a.startPoints[0].x+a.startPoints[1].x)-n(t).scrollLeft(),a.centerPointStartY=.5*(a.startPoints[0].y+a.startPoints[1].y)-n(t).scrollTop(),a.percentageOfImageAtPinchPointX=(a.centerPointStartX-a.contentStartPos.left)/a.contentStartPos.width,a.percentageOfImageAtPinchPointY=(a.centerPointStartY-a.contentStartPos.top)/a.contentStartPos.height,a.startDistanceBetweenFingers=s(a.startPoints[0],a.startPoints[1]))}},u.prototype.ontouchmove=function(t){var e=this;if(e.newPoints=i(t),n.fancybox.isMobile&&(l(e.$target)||l(e.$target.parent())))return t.stopPropagation(),void(e.canTap=!1);if((e.opts||e.instance.canPan())&&e.newPoints&&e.newPoints.length&&(e.distanceX=s(e.newPoints[0],e.startPoints[0],"x"),e.distanceY=s(e.newPoints[0],e.startPoints[0],"y"),e.distance=s(e.newPoints[0],e.startPoints[0]),e.distance>0)){if(!e.$target.is(e.$stage)&&!e.$stage.find(e.$target).length)return;t.stopPropagation(),t.preventDefault(),e.isSwiping?e.onSwipe():e.isPanning?e.onPan():e.isZooming&&e.onZoom()}},u.prototype.onSwipe=function(){var e,i=this,s=i.isSwiping,r=i.sliderStartPos.left||0;s===!0?Math.abs(i.distance)>10&&(i.canTap=!1,i.instance.group.length<2&&i.opts.vertical?i.isSwiping="y":i.instance.isSliding||i.opts.vertical===!1||"auto"===i.opts.vertical&&n(t).width()>800?i.isSwiping="x":(e=Math.abs(180*Math.atan2(i.distanceY,i.distanceX)/Math.PI),i.isSwiping=e>45&&e<135?"y":"x"),i.instance.isSliding=i.isSwiping,i.startPoints=i.newPoints,n.each(i.instance.slides,function(t,e){n.fancybox.stop(e.$slide),e.$slide.css("transition-duration","0ms"),e.inTransition=!1,e.pos===i.instance.current.pos&&(i.sliderStartPos.left=n.fancybox.getTranslate(e.$slide).left)}),i.instance.SlideShow&&i.instance.SlideShow.isActive&&i.instance.SlideShow.stop()):("x"==s&&(i.distanceX>0&&(i.instance.group.length<2||0===i.instance.current.index&&!i.instance.current.opts.loop)?r+=Math.pow(i.distanceX,.8):i.distanceX<0&&(i.instance.group.length<2||i.instance.current.index===i.instance.group.length-1&&!i.instance.current.opts.loop)?r-=Math.pow(-i.distanceX,.8):r+=i.distanceX),i.sliderLastPos={top:"x"==s?0:i.sliderStartPos.top+i.distanceY,left:r},i.requestId&&(a(i.requestId),i.requestId=null),i.requestId=o(function(){i.sliderLastPos&&(n.each(i.instance.slides,function(t,e){var o=e.pos-i.instance.currPos;n.fancybox.setTranslate(e.$slide,{top:i.sliderLastPos.top,left:i.sliderLastPos.left+o*i.canvasWidth+o*e.opts.gutter})}),i.$container.addClass("fancybox-is-sliding"))}))},u.prototype.onPan=function(){var t,e,i,s=this;s.canTap=!1,t=s.contentStartPos.width>s.canvasWidth?s.contentStartPos.left+s.distanceX:s.contentStartPos.left,e=s.contentStartPos.top+s.distanceY,i=s.limitMovement(t,e,s.contentStartPos.width,s.contentStartPos.height),i.scaleX=s.contentStartPos.scaleX,i.scaleY=s.contentStartPos.scaleY,s.contentLastPos=i,s.requestId&&(a(s.requestId),s.requestId=null),s.requestId=o(function(){n.fancybox.setTranslate(s.$content,s.contentLastPos)})},u.prototype.limitMovement=function(t,e,n,o){var a,i,s,r,c=this,l=c.canvasWidth,u=c.canvasHeight,d=c.contentStartPos.left,f=c.contentStartPos.top,p=c.distanceX,h=c.distanceY;return a=Math.max(0,.5*l-.5*n),i=Math.max(0,.5*u-.5*o),s=Math.min(l-n,.5*l-.5*n),r=Math.min(u-o,.5*u-.5*o),n>l&&(p>0&&t>a&&(t=a-1+Math.pow(-a+d+p,.8)||0),p<0&&t<s&&(t=s+1-Math.pow(s-d-p,.8)||0)),o>u&&(h>0&&e>i&&(e=i-1+Math.pow(-i+f+h,.8)||0),h<0&&e<r&&(e=r+1-Math.pow(r-f-h,.8)||0)),{top:e,left:t}},u.prototype.limitPosition=function(t,e,n,o){var a=this,i=a.canvasWidth,s=a.canvasHeight;return n>i?(t=t>0?0:t,t=t<i-n?i-n:t):t=Math.max(0,i/2-n/2),o>s?(e=e>0?0:e,e=e<s-o?s-o:e):e=Math.max(0,s/2-o/2),{top:e,left:t}},u.prototype.onZoom=function(){var e=this,i=e.contentStartPos.width,r=e.contentStartPos.height,c=e.contentStartPos.left,l=e.contentStartPos.top,u=s(e.newPoints[0],e.newPoints[1]),d=u/e.startDistanceBetweenFingers,f=Math.floor(i*d),p=Math.floor(r*d),h=(i-f)*e.percentageOfImageAtPinchPointX,g=(r-p)*e.percentageOfImageAtPinchPointY,b=(e.newPoints[0].x+e.newPoints[1].x)/2-n(t).scrollLeft(),m=(e.newPoints[0].y+e.newPoints[1].y)/2-n(t).scrollTop(),y=b-e.centerPointStartX,v=m-e.centerPointStartY,x=c+(h+y),w=l+(g+v),$={top:w,left:x,scaleX:e.contentStartPos.scaleX*d,scaleY:e.contentStartPos.scaleY*d};e.canTap=!1,e.newWidth=f,e.newHeight=p,e.contentLastPos=$,e.requestId&&(a(e.requestId),e.requestId=null),e.requestId=o(function(){n.fancybox.setTranslate(e.$content,e.contentLastPos)})},u.prototype.ontouchend=function(t){var o=this,s=Math.max((new Date).getTime()-o.startTime,1),r=o.isSwiping,c=o.isPanning,l=o.isZooming;return o.endPoints=i(t),o.$container.removeClass("fancybox-controls--isGrabbing"),n(e).off(".fb.touch"),o.requestId&&(a(o.requestId),o.requestId=null),o.isSwiping=!1,o.isPanning=!1,o.isZooming=!1,o.canTap?o.onTap(t):(o.speed=366,o.velocityX=o.distanceX/s*.5,o.velocityY=o.distanceY/s*.5,o.speedX=Math.max(.5*o.speed,Math.min(1.5*o.speed,1/Math.abs(o.velocityX)*o.speed)),void(c?o.endPanning():l?o.endZooming():o.endSwiping(r)))},u.prototype.endSwiping=function(t){var e=this,o=!1;e.instance.isSliding=!1,e.sliderLastPos=null,"y"==t&&Math.abs(e.distanceY)>50?(n.fancybox.animate(e.instance.current.$slide,{top:e.sliderStartPos.top+e.distanceY+150*e.velocityY,opacity:0},150),o=e.instance.close(!0,300)):"x"==t&&e.distanceX>50&&e.instance.group.length>1?o=e.instance.previous(e.speedX):"x"==t&&e.distanceX<-50&&e.instance.group.length>1&&(o=e.instance.next(e.speedX)),o!==!1||"x"!=t&&"y"!=t||e.instance.jumpTo(e.instance.current.index,150),e.$container.removeClass("fancybox-is-sliding")},u.prototype.endPanning=function(){var t,e,o,a=this;a.contentLastPos&&(a.opts.momentum===!1?(t=a.contentLastPos.left,e=a.contentLastPos.top):(t=a.contentLastPos.left+a.velocityX*a.speed,e=a.contentLastPos.top+a.velocityY*a.speed),o=a.limitPosition(t,e,a.contentStartPos.width,a.contentStartPos.height),o.width=a.contentStartPos.width,o.height=a.contentStartPos.height,n.fancybox.animate(a.$content,o,330))},u.prototype.endZooming=function(){var t,e,o,a,i=this,s=i.instance.current,r=i.newWidth,c=i.newHeight;i.contentLastPos&&(t=i.contentLastPos.left,e=i.contentLastPos.top,a={top:e,left:t,width:r,height:c,scaleX:1,scaleY:1},n.fancybox.setTranslate(i.$content,a),r<i.canvasWidth&&c<i.canvasHeight?i.instance.scaleToFit(150):r>s.width||c>s.height?i.instance.scaleToActual(i.centerPointStartX,i.centerPointStartY,150):(o=i.limitPosition(t,e,r,c),n.fancybox.setTranslate(i.content,n.fancybox.getTranslate(i.$content)),n.fancybox.animate(i.$content,o,150)))},u.prototype.onTap=function(t){var e,o=this,a=n(t.target),s=o.instance,r=s.current,c=t&&i(t)||o.startPoints,l=c[0]?c[0].x-o.$stage.offset().left:0,u=c[0]?c[0].y-o.$stage.offset().top:0,d=function(e){var a=r.opts[e];if(n.isFunction(a)&&(a=a.apply(s,[r,t])),a)switch(a){case"close":s.close(o.startEvent);break;case"toggleControls":s.toggleControls(!0);break;case"next":s.next();break;case"nextOrClose":s.group.length>1?s.next():s.close(o.startEvent);break;case"zoom":"image"==r.type&&(r.isLoaded||r.$ghost)&&(s.canPan()?s.scaleToFit():s.isScaledDown()?s.scaleToActual(l,u):s.group.length<2&&s.close(o.startEvent))}};if(!(t.originalEvent&&2==t.originalEvent.button||s.isSliding||l>a[0].clientWidth+a.offset().left)){if(a.is(".fancybox-bg,.fancybox-inner,.fancybox-outer,.fancybox-container"))e="Outside";else if(a.is(".fancybox-slide"))e="Slide";else{if(!s.current.$content||!s.current.$content.has(t.target).length)return;e="Content"}if(o.tapped){if(clearTimeout(o.tapped),o.tapped=null,Math.abs(l-o.tapX)>50||Math.abs(u-o.tapY)>50||s.isSliding)return this;d("dblclick"+e)}else o.tapX=l,o.tapY=u,r.opts["dblclick"+e]&&r.opts["dblclick"+e]!==r.opts["click"+e]?o.tapped=setTimeout(function(){o.tapped=null,d("click"+e)},300):d("click"+e);return this}},n(e).on("onActivate.fb",function(t,e){e&&!e.Guestures&&(e.Guestures=new u(e))}),n(e).on("beforeClose.fb",function(t,e){e&&e.Guestures&&e.Guestures.destroy()})}(window,document,window.jQuery||jQuery),function(t,e){"use strict";e.extend(!0,e.fancybox.defaults,{btnTpl:{slideShow:'<button data-fancybox-play class="fancybox-button fancybox-button--play" title="{{PLAY_START}}"><svg viewBox="0 0 40 40"><path d="M13,12 L27,20 L13,27 Z" /><path d="M15,10 v19 M23,10 v19" /></svg></button>'},slideShow:{autoStart:!1,speed:3e3}});var n=function(t){this.instance=t,this.init()};e.extend(n.prototype,{timer:null,isActive:!1,$button:null,init:function(){var t=this;t.$button=t.instance.$refs.toolbar.find("[data-fancybox-play]").on("click",function(){t.toggle()}),(t.instance.group.length<2||!t.instance.group[t.instance.currIndex].opts.slideShow)&&t.$button.hide()},set:function(t){var e=this;e.instance&&e.instance.current&&(t===!0||e.instance.current.opts.loop||e.instance.currIndex<e.instance.group.length-1)?e.timer=setTimeout(function(){e.isActive&&e.instance.jumpTo((e.instance.currIndex+1)%e.instance.group.length)},e.instance.current.opts.slideShow.speed):(e.stop(),e.instance.idleSecondsCounter=0,e.instance.showControls())},clear:function(){var t=this;clearTimeout(t.timer),t.timer=null},start:function(){var t=this,e=t.instance.current;e&&(t.isActive=!0,t.$button.attr("title",e.opts.i18n[e.opts.lang].PLAY_STOP).removeClass("fancybox-button--play").addClass("fancybox-button--pause"),t.set(!0))},stop:function(){var t=this,e=t.instance.current;t.clear(),t.$button.attr("title",e.opts.i18n[e.opts.lang].PLAY_START).removeClass("fancybox-button--pause").addClass("fancybox-button--play"),t.isActive=!1},toggle:function(){var t=this;t.isActive?t.stop():t.start()}}),e(t).on({"onInit.fb":function(t,e){e&&!e.SlideShow&&(e.SlideShow=new n(e))},"beforeShow.fb":function(t,e,n,o){var a=e&&e.SlideShow;o?a&&n.opts.slideShow.autoStart&&a.start():a&&a.isActive&&a.clear()},"afterShow.fb":function(t,e,n){var o=e&&e.SlideShow;o&&o.isActive&&o.set()},"afterKeydown.fb":function(n,o,a,i,s){var r=o&&o.SlideShow;!r||!a.opts.slideShow||80!==s&&32!==s||e(t.activeElement).is("button,a,input")||(i.preventDefault(),r.toggle())},"beforeClose.fb onDeactivate.fb":function(t,e){var n=e&&e.SlideShow;n&&n.stop()}}),e(t).on("visibilitychange",function(){var n=e.fancybox.getInstance(),o=n&&n.SlideShow;o&&o.isActive&&(t.hidden?o.clear():o.set())})}(document,window.jQuery||jQuery),function(t,e){"use strict";var n=function(){var e,n,o,a=[["requestFullscreen","exitFullscreen","fullscreenElement","fullscreenEnabled","fullscreenchange","fullscreenerror"],["webkitRequestFullscreen","webkitExitFullscreen","webkitFullscreenElement","webkitFullscreenEnabled","webkitfullscreenchange","webkitfullscreenerror"],["webkitRequestFullScreen","webkitCancelFullScreen","webkitCurrentFullScreenElement","webkitCancelFullScreen","webkitfullscreenchange","webkitfullscreenerror"],["mozRequestFullScreen","mozCancelFullScreen","mozFullScreenElement","mozFullScreenEnabled","mozfullscreenchange","mozfullscreenerror"],["msRequestFullscreen","msExitFullscreen","msFullscreenElement","msFullscreenEnabled","MSFullscreenChange","MSFullscreenError"]],i={};for(n=0;n<a.length;n++)if(e=a[n],e&&e[1]in t){for(o=0;o<e.length;o++)i[a[0][o]]=e[o];return i}return!1}();if(!n)return void(e&&e.fancybox&&(e.fancybox.defaults.btnTpl.fullScreen=!1));var o={request:function(e){e=e||t.documentElement,e[n.requestFullscreen](e.ALLOW_KEYBOARD_INPUT)},exit:function(){t[n.exitFullscreen]()},toggle:function(e){e=e||t.documentElement,this.isFullscreen()?this.exit():this.request(e)},isFullscreen:function(){return Boolean(t[n.fullscreenElement])},enabled:function(){return Boolean(t[n.fullscreenEnabled])}};e.extend(!0,e.fancybox.defaults,{btnTpl:{fullScreen:'<button data-fancybox-fullscreen class="fancybox-button fancybox-button--fullscreen" title="{{FULL_SCREEN}}"><svg viewBox="0 0 40 40"><path d="M9,12 h22 v16 h-22 v-16 v16 h22 v-16 Z" /></svg></button>'},fullScreen:{autoStart:!1}}),e(t).on({"onInit.fb":function(t,e){var n;e&&e.group[e.currIndex].opts.fullScreen?(n=e.$refs.container,n.on("click.fb-fullscreen","[data-fancybox-fullscreen]",function(t){t.stopPropagation(),t.preventDefault(),o.toggle(n[0])}),e.opts.fullScreen&&e.opts.fullScreen.autoStart===!0&&o.request(n[0]),e.FullScreen=o):e&&e.$refs.toolbar.find("[data-fancybox-fullscreen]").hide()},"afterKeydown.fb":function(t,e,n,o,a){e&&e.FullScreen&&70===a&&(o.preventDefault(),e.FullScreen.toggle(e.$refs.container[0]))},"beforeClose.fb":function(t){t&&t.FullScreen&&o.exit()}}),e(t).on(n.fullscreenchange,function(){var t=o.isFullscreen(),n=e.fancybox.getInstance();n&&(n.current&&"image"===n.current.type&&n.isAnimating&&(n.current.$content.css("transition","none"),n.isAnimating=!1,n.update(!0,!0,0)),n.trigger("onFullscreenChange",t),n.$refs.container.toggleClass("fancybox-is-fullscreen",t))})}(document,window.jQuery||jQuery),function(t,e){"use strict";e.extend(!0,e.fancybox.defaults,{btnTpl:{thumbs:'<button data-fancybox-thumbs class="fancybox-button fancybox-button--thumbs" title="{{THUMBS}}"><svg viewBox="0 0 120 120"><path d="M30,30 h14 v14 h-14 Z M50,30 h14 v14 h-14 Z M70,30 h14 v14 h-14 Z M30,50 h14 v14 h-14 Z M50,50 h14 v14 h-14 Z M70,50 h14 v14 h-14 Z M30,70 h14 v14 h-14 Z M50,70 h14 v14 h-14 Z M70,70 h14 v14 h-14 Z" /></svg></button>'},thumbs:{autoStart:!1,hideOnClose:!0,parentEl:".fancybox-container"}});var n=function(t){this.instance=t,this.init()};e.extend(n.prototype,{$button:null,$grid:null,$list:null,isVisible:!1,init:function(){var t=this,e=t.instance,n=e.group[0],o=e.group[1];t.opts=e.group[e.currIndex].opts.thumbs,t.$button=e.$refs.toolbar.find("[data-fancybox-thumbs]"),t.opts&&n&&o&&("image"==n.type||n.opts.thumb||n.opts.$thumb)&&("image"==o.type||o.opts.thumb||o.opts.$thumb)?(t.$button.show().on("click",function(){t.toggle()}),t.isActive=!0,t.opts.autoStart===!0&&t.show()):(t.$button.hide(),t.isActive=!1)},create:function(){var t,n,o=this,a=o.instance,i=o.opts.parentEl;o.$grid=e('<div class="fancybox-thumbs"></div>').appendTo(a.$refs.container.find(i).addBack().filter(i)),t="<ul>",e.each(a.group,function(e,o){n=o.opts.thumb||(o.opts.$thumb?o.opts.$thumb.attr("src"):null),n||"image"!==o.type||(n=o.src),n&&n.length&&(t+='<li data-index="'+e+'"  tabindex="0" class="fancybox-thumbs-loading"><img data-src="'+n+'" /></li>')}),t+="</ul>",o.$list=e(t).appendTo(o.$grid).on("click","li",function(){a.jumpTo(e(this).data("index"))}),o.$list.find("img").hide().one("load",function(){var t,n,o,a,i=e(this).parent().removeClass("fancybox-thumbs-loading"),s=i.outerWidth(),r=i.outerHeight();t=this.naturalWidth||this.width,n=this.naturalHeight||this.height,o=t/s,a=n/r,o>=1&&a>=1&&(o>a?(t/=a,n=r):(t=s,n/=o)),e(this).css({width:Math.floor(t),height:Math.floor(n),"margin-top":Math.min(0,Math.floor(.3*r-.3*n)),"margin-left":Math.min(0,Math.floor(.5*s-.5*t))}).show()}).each(function(){this.src=e(this).data("src")})},focus:function(t){var e,n,o=this.$list;this.instance.current&&(e=o.children().removeClass("fancybox-thumbs-active").filter('[data-index="'+this.instance.current.index+'"]').addClass("fancybox-thumbs-active"),n=e.position(),n.top<0||n.top>o.height()-e.outerHeight()?o.stop().animate({scrollTop:o.scrollTop()+n.top},t):(n.left<0||n.left>o.width()-e.outerWidth())&&o.stop().animate({scrollLeft:o.scrollLeft()+n.left},t))},update:function(){this.instance.$refs.container.toggleClass("fancybox-show-thumbs",this.isVisible),this.isVisible?(this.$grid||this.create(),this.instance.trigger("onThumbsShow"),this.focus(0)):this.$grid&&this.instance.trigger("onThumbsHide"),this.instance.update()},hide:function(){this.isVisible=!1,this.update()},show:function(){this.isVisible=!0,this.update()},toggle:function(){this.isVisible=!this.isVisible,this.update()}}),e(t).on({"onInit.fb":function(t,e){var o;e&&!e.Thumbs&&(o=e.Thumbs=new n(e))},"beforeShow.fb":function(t,e,n,o){var a=e&&e.Thumbs;a&&a.isVisible&&a.focus(o?0:250)},"afterKeydown.fb":function(t,e,n,o,a){var i=e&&e.Thumbs;i&&i.isActive&&71===a&&(o.preventDefault(),i.toggle())},"beforeClose.fb":function(t,e){var n=e&&e.Thumbs;n&&n.isVisible&&n.opts.hideOnClose!==!1&&n.$grid.hide()}})}(document,window.jQuery),function(t,e){"use strict";e.extend(!0,e.fancybox.defaults,{btnTpl:{share:'<button data-fancybox-share class="fancybox-button fancybox-button--share" title="{{SHARE}}"><svg viewBox="0 0 40 40"><path d="M6,30 C8,18 19,16 23,16 L23,16 L23,10 L33,20 L23,29 L23,24 C19,24 8,27 6,30 Z"></svg></button>'},share:{tpl:'<div class="fancybox-share"><h1>{{SHARE}}</h1><p><a href="https://www.facebook.com/sharer/sharer.php?u={{src}}" target="_blank" class="fancybox-share_button"><svg version="1.1" viewBox="0 0 32 32" fill="#3b5998"><path d="M27.6 3h-23.2c-.8 0-1.4.6-1.4 1.4v23.1c0 .9.6 1.5 1.4 1.5h12.5v-10.1h-3.4v-3.9h3.4v-2.9c0-3.4 2.1-5.2 5-5.2 1.4 0 2.7.1 3 .2v3.5h-2.1c-1.6 0-1.9.8-1.9 1.9v2.5h3.9l-.5 3.9h-3.4v10.1h6.6c.8 0 1.4-.6 1.4-1.4v-23.2c.1-.8-.5-1.4-1.3-1.4z"></path></svg><span>Facebook</span></a><a href="https://www.pinterest.com/pin/create/button/?url={{src}}&amp;description={{descr}}" target="_blank" class="fancybox-share_button"><svg version="1.1" viewBox="0 0 32 32" fill="#c92228"><path d="M16 3c-7.2 0-13 5.8-13 13 0 5.5 3.4 10.2 8.3 12.1-.1-1-.2-2.6 0-3.7.2-1 1.5-6.5 1.5-6.5s-.4-.8-.4-1.9c0-1.8 1-3.2 2.4-3.2 1.1 0 1.6.8 1.6 1.8 0 1.1-.7 2.8-1.1 4.3-.3 1.3.6 2.3 1.9 2.3 2.3 0 4.1-2.4 4.1-6 0-3.1-2.2-5.3-5.4-5.3-3.7 0-5.9 2.8-5.9 5.6 0 1.1.4 2.3 1 3 .1.1.1.2.1.4-.1.4-.3 1.3-.4 1.5-.1.2-.2.3-.4.2-1.6-.8-2.6-3.1-2.6-5 0-4.1 3-7.9 8.6-7.9 4.5 0 8 3.2 8 7.5 0 4.5-2.8 8.1-6.7 8.1-1.3 0-2.6-.7-3-1.5 0 0-.7 2.5-.8 3.1-.3 1.1-1.1 2.5-1.6 3.4 1.2.4 2.5.6 3.8.6 7.2 0 13-5.8 13-13 0-7.1-5.8-12.9-13-12.9z"></path></svg><span>Pinterest</span></a><a href="https://twitter.com/intent/tweet?url={{src}}&amp;text={{descr}}" target="_blank" class="fancybox-share_button"><svg version="1.1" viewBox="0 0 32 32" fill="#1da1f2"><path d="M30 7.3c-1 .5-2.1.8-3.3.9 1.2-.7 2.1-1.8 2.5-3.2-1.1.7-2.3 1.1-3.6 1.4-1-1.1-2.5-1.8-4.2-1.8-3.2 0-5.7 2.6-5.7 5.7 0 .5.1.9.1 1.3-4.8-.2-9-2.5-11.8-6-.5.9-.8 1.9-.8 3 0 2 1 3.8 2.6 4.8-.9 0-1.8-.3-2.6-.7v.1c0 2.8 2 5.1 4.6 5.6-.5.1-1 .2-1.5.2-.4 0-.7 0-1.1-.1.7 2.3 2.9 3.9 5.4 4-2 1.5-4.4 2.5-7.1 2.5-.5 0-.9 0-1.4-.1 2.5 1.6 5.6 2.6 8.8 2.6 10.6 0 16.3-8.8 16.3-16.3v-.7c1.1-1 2-2 2.8-3.2z"></path></svg><span>Twitter</span></a></p></div>'}}),e(t).on("click","[data-fancybox-share]",function(){var t,n=e.fancybox.getInstance();n&&(t=n.current.opts.share.tpl.replace(/\{\{src\}\}/g,encodeURIComponent(n.current.opts.hash===!1?n.current.src:window.location)),n.$caption&&(t=t.replace(/\{\{descr\}\}/g,encodeURIComponent(n.$caption.text()))),e.fancybox.open({src:n.translate(n,t),type:"html",opts:{autoFocus:!1,animationEffect:"fade"}}))})}(document,window.jQuery||jQuery),function(t,e,n){"use strict";function o(){var t=e.location.hash.substr(1),n=t.split("-"),o=n.length>1&&/^\+?\d+$/.test(n[n.length-1])?parseInt(n.pop(-1),10)||1:1,a=n.join("-");return o<1&&(o=1),{hash:t,index:o,gallery:a}}function a(t){var e;""!==t.gallery&&(e=n("[data-fancybox='"+n.escapeSelector(t.gallery)+"']").eq(t.index-1),e.length||(e=n("#"+n.escapeSelector(t.gallery))),e.length&&(s=!1,e.trigger("click")))}function i(t){var e;return!!t&&(e=t.current?t.current.opts:t.opts,e.hash||(e.$orig?e.$orig.data("fancybox"):""))}n.escapeSelector||(n.escapeSelector=function(t){var e=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g,n=function(t,e){return e?"\0"===t?"�":t.slice(0,-1)+"\\"+t.charCodeAt(t.length-1).toString(16)+" ":"\\"+t};return(t+"").replace(e,n)});var s=!0,r=null,c=null;n(function(){n.fancybox.defaults.hash!==!1&&(n(t).on({"onInit.fb":function(t,e){var n,a;e.group[e.currIndex].opts.hash!==!1&&(n=o(),a=i(e),a&&n.gallery&&a==n.gallery&&(e.currIndex=n.index-1))},"beforeShow.fb":function(n,o,a){var l;a&&a.opts.hash!==!1&&(l=i(o),l&&""!==l&&(e.location.hash.indexOf(l)<0&&(o.opts.origHash=e.location.hash),r=l+(o.group.length>1?"-"+(a.index+1):""),"replaceState"in e.history?(c&&clearTimeout(c),c=setTimeout(function(){e.history[s?"pushState":"replaceState"]({},t.title,e.location.pathname+e.location.search+"#"+r),c=null,s=!1},300)):e.location.hash=r))},"beforeClose.fb":function(o,a,s){var l,u;c&&clearTimeout(c),s.opts.hash!==!1&&(l=i(a),u=a&&a.opts.origHash?a.opts.origHash:"",l&&""!==l&&("replaceState"in history?e.history.replaceState({},t.title,e.location.pathname+e.location.search+u):(e.location.hash=u,n(e).scrollTop(a.scrollTop).scrollLeft(a.scrollLeft))),r=null)}}),n(e).on("hashchange.fb",function(){var t=o();n.fancybox.getInstance()?!r||r===t.gallery+"-"+t.index||1===t.index&&r==t.gallery||(r=null,n.fancybox.close()):""!==t.gallery&&a(t)}),setTimeout(function(){a(o())},50))})}(document,window,window.jQuery||jQuery);
\ No newline at end of file
+!function(t,e,n,o){"use strict";function i(t,e){var o,i,a,s=[],r=0;t&&t.isDefaultPrevented()||(t.preventDefault(),e=e||{},t&&t.data&&(e=h(t.data.options,e)),o=e.$target||n(t.currentTarget).trigger("blur"),(a=n.fancybox.getInstance())&&a.$trigger&&a.$trigger.is(o)||(e.selector?s=n(e.selector):(i=o.attr("data-fancybox")||"",i?(s=t.data?t.data.items:[],s=s.length?s.filter('[data-fancybox="'+i+'"]'):n('[data-fancybox="'+i+'"]')):s=[o]),r=n(s).index(o),r<0&&(r=0),a=n.fancybox.open(s,e,r),a.$trigger=o))}if(t.console=t.console||{info:function(t){}},n){if(n.fn.fancybox)return void console.info("fancyBox already initialized");var a={closeExisting:!1,loop:!1,gutter:50,keyboard:!0,preventCaptionOverlap:!0,arrows:!0,infobar:!0,smallBtn:"auto",toolbar:"auto",buttons:["zoom","slideShow","thumbs","close"],idleTime:3,protect:!1,modal:!1,image:{preload:!1},ajax:{settings:{data:{fancybox:!0}}},iframe:{tpl:'<iframe id="fancybox-frame{rnd}" name="fancybox-frame{rnd}" class="fancybox-iframe" allowfullscreen="allowfullscreen" allow="autoplay; fullscreen" src=""></iframe>',preload:!0,css:{},attr:{scrolling:"auto"}},video:{tpl:'<video class="fancybox-video" controls controlsList="nodownload" poster="{{poster}}"><source src="{{src}}" type="{{format}}" />Sorry, your browser doesn\'t support embedded videos, <a href="{{src}}">download</a> and watch with your favorite video player!</video>',format:"",autoStart:!0},defaultType:"image",animationEffect:"zoom",animationDuration:366,zoomOpacity:"auto",transitionEffect:"fade",transitionDuration:366,slideClass:"",baseClass:"",baseTpl:'<div class="fancybox-container" role="dialog" tabindex="-1"><div class="fancybox-bg"></div><div class="fancybox-inner"><div class="fancybox-infobar"><span data-fancybox-index></span>&nbsp;/&nbsp;<span data-fancybox-count></span></div><div class="fancybox-toolbar">{{buttons}}</div><div class="fancybox-navigation">{{arrows}}</div><div class="fancybox-stage"></div><div class="fancybox-caption"><div class="fancybox-caption__body"></div></div></div></div>',spinnerTpl:'<div class="fancybox-loading"></div>',errorTpl:'<div class="fancybox-error"><p>{{ERROR}}</p></div>',btnTpl:{download:'<a download data-fancybox-download class="fancybox-button fancybox-button--download" title="{{DOWNLOAD}}" href="javascript:;"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M18.62 17.09V19H5.38v-1.91zm-2.97-6.96L17 11.45l-5 4.87-5-4.87 1.36-1.32 2.68 2.64V5h1.92v7.77z"/></svg></a>',zoom:'<button data-fancybox-zoom class="fancybox-button fancybox-button--zoom" title="{{ZOOM}}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M18.7 17.3l-3-3a5.9 5.9 0 0 0-.6-7.6 5.9 5.9 0 0 0-8.4 0 5.9 5.9 0 0 0 0 8.4 5.9 5.9 0 0 0 7.7.7l3 3a1 1 0 0 0 1.3 0c.4-.5.4-1 0-1.5zM8.1 13.8a4 4 0 0 1 0-5.7 4 4 0 0 1 5.7 0 4 4 0 0 1 0 5.7 4 4 0 0 1-5.7 0z"/></svg></button>',close:'<button data-fancybox-close class="fancybox-button fancybox-button--close" title="{{CLOSE}}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 10.6L6.6 5.2 5.2 6.6l5.4 5.4-5.4 5.4 1.4 1.4 5.4-5.4 5.4 5.4 1.4-1.4-5.4-5.4 5.4-5.4-1.4-1.4-5.4 5.4z"/></svg></button>',arrowLeft:'<button data-fancybox-prev class="fancybox-button fancybox-button--arrow_left" title="{{PREV}}"><div><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M11.28 15.7l-1.34 1.37L5 12l4.94-5.07 1.34 1.38-2.68 2.72H19v1.94H8.6z"/></svg></div></button>',arrowRight:'<button data-fancybox-next class="fancybox-button fancybox-button--arrow_right" title="{{NEXT}}"><div><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M15.4 12.97l-2.68 2.72 1.34 1.38L19 12l-4.94-5.07-1.34 1.38 2.68 2.72H5v1.94z"/></svg></div></button>',smallBtn:'<button type="button" data-fancybox-close class="fancybox-button fancybox-close-small" title="{{CLOSE}}"><svg xmlns="http://www.w3.org/2000/svg" version="1" viewBox="0 0 24 24"><path d="M13 12l5-5-1-1-5 5-5-5-1 1 5 5-5 5 1 1 5-5 5 5 1-1z"/></svg></button>'},parentEl:"body",hideScrollbar:!0,autoFocus:!0,backFocus:!0,trapFocus:!0,fullScreen:{autoStart:!1},touch:{vertical:!0,momentum:!0},hash:null,media:{},slideShow:{autoStart:!1,speed:3e3},thumbs:{autoStart:!1,hideOnClose:!0,parentEl:".fancybox-container",axis:"y"},wheel:"auto",onInit:n.noop,beforeLoad:n.noop,afterLoad:n.noop,beforeShow:n.noop,afterShow:n.noop,beforeClose:n.noop,afterClose:n.noop,onActivate:n.noop,onDeactivate:n.noop,clickContent:function(t,e){return"image"===t.type&&"zoom"},clickSlide:"close",clickOutside:"close",dblclickContent:!1,dblclickSlide:!1,dblclickOutside:!1,mobile:{preventCaptionOverlap:!1,idleTime:!1,clickContent:function(t,e){return"image"===t.type&&"toggleControls"},clickSlide:function(t,e){return"image"===t.type?"toggleControls":"close"},dblclickContent:function(t,e){return"image"===t.type&&"zoom"},dblclickSlide:function(t,e){return"image"===t.type&&"zoom"}},lang:"en",i18n:{en:{CLOSE:"Close",NEXT:"Next",PREV:"Previous",ERROR:"The requested content cannot be loaded. <br/> Please try again later.",PLAY_START:"Start slideshow",PLAY_STOP:"Pause slideshow",FULL_SCREEN:"Full screen",THUMBS:"Thumbnails",DOWNLOAD:"Download",SHARE:"Share",ZOOM:"Zoom"},de:{CLOSE:"Schlie&szlig;en",NEXT:"Weiter",PREV:"Zur&uuml;ck",ERROR:"Die angeforderten Daten konnten nicht geladen werden. <br/> Bitte versuchen Sie es sp&auml;ter nochmal.",PLAY_START:"Diaschau starten",PLAY_STOP:"Diaschau beenden",FULL_SCREEN:"Vollbild",THUMBS:"Vorschaubilder",DOWNLOAD:"Herunterladen",SHARE:"Teilen",ZOOM:"Vergr&ouml;&szlig;ern"}}},s=n(t),r=n(e),c=0,l=function(t){return t&&t.hasOwnProperty&&t instanceof n},d=function(){return t.requestAnimationFrame||t.webkitRequestAnimationFrame||t.mozRequestAnimationFrame||t.oRequestAnimationFrame||function(e){return t.setTimeout(e,1e3/60)}}(),u=function(){return t.cancelAnimationFrame||t.webkitCancelAnimationFrame||t.mozCancelAnimationFrame||t.oCancelAnimationFrame||function(e){t.clearTimeout(e)}}(),f=function(){var t,n=e.createElement("fakeelement"),o={transition:"transitionend",OTransition:"oTransitionEnd",MozTransition:"transitionend",WebkitTransition:"webkitTransitionEnd"};for(t in o)if(void 0!==n.style[t])return o[t];return"transitionend"}(),p=function(t){return t&&t.length&&t[0].offsetHeight},h=function(t,e){var o=n.extend(!0,{},t,e);return n.each(e,function(t,e){n.isArray(e)&&(o[t]=e)}),o},g=function(t){var o,i;return!(!t||t.ownerDocument!==e)&&(n(".fancybox-container").css("pointer-events","none"),o={x:t.getBoundingClientRect().left+t.offsetWidth/2,y:t.getBoundingClientRect().top+t.offsetHeight/2},i=e.elementFromPoint(o.x,o.y)===t,n(".fancybox-container").css("pointer-events",""),i)},b=function(t,e,o){var i=this;i.opts=h({index:o},n.fancybox.defaults),n.isPlainObject(e)&&(i.opts=h(i.opts,e)),n.fancybox.isMobile&&(i.opts=h(i.opts,i.opts.mobile)),i.id=i.opts.id||++c,i.currIndex=parseInt(i.opts.index,10)||0,i.prevIndex=null,i.prevPos=null,i.currPos=0,i.firstRun=!0,i.group=[],i.slides={},i.addContent(t),i.group.length&&i.init()};n.extend(b.prototype,{init:function(){var o,i,a=this,s=a.group[a.currIndex],r=s.opts;r.closeExisting&&n.fancybox.close(!0),n("body").addClass("fancybox-active"),!n.fancybox.getInstance()&&!1!==r.hideScrollbar&&!n.fancybox.isMobile&&e.body.scrollHeight>t.innerHeight&&(n("head").append('<style id="fancybox-style-noscroll" type="text/css">.compensate-for-scrollbar{margin-right:'+(t.innerWidth-e.documentElement.clientWidth)+"px;}</style>"),n("body").addClass("compensate-for-scrollbar")),i="",n.each(r.buttons,function(t,e){i+=r.btnTpl[e]||""}),o=n(a.translate(a,r.baseTpl.replace("{{buttons}}",i).replace("{{arrows}}",r.btnTpl.arrowLeft+r.btnTpl.arrowRight))).attr("id","fancybox-container-"+a.id).addClass(r.baseClass).data("FancyBox",a).appendTo(r.parentEl),a.$refs={container:o},["bg","inner","infobar","toolbar","stage","caption","navigation"].forEach(function(t){a.$refs[t]=o.find(".fancybox-"+t)}),a.trigger("onInit"),a.activate(),a.jumpTo(a.currIndex)},translate:function(t,e){var n=t.opts.i18n[t.opts.lang]||t.opts.i18n.en;return e.replace(/\{\{(\w+)\}\}/g,function(t,e){return void 0===n[e]?t:n[e]})},addContent:function(t){var e,o=this,i=n.makeArray(t);n.each(i,function(t,e){var i,a,s,r,c,l={},d={};n.isPlainObject(e)?(l=e,d=e.opts||e):"object"===n.type(e)&&n(e).length?(i=n(e),d=i.data()||{},d=n.extend(!0,{},d,d.options),d.$orig=i,l.src=o.opts.src||d.src||i.attr("href"),l.type||l.src||(l.type="inline",l.src=e)):l={type:"html",src:e+""},l.opts=n.extend(!0,{},o.opts,d),n.isArray(d.buttons)&&(l.opts.buttons=d.buttons),n.fancybox.isMobile&&l.opts.mobile&&(l.opts=h(l.opts,l.opts.mobile)),a=l.type||l.opts.type,r=l.src||"",!a&&r&&((s=r.match(/\.(mp4|mov|ogv|webm)((\?|#).*)?$/i))?(a="video",l.opts.video.format||(l.opts.video.format="video/"+("ogv"===s[1]?"ogg":s[1]))):r.match(/(^data:image\/[a-z0-9+\/=]*,)|(\.(jp(e|g|eg)|gif|png|bmp|webp|svg|ico)((\?|#).*)?$)/i)?a="image":r.match(/\.(pdf)((\?|#).*)?$/i)?(a="iframe",l=n.extend(!0,l,{contentType:"pdf",opts:{iframe:{preload:!1}}})):"#"===r.charAt(0)&&(a="inline")),a?l.type=a:o.trigger("objectNeedsType",l),l.contentType||(l.contentType=n.inArray(l.type,["html","inline","ajax"])>-1?"html":l.type),l.index=o.group.length,"auto"==l.opts.smallBtn&&(l.opts.smallBtn=n.inArray(l.type,["html","inline","ajax"])>-1),"auto"===l.opts.toolbar&&(l.opts.toolbar=!l.opts.smallBtn),l.$thumb=l.opts.$thumb||null,l.opts.$trigger&&l.index===o.opts.index&&(l.$thumb=l.opts.$trigger.find("img:first"),l.$thumb.length&&(l.opts.$orig=l.opts.$trigger)),l.$thumb&&l.$thumb.length||!l.opts.$orig||(l.$thumb=l.opts.$orig.find("img:first")),l.$thumb&&!l.$thumb.length&&(l.$thumb=null),l.thumb=l.opts.thumb||(l.$thumb?l.$thumb[0].src:null),"function"===n.type(l.opts.caption)&&(l.opts.caption=l.opts.caption.apply(e,[o,l])),"function"===n.type(o.opts.caption)&&(l.opts.caption=o.opts.caption.apply(e,[o,l])),l.opts.caption instanceof n||(l.opts.caption=void 0===l.opts.caption?"":l.opts.caption+""),"ajax"===l.type&&(c=r.split(/\s+/,2),c.length>1&&(l.src=c.shift(),l.opts.filter=c.shift())),l.opts.modal&&(l.opts=n.extend(!0,l.opts,{trapFocus:!0,infobar:0,toolbar:0,smallBtn:0,keyboard:0,slideShow:0,fullScreen:0,thumbs:0,touch:0,clickContent:!1,clickSlide:!1,clickOutside:!1,dblclickContent:!1,dblclickSlide:!1,dblclickOutside:!1})),o.group.push(l)}),Object.keys(o.slides).length&&(o.updateControls(),(e=o.Thumbs)&&e.isActive&&(e.create(),e.focus()))},addEvents:function(){var e=this;e.removeEvents(),e.$refs.container.on("click.fb-close","[data-fancybox-close]",function(t){t.stopPropagation(),t.preventDefault(),e.close(t)}).on("touchstart.fb-prev click.fb-prev","[data-fancybox-prev]",function(t){t.stopPropagation(),t.preventDefault(),e.previous()}).on("touchstart.fb-next click.fb-next","[data-fancybox-next]",function(t){t.stopPropagation(),t.preventDefault(),e.next()}).on("click.fb","[data-fancybox-zoom]",function(t){e[e.isScaledDown()?"scaleToActual":"scaleToFit"]()}),s.on("orientationchange.fb resize.fb",function(t){t&&t.originalEvent&&"resize"===t.originalEvent.type?(e.requestId&&u(e.requestId),e.requestId=d(function(){e.update(t)})):(e.current&&"iframe"===e.current.type&&e.$refs.stage.hide(),setTimeout(function(){e.$refs.stage.show(),e.update(t)},n.fancybox.isMobile?600:250))}),r.on("keydown.fb",function(t){var o=n.fancybox?n.fancybox.getInstance():null,i=o.current,a=t.keyCode||t.which;if(9==a)return void(i.opts.trapFocus&&e.focus(t));if(!(!i.opts.keyboard||t.ctrlKey||t.altKey||t.shiftKey||n(t.target).is("input,textarea,video,audio")))return 8===a||27===a?(t.preventDefault(),void e.close(t)):37===a||38===a?(t.preventDefault(),void e.previous()):39===a||40===a?(t.preventDefault(),void e.next()):void e.trigger("afterKeydown",t,a)}),e.group[e.currIndex].opts.idleTime&&(e.idleSecondsCounter=0,r.on("mousemove.fb-idle mouseleave.fb-idle mousedown.fb-idle touchstart.fb-idle touchmove.fb-idle scroll.fb-idle keydown.fb-idle",function(t){e.idleSecondsCounter=0,e.isIdle&&e.showControls(),e.isIdle=!1}),e.idleInterval=t.setInterval(function(){++e.idleSecondsCounter>=e.group[e.currIndex].opts.idleTime&&!e.isDragging&&(e.isIdle=!0,e.idleSecondsCounter=0,e.hideControls())},1e3))},removeEvents:function(){var e=this;s.off("orientationchange.fb resize.fb"),r.off("keydown.fb .fb-idle"),this.$refs.container.off(".fb-close .fb-prev .fb-next"),e.idleInterval&&(t.clearInterval(e.idleInterval),e.idleInterval=null)},previous:function(t){return this.jumpTo(this.currPos-1,t)},next:function(t){return this.jumpTo(this.currPos+1,t)},jumpTo:function(t,e){var o,i,a,s,r,c,l,d,u,f=this,h=f.group.length;if(!(f.isDragging||f.isClosing||f.isAnimating&&f.firstRun)){if(t=parseInt(t,10),!(a=f.current?f.current.opts.loop:f.opts.loop)&&(t<0||t>=h))return!1;if(o=f.firstRun=!Object.keys(f.slides).length,r=f.current,f.prevIndex=f.currIndex,f.prevPos=f.currPos,s=f.createSlide(t),h>1&&((a||s.index<h-1)&&f.createSlide(t+1),(a||s.index>0)&&f.createSlide(t-1)),f.current=s,f.currIndex=s.index,f.currPos=s.pos,f.trigger("beforeShow",o),f.updateControls(),s.forcedDuration=void 0,n.isNumeric(e)?s.forcedDuration=e:e=s.opts[o?"animationDuration":"transitionDuration"],e=parseInt(e,10),i=f.isMoved(s),s.$slide.addClass("fancybox-slide--current"),o)return s.opts.animationEffect&&e&&f.$refs.container.css("transition-duration",e+"ms"),f.$refs.container.addClass("fancybox-is-open").trigger("focus"),f.loadSlide(s),void f.preload("image");c=n.fancybox.getTranslate(r.$slide),l=n.fancybox.getTranslate(f.$refs.stage),n.each(f.slides,function(t,e){n.fancybox.stop(e.$slide,!0)}),r.pos!==s.pos&&(r.isComplete=!1),r.$slide.removeClass("fancybox-slide--complete fancybox-slide--current"),i?(u=c.left-(r.pos*c.width+r.pos*r.opts.gutter),n.each(f.slides,function(t,o){o.$slide.removeClass("fancybox-animated").removeClass(function(t,e){return(e.match(/(^|\s)fancybox-fx-\S+/g)||[]).join(" ")});var i=o.pos*c.width+o.pos*o.opts.gutter;n.fancybox.setTranslate(o.$slide,{top:0,left:i-l.left+u}),o.pos!==s.pos&&o.$slide.addClass("fancybox-slide--"+(o.pos>s.pos?"next":"previous")),p(o.$slide),n.fancybox.animate(o.$slide,{top:0,left:(o.pos-s.pos)*c.width+(o.pos-s.pos)*o.opts.gutter},e,function(){o.$slide.css({transform:"",opacity:""}).removeClass("fancybox-slide--next fancybox-slide--previous"),o.pos===f.currPos&&f.complete()})})):e&&s.opts.transitionEffect&&(d="fancybox-animated fancybox-fx-"+s.opts.transitionEffect,r.$slide.addClass("fancybox-slide--"+(r.pos>s.pos?"next":"previous")),n.fancybox.animate(r.$slide,d,e,function(){r.$slide.removeClass(d).removeClass("fancybox-slide--next fancybox-slide--previous")},!1)),s.isLoaded?f.revealContent(s):f.loadSlide(s),f.preload("image")}},createSlide:function(t){var e,o,i=this;return o=t%i.group.length,o=o<0?i.group.length+o:o,!i.slides[t]&&i.group[o]&&(e=n('<div class="fancybox-slide"></div>').appendTo(i.$refs.stage),i.slides[t]=n.extend(!0,{},i.group[o],{pos:t,$slide:e,isLoaded:!1}),i.updateSlide(i.slides[t])),i.slides[t]},scaleToActual:function(t,e,o){var i,a,s,r,c,l=this,d=l.current,u=d.$content,f=n.fancybox.getTranslate(d.$slide).width,p=n.fancybox.getTranslate(d.$slide).height,h=d.width,g=d.height;l.isAnimating||l.isMoved()||!u||"image"!=d.type||!d.isLoaded||d.hasError||(l.isAnimating=!0,n.fancybox.stop(u),t=void 0===t?.5*f:t,e=void 0===e?.5*p:e,i=n.fancybox.getTranslate(u),i.top-=n.fancybox.getTranslate(d.$slide).top,i.left-=n.fancybox.getTranslate(d.$slide).left,r=h/i.width,c=g/i.height,a=.5*f-.5*h,s=.5*p-.5*g,h>f&&(a=i.left*r-(t*r-t),a>0&&(a=0),a<f-h&&(a=f-h)),g>p&&(s=i.top*c-(e*c-e),s>0&&(s=0),s<p-g&&(s=p-g)),l.updateCursor(h,g),n.fancybox.animate(u,{top:s,left:a,scaleX:r,scaleY:c},o||366,function(){l.isAnimating=!1}),l.SlideShow&&l.SlideShow.isActive&&l.SlideShow.stop())},scaleToFit:function(t){var e,o=this,i=o.current,a=i.$content;o.isAnimating||o.isMoved()||!a||"image"!=i.type||!i.isLoaded||i.hasError||(o.isAnimating=!0,n.fancybox.stop(a),e=o.getFitPos(i),o.updateCursor(e.width,e.height),n.fancybox.animate(a,{top:e.top,left:e.left,scaleX:e.width/a.width(),scaleY:e.height/a.height()},t||366,function(){o.isAnimating=!1}))},getFitPos:function(t){var e,o,i,a,s=this,r=t.$content,c=t.$slide,l=t.width||t.opts.width,d=t.height||t.opts.height,u={};return!!(t.isLoaded&&r&&r.length)&&(e=n.fancybox.getTranslate(s.$refs.stage).width,o=n.fancybox.getTranslate(s.$refs.stage).height,e-=parseFloat(c.css("paddingLeft"))+parseFloat(c.css("paddingRight"))+parseFloat(r.css("marginLeft"))+parseFloat(r.css("marginRight")),o-=parseFloat(c.css("paddingTop"))+parseFloat(c.css("paddingBottom"))+parseFloat(r.css("marginTop"))+parseFloat(r.css("marginBottom")),l&&d||(l=e,d=o),i=Math.min(1,e/l,o/d),l*=i,d*=i,l>e-.5&&(l=e),d>o-.5&&(d=o),"image"===t.type?(u.top=Math.floor(.5*(o-d))+parseFloat(c.css("paddingTop")),u.left=Math.floor(.5*(e-l))+parseFloat(c.css("paddingLeft"))):"video"===t.contentType&&(a=t.opts.width&&t.opts.height?l/d:t.opts.ratio||16/9,d>l/a?d=l/a:l>d*a&&(l=d*a)),u.width=l,u.height=d,u)},update:function(t){var e=this;n.each(e.slides,function(n,o){e.updateSlide(o,t)})},updateSlide:function(t,e){var o=this,i=t&&t.$content,a=t.width||t.opts.width,s=t.height||t.opts.height,r=t.$slide;o.adjustCaption(t),i&&(a||s||"video"===t.contentType)&&!t.hasError&&(n.fancybox.stop(i),n.fancybox.setTranslate(i,o.getFitPos(t)),t.pos===o.currPos&&(o.isAnimating=!1,o.updateCursor())),o.adjustLayout(t),r.length&&(r.trigger("refresh"),t.pos===o.currPos&&o.$refs.toolbar.add(o.$refs.navigation.find(".fancybox-button--arrow_right")).toggleClass("compensate-for-scrollbar",r.get(0).scrollHeight>r.get(0).clientHeight)),o.trigger("onUpdate",t,e)},centerSlide:function(t){var e=this,o=e.current,i=o.$slide;!e.isClosing&&o&&(i.siblings().css({transform:"",opacity:""}),i.parent().children().removeClass("fancybox-slide--previous fancybox-slide--next"),n.fancybox.animate(i,{top:0,left:0,opacity:1},void 0===t?0:t,function(){i.css({transform:"",opacity:""}),o.isComplete||e.complete()},!1))},isMoved:function(t){var e,o,i=t||this.current;return!!i&&(o=n.fancybox.getTranslate(this.$refs.stage),e=n.fancybox.getTranslate(i.$slide),!i.$slide.hasClass("fancybox-animated")&&(Math.abs(e.top-o.top)>.5||Math.abs(e.left-o.left)>.5))},updateCursor:function(t,e){var o,i,a=this,s=a.current,r=a.$refs.container;s&&!a.isClosing&&a.Guestures&&(r.removeClass("fancybox-is-zoomable fancybox-can-zoomIn fancybox-can-zoomOut fancybox-can-swipe fancybox-can-pan"),o=a.canPan(t,e),i=!!o||a.isZoomable(),r.toggleClass("fancybox-is-zoomable",i),n("[data-fancybox-zoom]").prop("disabled",!i),o?r.addClass("fancybox-can-pan"):i&&("zoom"===s.opts.clickContent||n.isFunction(s.opts.clickContent)&&"zoom"==s.opts.clickContent(s))?r.addClass("fancybox-can-zoomIn"):s.opts.touch&&(s.opts.touch.vertical||a.group.length>1)&&"video"!==s.contentType&&r.addClass("fancybox-can-swipe"))},isZoomable:function(){var t,e=this,n=e.current;if(n&&!e.isClosing&&"image"===n.type&&!n.hasError){if(!n.isLoaded)return!0;if((t=e.getFitPos(n))&&(n.width>t.width||n.height>t.height))return!0}return!1},isScaledDown:function(t,e){var o=this,i=!1,a=o.current,s=a.$content;return void 0!==t&&void 0!==e?i=t<a.width&&e<a.height:s&&(i=n.fancybox.getTranslate(s),i=i.width<a.width&&i.height<a.height),i},canPan:function(t,e){var o=this,i=o.current,a=null,s=!1;return"image"===i.type&&(i.isComplete||t&&e)&&!i.hasError&&(s=o.getFitPos(i),void 0!==t&&void 0!==e?a={width:t,height:e}:i.isComplete&&(a=n.fancybox.getTranslate(i.$content)),a&&s&&(s=Math.abs(a.width-s.width)>1.5||Math.abs(a.height-s.height)>1.5)),s},loadSlide:function(t){var e,o,i,a=this;if(!t.isLoading&&!t.isLoaded){if(t.isLoading=!0,!1===a.trigger("beforeLoad",t))return t.isLoading=!1,!1;switch(e=t.type,o=t.$slide,o.off("refresh").trigger("onReset").addClass(t.opts.slideClass),e){case"image":a.setImage(t);break;case"iframe":a.setIframe(t);break;case"html":a.setContent(t,t.src||t.content);break;case"video":a.setContent(t,t.opts.video.tpl.replace(/\{\{src\}\}/gi,t.src).replace("{{format}}",t.opts.videoFormat||t.opts.video.format||"").replace("{{poster}}",t.thumb||""));break;case"inline":n(t.src).length?a.setContent(t,n(t.src)):a.setError(t);break;case"ajax":a.showLoading(t),i=n.ajax(n.extend({},t.opts.ajax.settings,{url:t.src,success:function(e,n){"success"===n&&a.setContent(t,e)},error:function(e,n){e&&"abort"!==n&&a.setError(t)}})),o.one("onReset",function(){i.abort()});break;default:a.setError(t)}return!0}},setImage:function(t){var o,i=this;setTimeout(function(){var e=t.$image;i.isClosing||!t.isLoading||e&&e.length&&e[0].complete||t.hasError||i.showLoading(t)},50),i.checkSrcset(t),t.$content=n('<div class="fancybox-content"></div>').addClass("fancybox-is-hidden").appendTo(t.$slide.addClass("fancybox-slide--image")),!1!==t.opts.preload&&t.opts.width&&t.opts.height&&t.thumb&&(t.width=t.opts.width,t.height=t.opts.height,o=e.createElement("img"),o.onerror=function(){n(this).remove(),t.$ghost=null},o.onload=function(){i.afterLoad(t)},t.$ghost=n(o).addClass("fancybox-image").appendTo(t.$content).attr("src",t.thumb)),i.setBigImage(t)},checkSrcset:function(e){var n,o,i,a,s=e.opts.srcset||e.opts.image.srcset;if(s){i=t.devicePixelRatio||1,a=t.innerWidth*i,o=s.split(",").map(function(t){var e={};return t.trim().split(/\s+/).forEach(function(t,n){var o=parseInt(t.substring(0,t.length-1),10);if(0===n)return e.url=t;o&&(e.value=o,e.postfix=t[t.length-1])}),e}),o.sort(function(t,e){return t.value-e.value});for(var r=0;r<o.length;r++){var c=o[r];if("w"===c.postfix&&c.value>=a||"x"===c.postfix&&c.value>=i){n=c;break}}!n&&o.length&&(n=o[o.length-1]),n&&(e.src=n.url,e.width&&e.height&&"w"==n.postfix&&(e.height=e.width/e.height*n.value,e.width=n.value),e.opts.srcset=s)}},setBigImage:function(t){var o=this,i=e.createElement("img"),a=n(i);t.$image=a.one("error",function(){o.setError(t)}).one("load",function(){var e;t.$ghost||(o.resolveImageSlideSize(t,this.naturalWidth,this.naturalHeight),o.afterLoad(t)),o.isClosing||(t.opts.srcset&&(e=t.opts.sizes,e&&"auto"!==e||(e=(t.width/t.height>1&&s.width()/s.height()>1?"100":Math.round(t.width/t.height*100))+"vw"),a.attr("sizes",e).attr("srcset",t.opts.srcset)),t.$ghost&&setTimeout(function(){t.$ghost&&!o.isClosing&&t.$ghost.hide()},Math.min(300,Math.max(1e3,t.height/1600))),o.hideLoading(t))}).addClass("fancybox-image").attr("src",t.src).appendTo(t.$content),(i.complete||"complete"==i.readyState)&&a.naturalWidth&&a.naturalHeight?a.trigger("load"):i.error&&a.trigger("error")},resolveImageSlideSize:function(t,e,n){var o=parseInt(t.opts.width,10),i=parseInt(t.opts.height,10);t.width=e,t.height=n,o>0&&(t.width=o,t.height=Math.floor(o*n/e)),i>0&&(t.width=Math.floor(i*e/n),t.height=i)},setIframe:function(t){var e,o=this,i=t.opts.iframe,a=t.$slide;t.$content=n('<div class="fancybox-content'+(i.preload?" fancybox-is-hidden":"")+'"></div>').css(i.css).appendTo(a),a.addClass("fancybox-slide--"+t.contentType),t.$iframe=e=n(i.tpl.replace(/\{rnd\}/g,(new Date).getTime())).attr(i.attr).appendTo(t.$content),i.preload?(o.showLoading(t),e.on("load.fb error.fb",function(e){this.isReady=1,t.$slide.trigger("refresh"),o.afterLoad(t)}),a.on("refresh.fb",function(){var n,o,s=t.$content,r=i.css.width,c=i.css.height;if(1===e[0].isReady){try{n=e.contents(),o=n.find("body")}catch(t){}o&&o.length&&o.children().length&&(a.css("overflow","visible"),s.css({width:"100%","max-width":"100%",height:"9999px"}),void 0===r&&(r=Math.ceil(Math.max(o[0].clientWidth,o.outerWidth(!0)))),s.css("width",r||"").css("max-width",""),void 0===c&&(c=Math.ceil(Math.max(o[0].clientHeight,o.outerHeight(!0)))),s.css("height",c||""),a.css("overflow","auto")),s.removeClass("fancybox-is-hidden")}})):o.afterLoad(t),e.attr("src",t.src),a.one("onReset",function(){try{n(this).find("iframe").hide().unbind().attr("src","//about:blank")}catch(t){}n(this).off("refresh.fb").empty(),t.isLoaded=!1,t.isRevealed=!1})},setContent:function(t,e){var o=this;o.isClosing||(o.hideLoading(t),t.$content&&n.fancybox.stop(t.$content),t.$slide.empty(),l(e)&&e.parent().length?((e.hasClass("fancybox-content")||e.parent().hasClass("fancybox-content"))&&e.parents(".fancybox-slide").trigger("onReset"),t.$placeholder=n("<div>").hide().insertAfter(e),e.css("display","inline-block")):t.hasError||("string"===n.type(e)&&(e=n("<div>").append(n.trim(e)).contents()),t.opts.filter&&(e=n("<div>").html(e).find(t.opts.filter))),t.$slide.one("onReset",function(){n(this).find("video,audio").trigger("pause"),t.$placeholder&&(t.$placeholder.after(e.removeClass("fancybox-content").hide()).remove(),t.$placeholder=null),t.$smallBtn&&(t.$smallBtn.remove(),t.$smallBtn=null),t.hasError||(n(this).empty(),t.isLoaded=!1,t.isRevealed=!1)}),n(e).appendTo(t.$slide),n(e).is("video,audio")&&(n(e).addClass("fancybox-video"),n(e).wrap("<div></div>"),t.contentType="video",t.opts.width=t.opts.width||n(e).attr("width"),t.opts.height=t.opts.height||n(e).attr("height")),t.$content=t.$slide.children().filter("div,form,main,video,audio,article,.fancybox-content").first(),t.$content.siblings().hide(),t.$content.length||(t.$content=t.$slide.wrapInner("<div></div>").children().first()),t.$content.addClass("fancybox-content"),t.$slide.addClass("fancybox-slide--"+t.contentType),o.afterLoad(t))},setError:function(t){t.hasError=!0,t.$slide.trigger("onReset").removeClass("fancybox-slide--"+t.contentType).addClass("fancybox-slide--error"),t.contentType="html",this.setContent(t,this.translate(t,t.opts.errorTpl)),t.pos===this.currPos&&(this.isAnimating=!1)},showLoading:function(t){var e=this;(t=t||e.current)&&!t.$spinner&&(t.$spinner=n(e.translate(e,e.opts.spinnerTpl)).appendTo(t.$slide).hide().fadeIn("fast"))},hideLoading:function(t){var e=this;(t=t||e.current)&&t.$spinner&&(t.$spinner.stop().remove(),delete t.$spinner)},afterLoad:function(t){var e=this;e.isClosing||(t.isLoading=!1,t.isLoaded=!0,e.trigger("afterLoad",t),e.hideLoading(t),!t.opts.smallBtn||t.$smallBtn&&t.$smallBtn.length||(t.$smallBtn=n(e.translate(t,t.opts.btnTpl.smallBtn)).appendTo(t.$content)),t.opts.protect&&t.$content&&!t.hasError&&(t.$content.on("contextmenu.fb",function(t){return 2==t.button&&t.preventDefault(),!0}),"image"===t.type&&n('<div class="fancybox-spaceball"></div>').appendTo(t.$content)),e.adjustCaption(t),e.adjustLayout(t),t.pos===e.currPos&&e.updateCursor(),e.revealContent(t))},adjustCaption:function(t){var e,n=this,o=t||n.current,i=o.opts.caption,a=o.opts.preventCaptionOverlap,s=n.$refs.caption,r=!1;s.toggleClass("fancybox-caption--separate",a),a&&i&&i.length&&(o.pos!==n.currPos?(e=s.clone().appendTo(s.parent()),e.children().eq(0).empty().html(i),r=e.outerHeight(!0),e.empty().remove()):n.$caption&&(r=n.$caption.outerHeight(!0)),o.$slide.css("padding-bottom",r||""))},adjustLayout:function(t){var e,n,o,i,a=this,s=t||a.current;s.isLoaded&&!0!==s.opts.disableLayoutFix&&(s.$content.css("margin-bottom",""),s.$content.outerHeight()>s.$slide.height()+.5&&(o=s.$slide[0].style["padding-bottom"],i=s.$slide.css("padding-bottom"),parseFloat(i)>0&&(e=s.$slide[0].scrollHeight,s.$slide.css("padding-bottom",0),Math.abs(e-s.$slide[0].scrollHeight)<1&&(n=i),s.$slide.css("padding-bottom",o))),s.$content.css("margin-bottom",n))},revealContent:function(t){var e,o,i,a,s=this,r=t.$slide,c=!1,l=!1,d=s.isMoved(t),u=t.isRevealed;return t.isRevealed=!0,e=t.opts[s.firstRun?"animationEffect":"transitionEffect"],i=t.opts[s.firstRun?"animationDuration":"transitionDuration"],i=parseInt(void 0===t.forcedDuration?i:t.forcedDuration,10),!d&&t.pos===s.currPos&&i||(e=!1),"zoom"===e&&(t.pos===s.currPos&&i&&"image"===t.type&&!t.hasError&&(l=s.getThumbPos(t))?c=s.getFitPos(t):e="fade"),"zoom"===e?(s.isAnimating=!0,c.scaleX=c.width/l.width,c.scaleY=c.height/l.height,a=t.opts.zoomOpacity,"auto"==a&&(a=Math.abs(t.width/t.height-l.width/l.height)>.1),a&&(l.opacity=.1,c.opacity=1),n.fancybox.setTranslate(t.$content.removeClass("fancybox-is-hidden"),l),p(t.$content),void n.fancybox.animate(t.$content,c,i,function(){s.isAnimating=!1,s.complete()})):(s.updateSlide(t),e?(n.fancybox.stop(r),o="fancybox-slide--"+(t.pos>=s.prevPos?"next":"previous")+" fancybox-animated fancybox-fx-"+e,r.addClass(o).removeClass("fancybox-slide--current"),t.$content.removeClass("fancybox-is-hidden"),p(r),"image"!==t.type&&t.$content.hide().show(0),void n.fancybox.animate(r,"fancybox-slide--current",i,function(){r.removeClass(o).css({transform:"",opacity:""}),t.pos===s.currPos&&s.complete()},!0)):(t.$content.removeClass("fancybox-is-hidden"),u||!d||"image"!==t.type||t.hasError||t.$content.hide().fadeIn("fast"),void(t.pos===s.currPos&&s.complete())))},getThumbPos:function(t){var e,o,i,a,s,r=!1,c=t.$thumb;return!(!c||!g(c[0]))&&(e=n.fancybox.getTranslate(c),o=parseFloat(c.css("border-top-width")||0),i=parseFloat(c.css("border-right-width")||0),a=parseFloat(c.css("border-bottom-width")||0),s=parseFloat(c.css("border-left-width")||0),r={top:e.top+o,left:e.left+s,width:e.width-i-s,height:e.height-o-a,scaleX:1,scaleY:1},e.width>0&&e.height>0&&r)},complete:function(){var t,e=this,o=e.current,i={};!e.isMoved()&&o.isLoaded&&(o.isComplete||(o.isComplete=!0,o.$slide.siblings().trigger("onReset"),e.preload("inline"),p(o.$slide),o.$slide.addClass("fancybox-slide--complete"),n.each(e.slides,function(t,o){o.pos>=e.currPos-1&&o.pos<=e.currPos+1?i[o.pos]=o:o&&(n.fancybox.stop(o.$slide),o.$slide.off().remove())}),e.slides=i),e.isAnimating=!1,e.updateCursor(),e.trigger("afterShow"),o.opts.video.autoStart&&o.$slide.find("video,audio").filter(":visible:first").trigger("play").one("ended",function(){this.webkitExitFullscreen&&this.webkitExitFullscreen(),e.next()}),o.opts.autoFocus&&"html"===o.contentType&&(t=o.$content.find("input[autofocus]:enabled:visible:first"),t.length?t.trigger("focus"):e.focus(null,!0)),o.$slide.scrollTop(0).scrollLeft(0))},preload:function(t){var e,n,o=this;o.group.length<2||(n=o.slides[o.currPos+1],e=o.slides[o.currPos-1],e&&e.type===t&&o.loadSlide(e),n&&n.type===t&&o.loadSlide(n))},focus:function(t,o){var i,a,s=this,r=["a[href]","area[href]",'input:not([disabled]):not([type="hidden"]):not([aria-hidden])',"select:not([disabled]):not([aria-hidden])","textarea:not([disabled]):not([aria-hidden])","button:not([disabled]):not([aria-hidden])","iframe","object","embed","video","audio","[contenteditable]",'[tabindex]:not([tabindex^="-"])'].join(",");s.isClosing||(i=!t&&s.current&&s.current.isComplete?s.current.$slide.find("*:visible"+(o?":not(.fancybox-close-small)":"")):s.$refs.container.find("*:visible"),i=i.filter(r).filter(function(){return"hidden"!==n(this).css("visibility")&&!n(this).hasClass("disabled")}),i.length?(a=i.index(e.activeElement),t&&t.shiftKey?(a<0||0==a)&&(t.preventDefault(),i.eq(i.length-1).trigger("focus")):(a<0||a==i.length-1)&&(t&&t.preventDefault(),i.eq(0).trigger("focus"))):s.$refs.container.trigger("focus"))},activate:function(){var t=this;n(".fancybox-container").each(function(){var e=n(this).data("FancyBox");e&&e.id!==t.id&&!e.isClosing&&(e.trigger("onDeactivate"),e.removeEvents(),e.isVisible=!1)}),t.isVisible=!0,(t.current||t.isIdle)&&(t.update(),t.updateControls()),t.trigger("onActivate"),t.addEvents()},close:function(t,e){var o,i,a,s,r,c,l,u=this,f=u.current,h=function(){u.cleanUp(t)};return!u.isClosing&&(u.isClosing=!0,!1===u.trigger("beforeClose",t)?(u.isClosing=!1,d(function(){u.update()}),!1):(u.removeEvents(),a=f.$content,o=f.opts.animationEffect,i=n.isNumeric(e)?e:o?f.opts.animationDuration:0,f.$slide.removeClass("fancybox-slide--complete fancybox-slide--next fancybox-slide--previous fancybox-animated"),!0!==t?n.fancybox.stop(f.$slide):o=!1,f.$slide.siblings().trigger("onReset").remove(),i&&u.$refs.container.removeClass("fancybox-is-open").addClass("fancybox-is-closing").css("transition-duration",i+"ms"),u.hideLoading(f),u.hideControls(!0),u.updateCursor(),"zoom"!==o||a&&i&&"image"===f.type&&!u.isMoved()&&!f.hasError&&(l=u.getThumbPos(f))||(o="fade"),"zoom"===o?(n.fancybox.stop(a),s=n.fancybox.getTranslate(a),c={top:s.top,left:s.left,scaleX:s.width/l.width,scaleY:s.height/l.height,width:l.width,height:l.height},r=f.opts.zoomOpacity,"auto"==r&&(r=Math.abs(f.width/f.height-l.width/l.height)>.1),r&&(l.opacity=0),
+n.fancybox.setTranslate(a,c),p(a),n.fancybox.animate(a,l,i,h),!0):(o&&i?n.fancybox.animate(f.$slide.addClass("fancybox-slide--previous").removeClass("fancybox-slide--current"),"fancybox-animated fancybox-fx-"+o,i,h):!0===t?setTimeout(h,i):h(),!0)))},cleanUp:function(e){var o,i,a,s=this,r=s.current.opts.$orig;s.current.$slide.trigger("onReset"),s.$refs.container.empty().remove(),s.trigger("afterClose",e),s.current.opts.backFocus&&(r&&r.length&&r.is(":visible")||(r=s.$trigger),r&&r.length&&(i=t.scrollX,a=t.scrollY,r.trigger("focus"),n("html, body").scrollTop(a).scrollLeft(i))),s.current=null,o=n.fancybox.getInstance(),o?o.activate():(n("body").removeClass("fancybox-active compensate-for-scrollbar"),n("#fancybox-style-noscroll").remove())},trigger:function(t,e){var o,i=Array.prototype.slice.call(arguments,1),a=this,s=e&&e.opts?e:a.current;if(s?i.unshift(s):s=a,i.unshift(a),n.isFunction(s.opts[t])&&(o=s.opts[t].apply(s,i)),!1===o)return o;"afterClose"!==t&&a.$refs?a.$refs.container.trigger(t+".fb",i):r.trigger(t+".fb",i)},updateControls:function(){var t=this,o=t.current,i=o.index,a=t.$refs.container,s=t.$refs.caption,r=o.opts.caption;o.$slide.trigger("refresh"),r&&r.length?(t.$caption=s,s.children().eq(0).html(r)):t.$caption=null,t.hasHiddenControls||t.isIdle||t.showControls(),a.find("[data-fancybox-count]").html(t.group.length),a.find("[data-fancybox-index]").html(i+1),a.find("[data-fancybox-prev]").prop("disabled",!o.opts.loop&&i<=0),a.find("[data-fancybox-next]").prop("disabled",!o.opts.loop&&i>=t.group.length-1),"image"===o.type?a.find("[data-fancybox-zoom]").show().end().find("[data-fancybox-download]").attr("href",o.opts.image.src||o.src).show():o.opts.toolbar&&a.find("[data-fancybox-download],[data-fancybox-zoom]").hide(),n(e.activeElement).is(":hidden,[disabled]")&&t.$refs.container.trigger("focus")},hideControls:function(t){var e=this,n=["infobar","toolbar","nav"];!t&&e.current.opts.preventCaptionOverlap||n.push("caption"),this.$refs.container.removeClass(n.map(function(t){return"fancybox-show-"+t}).join(" ")),this.hasHiddenControls=!0},showControls:function(){var t=this,e=t.current?t.current.opts:t.opts,n=t.$refs.container;t.hasHiddenControls=!1,t.idleSecondsCounter=0,n.toggleClass("fancybox-show-toolbar",!(!e.toolbar||!e.buttons)).toggleClass("fancybox-show-infobar",!!(e.infobar&&t.group.length>1)).toggleClass("fancybox-show-caption",!!t.$caption).toggleClass("fancybox-show-nav",!!(e.arrows&&t.group.length>1)).toggleClass("fancybox-is-modal",!!e.modal)},toggleControls:function(){this.hasHiddenControls?this.showControls():this.hideControls()}}),n.fancybox={version:"3.5.6",defaults:a,getInstance:function(t){var e=n('.fancybox-container:not(".fancybox-is-closing"):last').data("FancyBox"),o=Array.prototype.slice.call(arguments,1);return e instanceof b&&("string"===n.type(t)?e[t].apply(e,o):"function"===n.type(t)&&t.apply(e,o),e)},open:function(t,e,n){return new b(t,e,n)},close:function(t){var e=this.getInstance();e&&(e.close(),!0===t&&this.close(t))},destroy:function(){this.close(!0),r.add("body").off("click.fb-start","**")},isMobile:/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent),use3d:function(){var n=e.createElement("div");return t.getComputedStyle&&t.getComputedStyle(n)&&t.getComputedStyle(n).getPropertyValue("transform")&&!(e.documentMode&&e.documentMode<11)}(),getTranslate:function(t){var e;return!(!t||!t.length)&&(e=t[0].getBoundingClientRect(),{top:e.top||0,left:e.left||0,width:e.width,height:e.height,opacity:parseFloat(t.css("opacity"))})},setTranslate:function(t,e){var n="",o={};if(t&&e)return void 0===e.left&&void 0===e.top||(n=(void 0===e.left?t.position().left:e.left)+"px, "+(void 0===e.top?t.position().top:e.top)+"px",n=this.use3d?"translate3d("+n+", 0px)":"translate("+n+")"),void 0!==e.scaleX&&void 0!==e.scaleY?n+=" scale("+e.scaleX+", "+e.scaleY+")":void 0!==e.scaleX&&(n+=" scaleX("+e.scaleX+")"),n.length&&(o.transform=n),void 0!==e.opacity&&(o.opacity=e.opacity),void 0!==e.width&&(o.width=e.width),void 0!==e.height&&(o.height=e.height),t.css(o)},animate:function(t,e,o,i,a){var s,r=this;n.isFunction(o)&&(i=o,o=null),r.stop(t),s=r.getTranslate(t),t.on(f,function(c){(!c||!c.originalEvent||t.is(c.originalEvent.target)&&"z-index"!=c.originalEvent.propertyName)&&(r.stop(t),n.isNumeric(o)&&t.css("transition-duration",""),n.isPlainObject(e)?void 0!==e.scaleX&&void 0!==e.scaleY&&r.setTranslate(t,{top:e.top,left:e.left,width:s.width*e.scaleX,height:s.height*e.scaleY,scaleX:1,scaleY:1}):!0!==a&&t.removeClass(e),n.isFunction(i)&&i(c))}),n.isNumeric(o)&&t.css("transition-duration",o+"ms"),n.isPlainObject(e)?(void 0!==e.scaleX&&void 0!==e.scaleY&&(delete e.width,delete e.height,t.parent().hasClass("fancybox-slide--image")&&t.parent().addClass("fancybox-is-scaling")),n.fancybox.setTranslate(t,e)):t.addClass(e),t.data("timer",setTimeout(function(){t.trigger(f)},o+33))},stop:function(t,e){t&&t.length&&(clearTimeout(t.data("timer")),e&&t.trigger(f),t.off(f).css("transition-duration",""),t.parent().removeClass("fancybox-is-scaling"))}},n.fn.fancybox=function(t){var e;return t=t||{},e=t.selector||!1,e?n("body").off("click.fb-start",e).on("click.fb-start",e,{options:t},i):this.off("click.fb-start").on("click.fb-start",{items:this,options:t},i),this},r.on("click.fb-start","[data-fancybox]",i),r.on("click.fb-start","[data-fancybox-trigger]",function(t){n('[data-fancybox="'+n(this).attr("data-fancybox-trigger")+'"]').eq(n(this).attr("data-fancybox-index")||0).trigger("click.fb-start",{$trigger:n(this)})}),function(){var t=null;r.on("mousedown mouseup focus blur",".fancybox-button",function(e){switch(e.type){case"mousedown":t=n(this);break;case"mouseup":t=null;break;case"focusin":n(".fancybox-button").removeClass("fancybox-focus"),n(this).is(t)||n(this).is("[disabled]")||n(this).addClass("fancybox-focus");break;case"focusout":n(".fancybox-button").removeClass("fancybox-focus")}})}()}}(window,document,jQuery),function(t){"use strict";var e={youtube:{matcher:/(youtube\.com|youtu\.be|youtube\-nocookie\.com)\/(watch\?(.*&)?v=|v\/|u\/|embed\/?)?(videoseries\?list=(.*)|[\w-]{11}|\?listType=(.*)&list=(.*))(.*)/i,params:{autoplay:1,autohide:1,fs:1,rel:0,hd:1,wmode:"transparent",enablejsapi:1,html5:1},paramPlace:8,type:"iframe",url:"https://www.youtube-nocookie.com/embed/$4",thumb:"https://img.youtube.com/vi/$4/hqdefault.jpg"},vimeo:{matcher:/^.+vimeo.com\/(.*\/)?([\d]+)(.*)?/,params:{autoplay:1,hd:1,show_title:1,show_byline:1,show_portrait:0,fullscreen:1},paramPlace:3,type:"iframe",url:"//player.vimeo.com/video/$2"},instagram:{matcher:/(instagr\.am|instagram\.com)\/p\/([a-zA-Z0-9_\-]+)\/?/i,type:"image",url:"//$1/p/$2/media/?size=l"},gmap_place:{matcher:/(maps\.)?google\.([a-z]{2,3}(\.[a-z]{2})?)\/(((maps\/(place\/(.*)\/)?\@(.*),(\d+.?\d+?)z))|(\?ll=))(.*)?/i,type:"iframe",url:function(t){return"//maps.google."+t[2]+"/?ll="+(t[9]?t[9]+"&z="+Math.floor(t[10])+(t[12]?t[12].replace(/^\//,"&"):""):t[12]+"").replace(/\?/,"&")+"&output="+(t[12]&&t[12].indexOf("layer=c")>0?"svembed":"embed")}},gmap_search:{matcher:/(maps\.)?google\.([a-z]{2,3}(\.[a-z]{2})?)\/(maps\/search\/)(.*)/i,type:"iframe",url:function(t){return"//maps.google."+t[2]+"/maps?q="+t[5].replace("query=","q=").replace("api=1","")+"&output=embed"}}},n=function(e,n,o){if(e)return o=o||"","object"===t.type(o)&&(o=t.param(o,!0)),t.each(n,function(t,n){e=e.replace("$"+t,n||"")}),o.length&&(e+=(e.indexOf("?")>0?"&":"?")+o),e};t(document).on("objectNeedsType.fb",function(o,i,a){var s,r,c,l,d,u,f,p=a.src||"",h=!1;s=t.extend(!0,{},e,a.opts.media),t.each(s,function(e,o){if(c=p.match(o.matcher)){if(h=o.type,f=e,u={},o.paramPlace&&c[o.paramPlace]){d=c[o.paramPlace],"?"==d[0]&&(d=d.substring(1)),d=d.split("&");for(var i=0;i<d.length;++i){var s=d[i].split("=",2);2==s.length&&(u[s[0]]=decodeURIComponent(s[1].replace(/\+/g," ")))}}return l=t.extend(!0,{},o.params,a.opts[e],u),p="function"===t.type(o.url)?o.url.call(this,c,l,a):n(o.url,c,l),r="function"===t.type(o.thumb)?o.thumb.call(this,c,l,a):n(o.thumb,c),"youtube"===e?p=p.replace(/&t=((\d+)m)?(\d+)s/,function(t,e,n,o){return"&start="+((n?60*parseInt(n,10):0)+parseInt(o,10))}):"vimeo"===e&&(p=p.replace("&%23","#")),!1}}),h?(a.opts.thumb||a.opts.$thumb&&a.opts.$thumb.length||(a.opts.thumb=r),"iframe"===h&&(a.opts=t.extend(!0,a.opts,{iframe:{preload:!1,attr:{scrolling:"no"}}})),t.extend(a,{type:h,src:p,origSrc:a.src,contentSource:f,contentType:"image"===h?"image":"gmap_place"==f||"gmap_search"==f?"map":"video"})):p&&(a.type=a.opts.defaultType)});var o={youtube:{src:"https://www.youtube.com/iframe_api",class:"YT",loading:!1,loaded:!1},vimeo:{src:"https://player.vimeo.com/api/player.js",class:"Vimeo",loading:!1,loaded:!1},load:function(t){var e,n=this;if(this[t].loaded)return void setTimeout(function(){n.done(t)});this[t].loading||(this[t].loading=!0,e=document.createElement("script"),e.type="text/javascript",e.src=this[t].src,"youtube"===t?window.onYouTubeIframeAPIReady=function(){n[t].loaded=!0,n.done(t)}:e.onload=function(){n[t].loaded=!0,n.done(t)},document.body.appendChild(e))},done:function(e){var n,o,i;"youtube"===e&&delete window.onYouTubeIframeAPIReady,(n=t.fancybox.getInstance())&&(o=n.current.$content.find("iframe"),"youtube"===e&&void 0!==YT&&YT?i=new YT.Player(o.attr("id"),{events:{onStateChange:function(t){0==t.data&&n.next()}}}):"vimeo"===e&&void 0!==Vimeo&&Vimeo&&(i=new Vimeo.Player(o),i.on("ended",function(){n.next()})))}};t(document).on({"afterShow.fb":function(t,e,n){e.group.length>1&&("youtube"===n.contentSource||"vimeo"===n.contentSource)&&o.load(n.contentSource)}})}(jQuery),function(t,e,n){"use strict";var o=function(){return t.requestAnimationFrame||t.webkitRequestAnimationFrame||t.mozRequestAnimationFrame||t.oRequestAnimationFrame||function(e){return t.setTimeout(e,1e3/60)}}(),i=function(){return t.cancelAnimationFrame||t.webkitCancelAnimationFrame||t.mozCancelAnimationFrame||t.oCancelAnimationFrame||function(e){t.clearTimeout(e)}}(),a=function(e){var n=[];e=e.originalEvent||e||t.e,e=e.touches&&e.touches.length?e.touches:e.changedTouches&&e.changedTouches.length?e.changedTouches:[e];for(var o in e)e[o].pageX?n.push({x:e[o].pageX,y:e[o].pageY}):e[o].clientX&&n.push({x:e[o].clientX,y:e[o].clientY});return n},s=function(t,e,n){return e&&t?"x"===n?t.x-e.x:"y"===n?t.y-e.y:Math.sqrt(Math.pow(t.x-e.x,2)+Math.pow(t.y-e.y,2)):0},r=function(t){if(t.is('a,area,button,[role="button"],input,label,select,summary,textarea,video,audio,iframe')||n.isFunction(t.get(0).onclick)||t.data("selectable"))return!0;for(var e=0,o=t[0].attributes,i=o.length;e<i;e++)if("data-fancybox-"===o[e].nodeName.substr(0,14))return!0;return!1},c=function(e){var n=t.getComputedStyle(e)["overflow-y"],o=t.getComputedStyle(e)["overflow-x"],i=("scroll"===n||"auto"===n)&&e.scrollHeight>e.clientHeight,a=("scroll"===o||"auto"===o)&&e.scrollWidth>e.clientWidth;return i||a},l=function(t){for(var e=!1;;){if(e=c(t.get(0)))break;if(t=t.parent(),!t.length||t.hasClass("fancybox-stage")||t.is("body"))break}return e},d=function(t){var e=this;e.instance=t,e.$bg=t.$refs.bg,e.$stage=t.$refs.stage,e.$container=t.$refs.container,e.destroy(),e.$container.on("touchstart.fb.touch mousedown.fb.touch",n.proxy(e,"ontouchstart"))};d.prototype.destroy=function(){var t=this;t.$container.off(".fb.touch"),n(e).off(".fb.touch"),t.requestId&&(i(t.requestId),t.requestId=null),t.tapped&&(clearTimeout(t.tapped),t.tapped=null)},d.prototype.ontouchstart=function(o){var i=this,c=n(o.target),d=i.instance,u=d.current,f=u.$slide,p=u.$content,h="touchstart"==o.type;if(h&&i.$container.off("mousedown.fb.touch"),(!o.originalEvent||2!=o.originalEvent.button)&&f.length&&c.length&&!r(c)&&!r(c.parent())&&(c.is("img")||!(o.originalEvent.clientX>c[0].clientWidth+c.offset().left))){if(!u||d.isAnimating||u.$slide.hasClass("fancybox-animated"))return o.stopPropagation(),void o.preventDefault();i.realPoints=i.startPoints=a(o),i.startPoints.length&&(u.touch&&o.stopPropagation(),i.startEvent=o,i.canTap=!0,i.$target=c,i.$content=p,i.opts=u.opts.touch,i.isPanning=!1,i.isSwiping=!1,i.isZooming=!1,i.isScrolling=!1,i.canPan=d.canPan(),i.startTime=(new Date).getTime(),i.distanceX=i.distanceY=i.distance=0,i.canvasWidth=Math.round(f[0].clientWidth),i.canvasHeight=Math.round(f[0].clientHeight),i.contentLastPos=null,i.contentStartPos=n.fancybox.getTranslate(i.$content)||{top:0,left:0},i.sliderStartPos=n.fancybox.getTranslate(f),i.stagePos=n.fancybox.getTranslate(d.$refs.stage),i.sliderStartPos.top-=i.stagePos.top,i.sliderStartPos.left-=i.stagePos.left,i.contentStartPos.top-=i.stagePos.top,i.contentStartPos.left-=i.stagePos.left,n(e).off(".fb.touch").on(h?"touchend.fb.touch touchcancel.fb.touch":"mouseup.fb.touch mouseleave.fb.touch",n.proxy(i,"ontouchend")).on(h?"touchmove.fb.touch":"mousemove.fb.touch",n.proxy(i,"ontouchmove")),n.fancybox.isMobile&&e.addEventListener("scroll",i.onscroll,!0),((i.opts||i.canPan)&&(c.is(i.$stage)||i.$stage.find(c).length)||(c.is(".fancybox-image")&&o.preventDefault(),n.fancybox.isMobile&&c.parents(".fancybox-caption").length))&&(i.isScrollable=l(c)||l(c.parent()),n.fancybox.isMobile&&i.isScrollable||o.preventDefault(),(1===i.startPoints.length||u.hasError)&&(i.canPan?(n.fancybox.stop(i.$content),i.isPanning=!0):i.isSwiping=!0,i.$container.addClass("fancybox-is-grabbing")),2===i.startPoints.length&&"image"===u.type&&(u.isLoaded||u.$ghost)&&(i.canTap=!1,i.isSwiping=!1,i.isPanning=!1,i.isZooming=!0,n.fancybox.stop(i.$content),i.centerPointStartX=.5*(i.startPoints[0].x+i.startPoints[1].x)-n(t).scrollLeft(),i.centerPointStartY=.5*(i.startPoints[0].y+i.startPoints[1].y)-n(t).scrollTop(),i.percentageOfImageAtPinchPointX=(i.centerPointStartX-i.contentStartPos.left)/i.contentStartPos.width,i.percentageOfImageAtPinchPointY=(i.centerPointStartY-i.contentStartPos.top)/i.contentStartPos.height,i.startDistanceBetweenFingers=s(i.startPoints[0],i.startPoints[1]))))}},d.prototype.onscroll=function(t){var n=this;n.isScrolling=!0,e.removeEventListener("scroll",n.onscroll,!0)},d.prototype.ontouchmove=function(t){var e=this;return void 0!==t.originalEvent.buttons&&0===t.originalEvent.buttons?void e.ontouchend(t):e.isScrolling?void(e.canTap=!1):(e.newPoints=a(t),void((e.opts||e.canPan)&&e.newPoints.length&&e.newPoints.length&&(e.isSwiping&&!0===e.isSwiping||t.preventDefault(),e.distanceX=s(e.newPoints[0],e.startPoints[0],"x"),e.distanceY=s(e.newPoints[0],e.startPoints[0],"y"),e.distance=s(e.newPoints[0],e.startPoints[0]),e.distance>0&&(e.isSwiping?e.onSwipe(t):e.isPanning?e.onPan():e.isZooming&&e.onZoom()))))},d.prototype.onSwipe=function(e){var a,s=this,r=s.instance,c=s.isSwiping,l=s.sliderStartPos.left||0;if(!0!==c)"x"==c&&(s.distanceX>0&&(s.instance.group.length<2||0===s.instance.current.index&&!s.instance.current.opts.loop)?l+=Math.pow(s.distanceX,.8):s.distanceX<0&&(s.instance.group.length<2||s.instance.current.index===s.instance.group.length-1&&!s.instance.current.opts.loop)?l-=Math.pow(-s.distanceX,.8):l+=s.distanceX),s.sliderLastPos={top:"x"==c?0:s.sliderStartPos.top+s.distanceY,left:l},s.requestId&&(i(s.requestId),s.requestId=null),s.requestId=o(function(){s.sliderLastPos&&(n.each(s.instance.slides,function(t,e){var o=e.pos-s.instance.currPos;n.fancybox.setTranslate(e.$slide,{top:s.sliderLastPos.top,left:s.sliderLastPos.left+o*s.canvasWidth+o*e.opts.gutter})}),s.$container.addClass("fancybox-is-sliding"))});else if(Math.abs(s.distance)>10){if(s.canTap=!1,r.group.length<2&&s.opts.vertical?s.isSwiping="y":r.isDragging||!1===s.opts.vertical||"auto"===s.opts.vertical&&n(t).width()>800?s.isSwiping="x":(a=Math.abs(180*Math.atan2(s.distanceY,s.distanceX)/Math.PI),s.isSwiping=a>45&&a<135?"y":"x"),"y"===s.isSwiping&&n.fancybox.isMobile&&s.isScrollable)return void(s.isScrolling=!0);r.isDragging=s.isSwiping,s.startPoints=s.newPoints,n.each(r.slides,function(t,e){var o,i;n.fancybox.stop(e.$slide),o=n.fancybox.getTranslate(e.$slide),i=n.fancybox.getTranslate(r.$refs.stage),e.$slide.css({transform:"",opacity:"","transition-duration":""}).removeClass("fancybox-animated").removeClass(function(t,e){return(e.match(/(^|\s)fancybox-fx-\S+/g)||[]).join(" ")}),e.pos===r.current.pos&&(s.sliderStartPos.top=o.top-i.top,s.sliderStartPos.left=o.left-i.left),n.fancybox.setTranslate(e.$slide,{top:o.top-i.top,left:o.left-i.left})}),r.SlideShow&&r.SlideShow.isActive&&r.SlideShow.stop()}},d.prototype.onPan=function(){var t=this;if(s(t.newPoints[0],t.realPoints[0])<(n.fancybox.isMobile?10:5))return void(t.startPoints=t.newPoints);t.canTap=!1,t.contentLastPos=t.limitMovement(),t.requestId&&i(t.requestId),t.requestId=o(function(){n.fancybox.setTranslate(t.$content,t.contentLastPos)})},d.prototype.limitMovement=function(){var t,e,n,o,i,a,s=this,r=s.canvasWidth,c=s.canvasHeight,l=s.distanceX,d=s.distanceY,u=s.contentStartPos,f=u.left,p=u.top,h=u.width,g=u.height;return i=h>r?f+l:f,a=p+d,t=Math.max(0,.5*r-.5*h),e=Math.max(0,.5*c-.5*g),n=Math.min(r-h,.5*r-.5*h),o=Math.min(c-g,.5*c-.5*g),l>0&&i>t&&(i=t-1+Math.pow(-t+f+l,.8)||0),l<0&&i<n&&(i=n+1-Math.pow(n-f-l,.8)||0),d>0&&a>e&&(a=e-1+Math.pow(-e+p+d,.8)||0),d<0&&a<o&&(a=o+1-Math.pow(o-p-d,.8)||0),{top:a,left:i}},d.prototype.limitPosition=function(t,e,n,o){var i=this,a=i.canvasWidth,s=i.canvasHeight;return n>a?(t=t>0?0:t,t=t<a-n?a-n:t):t=Math.max(0,a/2-n/2),o>s?(e=e>0?0:e,e=e<s-o?s-o:e):e=Math.max(0,s/2-o/2),{top:e,left:t}},d.prototype.onZoom=function(){var e=this,a=e.contentStartPos,r=a.width,c=a.height,l=a.left,d=a.top,u=s(e.newPoints[0],e.newPoints[1]),f=u/e.startDistanceBetweenFingers,p=Math.floor(r*f),h=Math.floor(c*f),g=(r-p)*e.percentageOfImageAtPinchPointX,b=(c-h)*e.percentageOfImageAtPinchPointY,m=(e.newPoints[0].x+e.newPoints[1].x)/2-n(t).scrollLeft(),v=(e.newPoints[0].y+e.newPoints[1].y)/2-n(t).scrollTop(),y=m-e.centerPointStartX,x=v-e.centerPointStartY,w=l+(g+y),$=d+(b+x),S={top:$,left:w,scaleX:f,scaleY:f};e.canTap=!1,e.newWidth=p,e.newHeight=h,e.contentLastPos=S,e.requestId&&i(e.requestId),e.requestId=o(function(){n.fancybox.setTranslate(e.$content,e.contentLastPos)})},d.prototype.ontouchend=function(t){var o=this,s=o.isSwiping,r=o.isPanning,c=o.isZooming,l=o.isScrolling;if(o.endPoints=a(t),o.dMs=Math.max((new Date).getTime()-o.startTime,1),o.$container.removeClass("fancybox-is-grabbing"),n(e).off(".fb.touch"),e.removeEventListener("scroll",o.onscroll,!0),o.requestId&&(i(o.requestId),o.requestId=null),o.isSwiping=!1,o.isPanning=!1,o.isZooming=!1,o.isScrolling=!1,o.instance.isDragging=!1,o.canTap)return o.onTap(t);o.speed=100,o.velocityX=o.distanceX/o.dMs*.5,o.velocityY=o.distanceY/o.dMs*.5,r?o.endPanning():c?o.endZooming():o.endSwiping(s,l)},d.prototype.endSwiping=function(t,e){var o=this,i=!1,a=o.instance.group.length,s=Math.abs(o.distanceX),r="x"==t&&a>1&&(o.dMs>130&&s>10||s>50);o.sliderLastPos=null,"y"==t&&!e&&Math.abs(o.distanceY)>50?(n.fancybox.animate(o.instance.current.$slide,{top:o.sliderStartPos.top+o.distanceY+150*o.velocityY,opacity:0},200),i=o.instance.close(!0,250)):r&&o.distanceX>0?i=o.instance.previous(300):r&&o.distanceX<0&&(i=o.instance.next(300)),!1!==i||"x"!=t&&"y"!=t||o.instance.centerSlide(200),o.$container.removeClass("fancybox-is-sliding")},d.prototype.endPanning=function(){var t,e,o,i=this;i.contentLastPos&&(!1===i.opts.momentum||i.dMs>350?(t=i.contentLastPos.left,e=i.contentLastPos.top):(t=i.contentLastPos.left+500*i.velocityX,e=i.contentLastPos.top+500*i.velocityY),o=i.limitPosition(t,e,i.contentStartPos.width,i.contentStartPos.height),o.width=i.contentStartPos.width,o.height=i.contentStartPos.height,n.fancybox.animate(i.$content,o,366))},d.prototype.endZooming=function(){var t,e,o,i,a=this,s=a.instance.current,r=a.newWidth,c=a.newHeight;a.contentLastPos&&(t=a.contentLastPos.left,e=a.contentLastPos.top,i={top:e,left:t,width:r,height:c,scaleX:1,scaleY:1},n.fancybox.setTranslate(a.$content,i),r<a.canvasWidth&&c<a.canvasHeight?a.instance.scaleToFit(150):r>s.width||c>s.height?a.instance.scaleToActual(a.centerPointStartX,a.centerPointStartY,150):(o=a.limitPosition(t,e,r,c),n.fancybox.animate(a.$content,o,150)))},d.prototype.onTap=function(e){var o,i=this,s=n(e.target),r=i.instance,c=r.current,l=e&&a(e)||i.startPoints,d=l[0]?l[0].x-n(t).scrollLeft()-i.stagePos.left:0,u=l[0]?l[0].y-n(t).scrollTop()-i.stagePos.top:0,f=function(t){var o=c.opts[t];if(n.isFunction(o)&&(o=o.apply(r,[c,e])),o)switch(o){case"close":r.close(i.startEvent);break;case"toggleControls":r.toggleControls();break;case"next":r.next();break;case"nextOrClose":r.group.length>1?r.next():r.close(i.startEvent);break;case"zoom":"image"==c.type&&(c.isLoaded||c.$ghost)&&(r.canPan()?r.scaleToFit():r.isScaledDown()?r.scaleToActual(d,u):r.group.length<2&&r.close(i.startEvent))}};if((!e.originalEvent||2!=e.originalEvent.button)&&(s.is("img")||!(d>s[0].clientWidth+s.offset().left))){if(s.is(".fancybox-bg,.fancybox-inner,.fancybox-outer,.fancybox-container"))o="Outside";else if(s.is(".fancybox-slide"))o="Slide";else{if(!r.current.$content||!r.current.$content.find(s).addBack().filter(s).length)return;o="Content"}if(i.tapped){if(clearTimeout(i.tapped),i.tapped=null,Math.abs(d-i.tapX)>50||Math.abs(u-i.tapY)>50)return this;f("dblclick"+o)}else i.tapX=d,i.tapY=u,c.opts["dblclick"+o]&&c.opts["dblclick"+o]!==c.opts["click"+o]?i.tapped=setTimeout(function(){i.tapped=null,r.isAnimating||f("click"+o)},500):f("click"+o);return this}},n(e).on("onActivate.fb",function(t,e){e&&!e.Guestures&&(e.Guestures=new d(e))}).on("beforeClose.fb",function(t,e){e&&e.Guestures&&e.Guestures.destroy()})}(window,document,jQuery),function(t,e){"use strict";e.extend(!0,e.fancybox.defaults,{btnTpl:{slideShow:'<button data-fancybox-play class="fancybox-button fancybox-button--play" title="{{PLAY_START}}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M6.5 5.4v13.2l11-6.6z"/></svg><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M8.33 5.75h2.2v12.5h-2.2V5.75zm5.15 0h2.2v12.5h-2.2V5.75z"/></svg></button>'},slideShow:{autoStart:!1,speed:3e3,progress:!0}});var n=function(t){this.instance=t,this.init()};e.extend(n.prototype,{timer:null,isActive:!1,$button:null,init:function(){var t=this,n=t.instance,o=n.group[n.currIndex].opts.slideShow;t.$button=n.$refs.toolbar.find("[data-fancybox-play]").on("click",function(){t.toggle()}),n.group.length<2||!o?t.$button.hide():o.progress&&(t.$progress=e('<div class="fancybox-progress"></div>').appendTo(n.$refs.inner))},set:function(t){var n=this,o=n.instance,i=o.current;i&&(!0===t||i.opts.loop||o.currIndex<o.group.length-1)?n.isActive&&"video"!==i.contentType&&(n.$progress&&e.fancybox.animate(n.$progress.show(),{scaleX:1},i.opts.slideShow.speed),n.timer=setTimeout(function(){o.current.opts.loop||o.current.index!=o.group.length-1?o.next():o.jumpTo(0)},i.opts.slideShow.speed)):(n.stop(),o.idleSecondsCounter=0,o.showControls())},clear:function(){var t=this;clearTimeout(t.timer),t.timer=null,t.$progress&&t.$progress.removeAttr("style").hide()},start:function(){var t=this,e=t.instance.current;e&&(t.$button.attr("title",(e.opts.i18n[e.opts.lang]||e.opts.i18n.en).PLAY_STOP).removeClass("fancybox-button--play").addClass("fancybox-button--pause"),t.isActive=!0,e.isComplete&&t.set(!0),t.instance.trigger("onSlideShowChange",!0))},stop:function(){var t=this,e=t.instance.current;t.clear(),t.$button.attr("title",(e.opts.i18n[e.opts.lang]||e.opts.i18n.en).PLAY_START).removeClass("fancybox-button--pause").addClass("fancybox-button--play"),t.isActive=!1,t.instance.trigger("onSlideShowChange",!1),t.$progress&&t.$progress.removeAttr("style").hide()},toggle:function(){var t=this;t.isActive?t.stop():t.start()}}),e(t).on({"onInit.fb":function(t,e){e&&!e.SlideShow&&(e.SlideShow=new n(e))},"beforeShow.fb":function(t,e,n,o){var i=e&&e.SlideShow;o?i&&n.opts.slideShow.autoStart&&i.start():i&&i.isActive&&i.clear()},"afterShow.fb":function(t,e,n){var o=e&&e.SlideShow;o&&o.isActive&&o.set()},"afterKeydown.fb":function(n,o,i,a,s){var r=o&&o.SlideShow;!r||!i.opts.slideShow||80!==s&&32!==s||e(t.activeElement).is("button,a,input")||(a.preventDefault(),r.toggle())},"beforeClose.fb onDeactivate.fb":function(t,e){var n=e&&e.SlideShow;n&&n.stop()}}),e(t).on("visibilitychange",function(){var n=e.fancybox.getInstance(),o=n&&n.SlideShow;o&&o.isActive&&(t.hidden?o.clear():o.set())})}(document,jQuery),function(t,e){"use strict";var n=function(){for(var e=[["requestFullscreen","exitFullscreen","fullscreenElement","fullscreenEnabled","fullscreenchange","fullscreenerror"],["webkitRequestFullscreen","webkitExitFullscreen","webkitFullscreenElement","webkitFullscreenEnabled","webkitfullscreenchange","webkitfullscreenerror"],["webkitRequestFullScreen","webkitCancelFullScreen","webkitCurrentFullScreenElement","webkitCancelFullScreen","webkitfullscreenchange","webkitfullscreenerror"],["mozRequestFullScreen","mozCancelFullScreen","mozFullScreenElement","mozFullScreenEnabled","mozfullscreenchange","mozfullscreenerror"],["msRequestFullscreen","msExitFullscreen","msFullscreenElement","msFullscreenEnabled","MSFullscreenChange","MSFullscreenError"]],n={},o=0;o<e.length;o++){var i=e[o];if(i&&i[1]in t){for(var a=0;a<i.length;a++)n[e[0][a]]=i[a];return n}}return!1}();if(n){var o={request:function(e){e=e||t.documentElement,e[n.requestFullscreen](e.ALLOW_KEYBOARD_INPUT)},exit:function(){t[n.exitFullscreen]()},toggle:function(e){e=e||t.documentElement,this.isFullscreen()?this.exit():this.request(e)},isFullscreen:function(){return Boolean(t[n.fullscreenElement])},enabled:function(){return Boolean(t[n.fullscreenEnabled])}};e.extend(!0,e.fancybox.defaults,{btnTpl:{fullScreen:'<button data-fancybox-fullscreen class="fancybox-button fancybox-button--fsenter" title="{{FULL_SCREEN}}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z"/></svg><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M5 16h3v3h2v-5H5zm3-8H5v2h5V5H8zm6 11h2v-3h3v-2h-5zm2-11V5h-2v5h5V8z"/></svg></button>'},fullScreen:{autoStart:!1}}),e(t).on(n.fullscreenchange,function(){var t=o.isFullscreen(),n=e.fancybox.getInstance();n&&(n.current&&"image"===n.current.type&&n.isAnimating&&(n.isAnimating=!1,n.update(!0,!0,0),n.isComplete||n.complete()),n.trigger("onFullscreenChange",t),n.$refs.container.toggleClass("fancybox-is-fullscreen",t),n.$refs.toolbar.find("[data-fancybox-fullscreen]").toggleClass("fancybox-button--fsenter",!t).toggleClass("fancybox-button--fsexit",t))})}e(t).on({"onInit.fb":function(t,e){var i;if(!n)return void e.$refs.toolbar.find("[data-fancybox-fullscreen]").remove();e&&e.group[e.currIndex].opts.fullScreen?(i=e.$refs.container,i.on("click.fb-fullscreen","[data-fancybox-fullscreen]",function(t){t.stopPropagation(),t.preventDefault(),o.toggle()}),e.opts.fullScreen&&!0===e.opts.fullScreen.autoStart&&o.request(),e.FullScreen=o):e&&e.$refs.toolbar.find("[data-fancybox-fullscreen]").hide()},"afterKeydown.fb":function(t,e,n,o,i){e&&e.FullScreen&&70===i&&(o.preventDefault(),e.FullScreen.toggle())},"beforeClose.fb":function(t,e){e&&e.FullScreen&&e.$refs.container.hasClass("fancybox-is-fullscreen")&&o.exit()}})}(document,jQuery),function(t,e){"use strict";var n="fancybox-thumbs";e.fancybox.defaults=e.extend(!0,{btnTpl:{thumbs:'<button data-fancybox-thumbs class="fancybox-button fancybox-button--thumbs" title="{{THUMBS}}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M14.59 14.59h3.76v3.76h-3.76v-3.76zm-4.47 0h3.76v3.76h-3.76v-3.76zm-4.47 0h3.76v3.76H5.65v-3.76zm8.94-4.47h3.76v3.76h-3.76v-3.76zm-4.47 0h3.76v3.76h-3.76v-3.76zm-4.47 0h3.76v3.76H5.65v-3.76zm8.94-4.47h3.76v3.76h-3.76V5.65zm-4.47 0h3.76v3.76h-3.76V5.65zm-4.47 0h3.76v3.76H5.65V5.65z"/></svg></button>'},thumbs:{autoStart:!1,hideOnClose:!0,parentEl:".fancybox-container",axis:"y"}},e.fancybox.defaults);var o=function(t){this.init(t)};e.extend(o.prototype,{$button:null,$grid:null,$list:null,isVisible:!1,isActive:!1,init:function(t){var e=this,n=t.group,o=0;e.instance=t,e.opts=n[t.currIndex].opts.thumbs,t.Thumbs=e,e.$button=t.$refs.toolbar.find("[data-fancybox-thumbs]");for(var i=0,a=n.length;i<a&&(n[i].thumb&&o++,!(o>1));i++);o>1&&e.opts?(e.$button.removeAttr("style").on("click",function(){e.toggle()}),e.isActive=!0):e.$button.hide()},create:function(){var t,o=this,i=o.instance,a=o.opts.parentEl,s=[];o.$grid||(o.$grid=e('<div class="'+n+" "+n+"-"+o.opts.axis+'"></div>').appendTo(i.$refs.container.find(a).addBack().filter(a)),o.$grid.on("click","a",function(){i.jumpTo(e(this).attr("data-index"))})),o.$list||(o.$list=e('<div class="'+n+'__list">').appendTo(o.$grid)),e.each(i.group,function(e,n){t=n.thumb,t||"image"!==n.type||(t=n.src),s.push('<a href="javascript:;" tabindex="0" data-index="'+e+'"'+(t&&t.length?' style="background-image:url('+t+')"':'class="fancybox-thumbs-missing"')+"></a>")}),o.$list[0].innerHTML=s.join(""),"x"===o.opts.axis&&o.$list.width(parseInt(o.$grid.css("padding-right"),10)+i.group.length*o.$list.children().eq(0).outerWidth(!0))},focus:function(t){var e,n,o=this,i=o.$list,a=o.$grid;o.instance.current&&(e=i.children().removeClass("fancybox-thumbs-active").filter('[data-index="'+o.instance.current.index+'"]').addClass("fancybox-thumbs-active"),n=e.position(),"y"===o.opts.axis&&(n.top<0||n.top>i.height()-e.outerHeight())?i.stop().animate({scrollTop:i.scrollTop()+n.top},t):"x"===o.opts.axis&&(n.left<a.scrollLeft()||n.left>a.scrollLeft()+(a.width()-e.outerWidth()))&&i.parent().stop().animate({scrollLeft:n.left},t))},update:function(){var t=this;t.instance.$refs.container.toggleClass("fancybox-show-thumbs",this.isVisible),t.isVisible?(t.$grid||t.create(),t.instance.trigger("onThumbsShow"),t.focus(0)):t.$grid&&t.instance.trigger("onThumbsHide"),t.instance.update()},hide:function(){this.isVisible=!1,this.update()},show:function(){this.isVisible=!0,this.update()},toggle:function(){this.isVisible=!this.isVisible,this.update()}}),e(t).on({"onInit.fb":function(t,e){var n;e&&!e.Thumbs&&(n=new o(e),n.isActive&&!0===n.opts.autoStart&&n.show())},"beforeShow.fb":function(t,e,n,o){var i=e&&e.Thumbs;i&&i.isVisible&&i.focus(o?0:250)},"afterKeydown.fb":function(t,e,n,o,i){var a=e&&e.Thumbs;a&&a.isActive&&71===i&&(o.preventDefault(),a.toggle())},"beforeClose.fb":function(t,e){var n=e&&e.Thumbs;n&&n.isVisible&&!1!==n.opts.hideOnClose&&n.$grid.hide()}})}(document,jQuery),function(t,e){"use strict";function n(t){var e={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#x2F;","`":"&#x60;","=":"&#x3D;"};return String(t).replace(/[&<>"'`=\/]/g,function(t){return e[t]})}e.extend(!0,e.fancybox.defaults,{btnTpl:{share:'<button data-fancybox-share class="fancybox-button fancybox-button--share" title="{{SHARE}}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M2.55 19c1.4-8.4 9.1-9.8 11.9-9.8V5l7 7-7 6.3v-3.5c-2.8 0-10.5 2.1-11.9 4.2z"/></svg></button>'},share:{url:function(t,e){return!t.currentHash&&"inline"!==e.type&&"html"!==e.type&&(e.origSrc||e.src)||window.location},
+tpl:'<div class="fancybox-share"><h1>{{SHARE}}</h1><p><a class="fancybox-share__button fancybox-share__button--fb" href="https://www.facebook.com/sharer/sharer.php?u={{url}}"><svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="m287 456v-299c0-21 6-35 35-35h38v-63c-7-1-29-3-55-3-54 0-91 33-91 94v306m143-254h-205v72h196" /></svg><span>Facebook</span></a><a class="fancybox-share__button fancybox-share__button--tw" href="https://twitter.com/intent/tweet?url={{url}}&text={{descr}}"><svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="m456 133c-14 7-31 11-47 13 17-10 30-27 37-46-15 10-34 16-52 20-61-62-157-7-141 75-68-3-129-35-169-85-22 37-11 86 26 109-13 0-26-4-37-9 0 39 28 72 65 80-12 3-25 4-37 2 10 33 41 57 77 57-42 30-77 38-122 34 170 111 378-32 359-208 16-11 30-25 41-42z" /></svg><span>Twitter</span></a><a class="fancybox-share__button fancybox-share__button--pt" href="https://www.pinterest.com/pin/create/button/?url={{url}}&description={{descr}}&media={{media}}"><svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="m265 56c-109 0-164 78-164 144 0 39 15 74 47 87 5 2 10 0 12-5l4-19c2-6 1-8-3-13-9-11-15-25-15-45 0-58 43-110 113-110 62 0 96 38 96 88 0 67-30 122-73 122-24 0-42-19-36-44 6-29 20-60 20-81 0-19-10-35-31-35-25 0-44 26-44 60 0 21 7 36 7 36l-30 125c-8 37-1 83 0 87 0 3 4 4 5 2 2-3 32-39 42-75l16-64c8 16 31 29 56 29 74 0 124-67 124-157 0-69-58-132-146-132z" fill="#fff"/></svg><span>Pinterest</span></a></p><p><input class="fancybox-share__input" type="text" value="{{url_raw}}" onclick="select()" /></p></div>'}}),e(t).on("click","[data-fancybox-share]",function(){var t,o,i=e.fancybox.getInstance(),a=i.current||null;a&&("function"===e.type(a.opts.share.url)&&(t=a.opts.share.url.apply(a,[i,a])),o=a.opts.share.tpl.replace(/\{\{media\}\}/g,"image"===a.type?encodeURIComponent(a.src):"").replace(/\{\{url\}\}/g,encodeURIComponent(t)).replace(/\{\{url_raw\}\}/g,n(t)).replace(/\{\{descr\}\}/g,i.$caption?encodeURIComponent(i.$caption.text()):""),e.fancybox.open({src:i.translate(i,o),type:"html",opts:{touch:!1,animationEffect:!1,afterLoad:function(t,e){i.$refs.container.one("beforeClose.fb",function(){t.close(null,0)}),e.$content.find(".fancybox-share__button").click(function(){return window.open(this.href,"Share","width=550, height=450"),!1})},mobile:{autoFocus:!1}}}))})}(document,jQuery),function(t,e,n){"use strict";function o(){var e=t.location.hash.substr(1),n=e.split("-"),o=n.length>1&&/^\+?\d+$/.test(n[n.length-1])?parseInt(n.pop(-1),10)||1:1,i=n.join("-");return{hash:e,index:o<1?1:o,gallery:i}}function i(t){""!==t.gallery&&n("[data-fancybox='"+n.escapeSelector(t.gallery)+"']").eq(t.index-1).focus().trigger("click.fb-start")}function a(t){var e,n;return!!t&&(e=t.current?t.current.opts:t.opts,""!==(n=e.hash||(e.$orig?e.$orig.data("fancybox")||e.$orig.data("fancybox-trigger"):""))&&n)}n.escapeSelector||(n.escapeSelector=function(t){return(t+"").replace(/([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g,function(t,e){return e?"\0"===t?"�":t.slice(0,-1)+"\\"+t.charCodeAt(t.length-1).toString(16)+" ":"\\"+t})}),n(function(){!1!==n.fancybox.defaults.hash&&(n(e).on({"onInit.fb":function(t,e){var n,i;!1!==e.group[e.currIndex].opts.hash&&(n=o(),(i=a(e))&&n.gallery&&i==n.gallery&&(e.currIndex=n.index-1))},"beforeShow.fb":function(n,o,i,s){var r;i&&!1!==i.opts.hash&&(r=a(o))&&(o.currentHash=r+(o.group.length>1?"-"+(i.index+1):""),t.location.hash!=="#"+o.currentHash&&(s&&!o.origHash&&(o.origHash=t.location.hash),o.hashTimer&&clearTimeout(o.hashTimer),o.hashTimer=setTimeout(function(){"replaceState"in t.history?(t.history[s?"pushState":"replaceState"]({},e.title,t.location.pathname+t.location.search+"#"+o.currentHash),s&&(o.hasCreatedHistory=!0)):t.location.hash=o.currentHash,o.hashTimer=null},300)))},"beforeClose.fb":function(n,o,i){i&&!1!==i.opts.hash&&(clearTimeout(o.hashTimer),o.currentHash&&o.hasCreatedHistory?t.history.back():o.currentHash&&("replaceState"in t.history?t.history.replaceState({},e.title,t.location.pathname+t.location.search+(o.origHash||"")):t.location.hash=o.origHash),o.currentHash=null)}}),n(t).on("hashchange.fb",function(){var t=o(),e=null;n.each(n(".fancybox-container").get().reverse(),function(t,o){var i=n(o).data("FancyBox");if(i&&i.currentHash)return e=i,!1}),e?e.currentHash===t.gallery+"-"+t.index||1===t.index&&e.currentHash==t.gallery||(e.currentHash=null,e.close()):""!==t.gallery&&i(t)}),setTimeout(function(){n.fancybox.getInstance()||i(o())},50))})}(window,document,jQuery),function(t,e){"use strict";var n=(new Date).getTime();e(t).on({"onInit.fb":function(t,e,o){e.$refs.stage.on("mousewheel DOMMouseScroll wheel MozMousePixelScroll",function(t){var o=e.current,i=(new Date).getTime();e.group.length<2||!1===o.opts.wheel||"auto"===o.opts.wheel&&"image"!==o.type||(t.preventDefault(),t.stopPropagation(),o.$slide.hasClass("fancybox-animated")||(t=t.originalEvent||t,i-n<250||(n=i,e[(-t.deltaY||-t.deltaX||t.wheelDelta||-t.detail)<0?"next":"previous"]())))})}})}(document,jQuery);
\ No newline at end of file
diff --git a/web/backend/resources/plugins/jsBarcode/JsBarcode.all.min.js b/web/backend/resources/plugins/jsBarcode/JsBarcode.all.min.js
new file mode 100644
index 000000000..289aa08d9
--- /dev/null
+++ b/web/backend/resources/plugins/jsBarcode/JsBarcode.all.min.js
@@ -0,0 +1,2 @@
+/*! JsBarcode v3.11.0 | (c) Johan Lindell | MIT license */
+!function(t){function e(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return t[r].call(o.exports,o,o.exports,e),o.l=!0,o.exports}var n={};e.m=t,e.c=n,e.i=function(t){return t},e.d=function(t,n,r){e.o(t,n)||Object.defineProperty(t,n,{configurable:!1,enumerable:!0,get:r})},e.n=function(t){var n=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(n,"a",n),n},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="",e(e.s=20)}([function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var o=function t(e,n){r(this,t),this.data=e,this.text=n.text||e,this.options=n};e.default=o},function(t,e,n){"use strict";function r(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}Object.defineProperty(e,"__esModule",{value:!0});var o,i=e.SET_A=0,u=e.SET_B=1,a=e.SET_C=2,f=(e.SHIFT=98,e.START_A=103),c=e.START_B=104,s=e.START_C=105;e.MODULO=103,e.STOP=106,e.FNC1=207,e.SET_BY_CODE=(o={},r(o,f,i),r(o,c,u),r(o,s,a),o),e.SWAP={101:i,100:u,99:a},e.A_START_CHAR=String.fromCharCode(208),e.B_START_CHAR=String.fromCharCode(209),e.C_START_CHAR=String.fromCharCode(210),e.A_CHARS="[\0-_È-Ï]",e.B_CHARS="[ -È-Ï]",e.C_CHARS="(Ï*[0-9]{2}Ï*)",e.BARS=[11011001100,11001101100,11001100110,10010011e3,10010001100,10001001100,10011001e3,10011000100,10001100100,11001001e3,11001000100,11000100100,10110011100,10011011100,10011001110,10111001100,10011101100,10011100110,11001110010,11001011100,11001001110,11011100100,11001110100,11101101110,11101001100,11100101100,11100100110,11101100100,11100110100,11100110010,11011011e3,11011000110,11000110110,10100011e3,10001011e3,10001000110,10110001e3,10001101e3,10001100010,11010001e3,11000101e3,11000100010,10110111e3,10110001110,10001101110,10111011e3,10111000110,10001110110,11101110110,11010001110,11000101110,11011101e3,11011100010,11011101110,11101011e3,11101000110,11100010110,11101101e3,11101100010,11100011010,11101111010,11001000010,11110001010,1010011e4,10100001100,1001011e4,10010000110,10000101100,10000100110,1011001e4,10110000100,1001101e4,10011000010,10000110100,10000110010,11000010010,1100101e4,11110111010,11000010100,10001111010,10100111100,10010111100,10010011110,10111100100,10011110100,10011110010,11110100100,11110010100,11110010010,11011011110,11011110110,11110110110,10101111e3,10100011110,10001011110,10111101e3,10111100010,11110101e3,11110100010,10111011110,10111101110,11101011110,11110101110,11010000100,1101001e4,11010011100,1100011101011]},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});e.SIDE_BIN="101",e.MIDDLE_BIN="01010",e.BINARIES={L:["0001101","0011001","0010011","0111101","0100011","0110001","0101111","0111011","0110111","0001011"],G:["0100111","0110011","0011011","0100001","0011101","0111001","0000101","0010001","0001001","0010111"],R:["1110010","1100110","1101100","1000010","1011100","1001110","1010000","1000100","1001000","1110100"],O:["0001101","0011001","0010011","0111101","0100011","0110001","0101111","0111011","0110111","0001011"],E:["0100111","0110011","0011011","0100001","0011101","0111001","0000101","0010001","0001001","0010111"]},e.EAN2_STRUCTURE=["LL","LG","GL","GG"],e.EAN5_STRUCTURE=["GGLLL","GLGLL","GLLGL","GLLLG","LGGLL","LLGGL","LLLGG","LGLGL","LGLLG","LLGLG"],e.EAN13_STRUCTURE=["LLLLLL","LLGLGG","LLGGLG","LLGGGL","LGLLGG","LGGLLG","LGGGLL","LGLGLG","LGLGGL","LGGLGL"]},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(2),o=function(t,e,n){var o=t.split("").map(function(t,n){return r.BINARIES[e[n]]}).map(function(e,n){return e?e[t[n]]:""});if(n){var i=t.length-1;o=o.map(function(t,e){return e<i?t+n:t})}return o.join("")};e.default=o},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function u(t,e){for(var n=0;n<e;n++)t="0"+t;return t}Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),f=n(0),c=function(t){return t&&t.__esModule?t:{default:t}}(f),s=function(t){function e(t,n){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n))}return i(e,t),a(e,[{key:"encode",value:function(){for(var t="110",e=0;e<this.data.length;e++){var n=parseInt(this.data[e]),r=n.toString(2);r=u(r,4-r.length);for(var o=0;o<r.length;o++)t+="0"==r[o]?"100":"110"}return t+="1001",{data:t,text:this.text}}},{key:"valid",value:function(){return-1!==this.data.search(/^[0-9]+$/)}}]),e}(c.default);e.default=s},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r])}return t};e.default=function(t,e){return r({},t,e)}},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=n(0),f=function(t){return t&&t.__esModule?t:{default:t}}(a),c=n(1),s=function(t){function e(t,n){r(this,e);var i=o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t.substring(1),n));return i.bytes=t.split("").map(function(t){return t.charCodeAt(0)}),i}return i(e,t),u(e,[{key:"valid",value:function(){return/^[\x00-\x7F\xC8-\xD3]+$/.test(this.data)}},{key:"encode",value:function(){var t=this.bytes,n=t.shift()-105,r=c.SET_BY_CODE[n];if(void 0===r)throw new RangeError("The encoding does not start with a start character.");!0===this.shouldEncodeAsEan128()&&t.unshift(c.FNC1);var o=e.next(t,1,r);return{text:this.text===this.data?this.text.replace(/[^\x20-\x7E]/g,""):this.text,data:e.getBar(n)+o.result+e.getBar((o.checksum+n)%c.MODULO)+e.getBar(c.STOP)}}},{key:"shouldEncodeAsEan128",value:function(){var t=this.options.ean128||!1;return"string"==typeof t&&(t="true"===t.toLowerCase()),t}}],[{key:"getBar",value:function(t){return c.BARS[t]?c.BARS[t].toString():""}},{key:"correctIndex",value:function(t,e){if(e===c.SET_A){var n=t.shift();return n<32?n+64:n-32}return e===c.SET_B?t.shift()-32:10*(t.shift()-48)+t.shift()-48}},{key:"next",value:function(t,n,r){if(!t.length)return{result:"",checksum:0};var o=void 0,i=void 0;if(t[0]>=200){i=t.shift()-105;var u=c.SWAP[i];void 0!==u?o=e.next(t,n+1,u):(r!==c.SET_A&&r!==c.SET_B||i!==c.SHIFT||(t[0]=r===c.SET_A?t[0]>95?t[0]-96:t[0]:t[0]<32?t[0]+96:t[0]),o=e.next(t,n+1,r))}else i=e.correctIndex(t,r),o=e.next(t,n+1,r);var a=e.getBar(i),f=i*n;return{result:a+o.result,checksum:f+o.checksum}}}]),e}(f.default);e.default=s},function(t,e,n){"use strict";function r(t){for(var e=0,n=0;n<t.length;n++){var r=parseInt(t[n]);(n+t.length)%2==0?e+=r:e+=2*r%10+Math.floor(2*r/10)}return(10-e%10)%10}function o(t){for(var e=0,n=[2,3,4,5,6,7],r=0;r<t.length;r++){e+=n[r%n.length]*parseInt(t[t.length-1-r])}return(11-e%11)%11}Object.defineProperty(e,"__esModule",{value:!0}),e.mod10=r,e.mod11=o},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var u=function(t){function e(t,n){r(this,e);var i=o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this));return i.name="InvalidInputException",i.symbology=t,i.input=n,i.message='"'+i.input+'" is not a valid input for '+i.symbology,i}return i(e,t),e}(Error),a=function(t){function e(){r(this,e);var t=o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this));return t.name="InvalidElementException",t.message="Not supported type to render on",t}return i(e,t),e}(Error),f=function(t){function e(){r(this,e);var t=o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this));return t.name="NoElementException",t.message="No element to render on.",t}return i(e,t),e}(Error);e.InvalidInputException=u,e.InvalidElementException=a,e.NoElementException=f},function(t,e,n){"use strict";function r(t){var e=["width","height","textMargin","fontSize","margin","marginTop","marginBottom","marginLeft","marginRight"];for(var n in e)e.hasOwnProperty(n)&&(n=e[n],"string"==typeof t[n]&&(t[n]=parseInt(t[n],10)));return"string"==typeof t.displayValue&&(t.displayValue="false"!=t.displayValue),t}Object.defineProperty(e,"__esModule",{value:!0}),e.default=r},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r={width:2,height:100,format:"auto",displayValue:!0,fontOptions:"",font:"monospace",text:void 0,textAlign:"center",textPosition:"bottom",textMargin:2,fontSize:20,background:"#ffffff",lineColor:"#000000",margin:10,marginTop:void 0,marginBottom:void 0,marginLeft:void 0,marginRight:void 0,valid:function(){}};e.default=r},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function u(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),f=n(2),c=n(3),s=r(c),l=n(0),p=r(l),d=function(t){function e(t,n){o(this,e);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return r.fontSize=!n.flat&&n.fontSize>10*n.width?10*n.width:n.fontSize,r.guardHeight=n.height+r.fontSize/2+n.textMargin,r}return u(e,t),a(e,[{key:"encode",value:function(){return this.options.flat?this.encodeFlat():this.encodeGuarded()}},{key:"leftText",value:function(t,e){return this.text.substr(t,e)}},{key:"leftEncode",value:function(t,e){return(0,s.default)(t,e)}},{key:"rightText",value:function(t,e){return this.text.substr(t,e)}},{key:"rightEncode",value:function(t,e){return(0,s.default)(t,e)}},{key:"encodeGuarded",value:function(){var t={fontSize:this.fontSize},e={height:this.guardHeight};return[{data:f.SIDE_BIN,options:e},{data:this.leftEncode(),text:this.leftText(),options:t},{data:f.MIDDLE_BIN,options:e},{data:this.rightEncode(),text:this.rightText(),options:t},{data:f.SIDE_BIN,options:e}]}},{key:"encodeFlat",value:function(){return{data:[f.SIDE_BIN,this.leftEncode(),f.MIDDLE_BIN,this.rightEncode(),f.SIDE_BIN].join(""),text:this.text}}}]),e}(p.default);e.default=d},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function u(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function a(t){var e,n=0;for(e=1;e<11;e+=2)n+=parseInt(t[e]);for(e=0;e<11;e+=2)n+=3*parseInt(t[e]);return(10-n%10)%10}Object.defineProperty(e,"__esModule",{value:!0});var f=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}();e.checksum=a;var c=n(3),s=r(c),l=n(0),p=r(l),d=function(t){function e(t,n){o(this,e),-1!==t.search(/^[0-9]{11}$/)&&(t+=a(t));var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return r.displayValue=n.displayValue,n.fontSize>10*n.width?r.fontSize=10*n.width:r.fontSize=n.fontSize,r.guardHeight=n.height+r.fontSize/2+n.textMargin,r}return u(e,t),f(e,[{key:"valid",value:function(){return-1!==this.data.search(/^[0-9]{12}$/)&&this.data[11]==a(this.data)}},{key:"encode",value:function(){return this.options.flat?this.flatEncoding():this.guardedEncoding()}},{key:"flatEncoding",value:function(){var t="";return t+="101",t+=(0,s.default)(this.data.substr(0,6),"LLLLLL"),t+="01010",t+=(0,s.default)(this.data.substr(6,6),"RRRRRR"),t+="101",{data:t,text:this.text}}},{key:"guardedEncoding",value:function(){var t=[];return this.displayValue&&t.push({data:"00000000",text:this.text.substr(0,1),options:{textAlign:"left",fontSize:this.fontSize}}),t.push({data:"101"+(0,s.default)(this.data[0],"L"),options:{height:this.guardHeight}}),t.push({data:(0,s.default)(this.data.substr(1,5),"LLLLL"),text:this.text.substr(1,5),options:{fontSize:this.fontSize}}),t.push({data:"01010",options:{height:this.guardHeight}}),t.push({data:(0,s.default)(this.data.substr(6,5),"RRRRR"),text:this.text.substr(6,5),options:{fontSize:this.fontSize}}),t.push({data:(0,s.default)(this.data[11],"R")+"101",options:{height:this.guardHeight}}),this.displayValue&&t.push({data:"00000000",text:this.text.substr(11,1),options:{textAlign:"right",fontSize:this.fontSize}}),t}}]),e}(p.default);e.default=d},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=n(36),f=n(0),c=function(t){return t&&t.__esModule?t:{default:t}}(f),s=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),u(e,[{key:"valid",value:function(){return-1!==this.data.search(/^([0-9]{2})+$/)}},{key:"encode",value:function(){var t=this,e=this.data.match(/.{2}/g).map(function(e){return t.encodePair(e)}).join("");return{data:a.START_BIN+e+a.END_BIN,text:this.text}}},{key:"encodePair",value:function(t){var e=a.BINARIES[t[1]];return a.BINARIES[t[0]].split("").map(function(t,n){return("1"===t?"111":"1")+("1"===e[n]?"000":"0")}).join("")}}]),e}(c.default);e.default=s},function(t,e,n){"use strict";function r(t,e){return e.height+(e.displayValue&&t.text.length>0?e.fontSize+e.textMargin:0)+e.marginTop+e.marginBottom}function o(t,e,n){if(n.displayValue&&e<t){if("center"==n.textAlign)return Math.floor((t-e)/2);if("left"==n.textAlign)return 0;if("right"==n.textAlign)return Math.floor(t-e)}return 0}function i(t,e,n){for(var i=0;i<t.length;i++){var u,a=t[i],c=(0,s.default)(e,a.options);u=c.displayValue?f(a.text,c,n):0;var l=a.data.length*c.width;a.width=Math.ceil(Math.max(u,l)),a.height=r(a,c),a.barcodePadding=o(u,l,c)}}function u(t){for(var e=0,n=0;n<t.length;n++)e+=t[n].width;return e}function a(t){for(var e=0,n=0;n<t.length;n++)t[n].height>e&&(e=t[n].height);return e}function f(t,e,n){var r;if(n)r=n;else{if("undefined"==typeof document)return 0;r=document.createElement("canvas").getContext("2d")}return r.font=e.fontOptions+" "+e.fontSize+"px "+e.font,r.measureText(t).width}Object.defineProperty(e,"__esModule",{value:!0}),e.getTotalWidthOfEncodings=e.calculateEncodingAttributes=e.getBarcodePadding=e.getEncodingHeight=e.getMaximumHeightOfEncodings=void 0;var c=n(5),s=function(t){return t&&t.__esModule?t:{default:t}}(c);e.getMaximumHeightOfEncodings=a,e.getEncodingHeight=r,e.getBarcodePadding=o,e.calculateEncodingAttributes=i,e.getTotalWidthOfEncodings=u},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(27),o=n(26),i=n(33),u=n(37),a=n(42),f=n(44),c=n(43),s=n(34);e.default={CODE39:r.CODE39,CODE128:o.CODE128,CODE128A:o.CODE128A,CODE128B:o.CODE128B,CODE128C:o.CODE128C,EAN13:i.EAN13,EAN8:i.EAN8,EAN5:i.EAN5,EAN2:i.EAN2,UPC:i.UPC,UPCE:i.UPCE,ITF14:u.ITF14,ITF:u.ITF,MSI:a.MSI,MSI10:a.MSI10,MSI11:a.MSI11,MSI1010:a.MSI1010,MSI1110:a.MSI1110,pharmacode:f.pharmacode,codabar:c.codabar,GenericBarcode:s.GenericBarcode}},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var o=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),i=function(){function t(e){r(this,t),this.api=e}return o(t,[{key:"handleCatch",value:function(t){if("InvalidInputException"!==t.name)throw t;if(this.api._options.valid===this.api._defaults.valid)throw t.message;this.api._options.valid(!1),this.api.render=function(){}}},{key:"wrapBarcodeCall",value:function(t){try{var e=t.apply(void 0,arguments);return this.api._options.valid(!0),e}catch(t){return this.handleCatch(t),this.api}}}]),t}();e.default=i},function(t,e,n){"use strict";function r(t){return t.marginTop=t.marginTop||t.margin,t.marginBottom=t.marginBottom||t.margin,t.marginRight=t.marginRight||t.margin,t.marginLeft=t.marginLeft||t.margin,t}Object.defineProperty(e,"__esModule",{value:!0}),e.default=r},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t){if("string"==typeof t)return i(t);if(Array.isArray(t)){for(var e=[],n=0;n<t.length;n++)e.push(o(t[n]));return e}if("undefined"!=typeof HTMLCanvasElement&&t instanceof HTMLImageElement)return u(t);if(t&&"svg"===t.nodeName||"undefined"!=typeof SVGElement&&t instanceof SVGElement)return{element:t,options:(0,c.default)(t),renderer:l.default.SVGRenderer};if("undefined"!=typeof HTMLCanvasElement&&t instanceof HTMLCanvasElement)return{element:t,options:(0,c.default)(t),renderer:l.default.CanvasRenderer};if(t&&t.getContext)return{element:t,renderer:l.default.CanvasRenderer};if(t&&"object"===(void 0===t?"undefined":a(t))&&!t.nodeName)return{element:t,renderer:l.default.ObjectRenderer};throw new p.InvalidElementException}function i(t){var e=document.querySelectorAll(t);if(0!==e.length){for(var n=[],r=0;r<e.length;r++)n.push(o(e[r]));return n}}function u(t){var e=document.createElement("canvas");return{element:e,options:(0,c.default)(t),renderer:l.default.CanvasRenderer,afterRender:function(){t.setAttribute("src",e.toDataURL())}}}Object.defineProperty(e,"__esModule",{value:!0});var a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},f=n(45),c=r(f),s=n(47),l=r(s),p=n(8);e.default=o},function(t,e,n){"use strict";function r(t){function e(t){if(Array.isArray(t))for(var r=0;r<t.length;r++)e(t[r]);else t.text=t.text||"",t.data=t.data||"",n.push(t)}var n=[];return e(t),n}Object.defineProperty(e,"__esModule",{value:!0}),e.default=r},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e,n){t=""+t;var r=new e(t,n);if(!r.valid())throw new E.InvalidInputException(r.constructor.name,t);var o=r.encode();o=(0,p.default)(o);for(var i=0;i<o.length;i++)o[i].options=(0,s.default)(n,o[i].options);return o}function i(){return f.default.CODE128?"CODE128":Object.keys(f.default)[0]}function u(t,e,n){e=(0,p.default)(e);for(var r=0;r<e.length;r++)e[r].options=(0,s.default)(n,e[r].options),(0,h.default)(e[r].options);(0,h.default)(n),new(0,t.renderer)(t.element,e,n).render(),t.afterRender&&t.afterRender()}var a=n(15),f=r(a),c=n(5),s=r(c),l=n(19),p=r(l),d=n(17),h=r(d),y=n(18),b=r(y),_=n(9),v=r(_),g=n(16),O=r(g),E=n(8),w=n(10),m=r(w),j=function(){},x=function(t,e,n){var r=new j;if(void 0===t)throw Error("No element to render on was provided.");return r._renderProperties=(0,b.default)(t),r._encodings=[],r._options=m.default,r._errorHandler=new O.default(r),void 0!==e&&(n=n||{},n.format||(n.format=i()),r.options(n)[n.format](e,n).render()),r};x.getModule=function(t){return f.default[t]};for(var P in f.default)f.default.hasOwnProperty(P)&&function(t,e){j.prototype[e]=j.prototype[e.toUpperCase()]=j.prototype[e.toLowerCase()]=function(n,r){var i=this;return i._errorHandler.wrapBarcodeCall(function(){r.text=void 0===r.text?void 0:""+r.text;var u=(0,s.default)(i._options,r);u=(0,v.default)(u);var a=t[e],f=o(n,a,u);return i._encodings.push(f),i})}}(f.default,P);j.prototype.options=function(t){return this._options=(0,s.default)(this._options,t),this},j.prototype.blank=function(t){var e=new Array(t+1).join("0");return this._encodings.push({data:e}),this},j.prototype.init=function(){if(this._renderProperties){Array.isArray(this._renderProperties)||(this._renderProperties=[this._renderProperties]);var t;for(var e in this._renderProperties){t=this._renderProperties[e];var n=(0,s.default)(this._options,t.options);"auto"==n.format&&(n.format=i()),this._errorHandler.wrapBarcodeCall(function(){var e=n.value,r=f.default[n.format.toUpperCase()],i=o(e,r,n);u(t,i,n)})}}},j.prototype.render=function(){if(!this._renderProperties)throw new E.NoElementException;if(Array.isArray(this._renderProperties))for(var t=0;t<this._renderProperties.length;t++)u(this._renderProperties[t],this._encodings,this._options);else u(this._renderProperties,this._encodings,this._options);return this},j.prototype._defaults=m.default,"undefined"!=typeof window&&(window.JsBarcode=x),"undefined"!=typeof jQuery&&(jQuery.fn.JsBarcode=function(t,e){var n=[];return jQuery(this).each(function(){n.push(this)}),x(n,t,e)}),t.exports=x},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=n(6),f=function(t){return t&&t.__esModule?t:{default:t}}(a),c=n(1),s=function(t){function e(t,n){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,c.A_START_CHAR+t,n))}return i(e,t),u(e,[{key:"valid",value:function(){return new RegExp("^"+c.A_CHARS+"+$").test(this.data)}}]),e}(f.default);e.default=s},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=n(6),f=function(t){return t&&t.__esModule?t:{default:t}}(a),c=n(1),s=function(t){function e(t,n){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,c.B_START_CHAR+t,n))}return i(e,t),u(e,[{key:"valid",value:function(){return new RegExp("^"+c.B_CHARS+"+$").test(this.data)}}]),e}(f.default);e.default=s},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=n(6),f=function(t){return t&&t.__esModule?t:{default:t}}(a),c=n(1),s=function(t){function e(t,n){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,c.C_START_CHAR+t,n))}return i(e,t),u(e,[{key:"valid",value:function(){return new RegExp("^"+c.C_CHARS+"+$").test(this.data)}}]),e}(f.default);e.default=s},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function u(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var a=n(6),f=r(a),c=n(25),s=r(c),l=function(t){function e(t,n){if(o(this,e),/^[\x00-\x7F\xC8-\xD3]+$/.test(t))var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,(0,s.default)(t),n));else var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return i(r)}return u(e,t),e}(f.default);e.default=l},function(t,e,n){"use strict";function r(t,e){var n=e?i.A_CHARS:i.B_CHARS,u=t.match(new RegExp("^("+n+"+?)(([0-9]{2}){2,})([^0-9]|$)"));if(u)return u[1]+String.fromCharCode(204)+o(t.substring(u[1].length));var a=t.match(new RegExp("^"+n+"+"))[0];return a.length===t.length?t:a+String.fromCharCode(e?205:206)+r(t.substring(a.length),!e)}function o(t){var e=f(t),n=e.length;if(n===t.length)return t;t=t.substring(n);var o=u(t)>=a(t);return e+String.fromCharCode(o?206:205)+r(t,o)}Object.defineProperty(e,"__esModule",{value:!0});var i=n(1),u=function(t){return t.match(new RegExp("^"+i.A_CHARS+"*"))[0].length},a=function(t){return t.match(new RegExp("^"+i.B_CHARS+"*"))[0].length},f=function(t){return t.match(new RegExp("^"+i.C_CHARS+"*"))[0]};e.default=function(t){var e=void 0;if(f(t).length>=2)e=i.C_START_CHAR+o(t);else{var n=u(t)>a(t);e=(n?i.A_START_CHAR:i.B_START_CHAR)+r(t,n)}return e.replace(/[\xCD\xCE]([^])[\xCD\xCE]/,function(t,e){return String.fromCharCode(203)+e})}},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}Object.defineProperty(e,"__esModule",{value:!0}),e.CODE128C=e.CODE128B=e.CODE128A=e.CODE128=void 0;var o=n(24),i=r(o),u=n(21),a=r(u),f=n(22),c=r(f),s=n(23),l=r(s);e.CODE128=i.default,e.CODE128A=a.default,e.CODE128B=c.default,e.CODE128C=l.default},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function u(t){return a(c(t))}function a(t){return b[t].toString(2)}function f(t){return y[t]}function c(t){return y.indexOf(t)}function s(t){for(var e=0,n=0;n<t.length;n++)e+=c(t[n]);return e%=43}Object.defineProperty(e,"__esModule",{value:!0}),e.CODE39=void 0;var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),p=n(0),d=function(t){return t&&t.__esModule?t:{default:t}}(p),h=function(t){function e(t,n){return r(this,e),t=t.toUpperCase(),n.mod43&&(t+=f(s(t))),o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n))}return i(e,t),l(e,[{key:"encode",value:function(){for(var t=u("*"),e=0;e<this.data.length;e++)t+=u(this.data[e])+"0";return t+=u("*"),{data:t,text:this.text}}},{key:"valid",value:function(){return-1!==this.data.search(/^[0-9A-Z\-\.\ \$\/\+\%]+$/)}}]),e}(d.default),y=["0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","-","."," ","$","/","+","%","*"],b=[20957,29783,23639,30485,20951,29813,23669,20855,29789,23645,29975,23831,30533,22295,30149,24005,21623,29981,23837,22301,30023,23879,30545,22343,30161,24017,21959,30065,23921,22385,29015,18263,29141,17879,29045,18293,17783,29021,18269,17477,17489,17681,20753,35770];e.CODE39=h},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var u=o.get;if(void 0!==u)return u.call(r)},f=n(2),c=n(11),s=function(t){return t&&t.__esModule?t:{default:t}}(c),l=function(t){return(10-t.substr(0,12).split("").map(function(t){return+t}).reduce(function(t,e,n){return n%2?t+3*e:t+e},0)%10)%10},p=function(t){function e(t,n){r(this,e),-1!==t.search(/^[0-9]{12}$/)&&(t+=l(t));var i=o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return i.lastChar=n.lastChar,i}return i(e,t),u(e,[{key:"valid",value:function(){return-1!==this.data.search(/^[0-9]{13}$/)&&+this.data[12]===l(this.data)}},{key:"leftText",value:function(){return a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"leftText",this).call(this,1,6)}},{key:"leftEncode",value:function(){var t=this.data.substr(1,6),n=f.EAN13_STRUCTURE[this.data[0]];return a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"leftEncode",this).call(this,t,n)}},{key:"rightText",value:function(){return a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"rightText",this).call(this,7,6)}},{key:"rightEncode",value:function(){var t=this.data.substr(7,6);return a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"rightEncode",this).call(this,t,"RRRRRR")}},{key:"encodeGuarded",value:function(){var t=a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"encodeGuarded",this).call(this);return this.options.displayValue&&(t.unshift({data:"000000000000",text:this.text.substr(0,1),options:{textAlign:"left",fontSize:this.fontSize}}),this.options.lastChar&&(t.push({data:"00"}),t.push({data:"00000",text:this.options.lastChar,options:{fontSize:this.fontSize}}))),t}}]),e}(s.default);e.default=p},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function u(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),f=n(2),c=n(3),s=r(c),l=n(0),p=r(l),d=function(t){function e(t,n){return o(this,e),i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n))}return u(e,t),a(e,[{key:"valid",value:function(){return-1!==this.data.search(/^[0-9]{2}$/)}},{key:"encode",value:function(){var t=f.EAN2_STRUCTURE[parseInt(this.data)%4];return{data:"1011"+(0,s.default)(this.data,t,"01"),text:this.text}}}]),e}(p.default);e.default=d},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function u(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),f=n(2),c=n(3),s=r(c),l=n(0),p=r(l),d=function(t){return t.split("").map(function(t){return+t}).reduce(function(t,e,n){return n%2?t+9*e:t+3*e},0)%10},h=function(t){function e(t,n){return o(this,e),i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n))}return u(e,t),a(e,[{key:"valid",value:function(){return-1!==this.data.search(/^[0-9]{5}$/)}},{key:"encode",value:function(){var t=f.EAN5_STRUCTURE[d(this.data)];return{data:"1011"+(0,s.default)(this.data,t,"01"),text:this.text}}}]),e}(p.default);e.default=h},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var u=o.get;if(void 0!==u)return u.call(r)},f=n(11),c=function(t){return t&&t.__esModule?t:{default:t}}(f),s=function(t){return(10-t.substr(0,7).split("").map(function(t){return+t}).reduce(function(t,e,n){return n%2?t+e:t+3*e},0)%10)%10},l=function(t){function e(t,n){return r(this,e),-1!==t.search(/^[0-9]{7}$/)&&(t+=s(t)),o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n))}return i(e,t),u(e,[{key:"valid",value:function(){return-1!==this.data.search(/^[0-9]{8}$/)&&+this.data[7]===s(this.data)}},{key:"leftText",value:function(){return a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"leftText",this).call(this,0,4)}},{key:"leftEncode",value:function(){var t=this.data.substr(0,4);return a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"leftEncode",this).call(this,t,"LLLL")}},{key:"rightText",value:function(){return a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"rightText",this).call(this,4,4)}},{key:"rightEncode",value:function(){var t=this.data.substr(4,4);return a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"rightEncode",this).call(this,t,"RRRR")}}]),e}(c.default);e.default=l},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function u(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function a(t,e){for(var n=parseInt(t[t.length-1]),r=h[n],o="",i=0,u=0;u<r.length;u++){var a=r[u];o+="X"===a?t[i++]:a}return""+(o=""+e+o)+(0,d.checksum)(o)}Object.defineProperty(e,"__esModule",{value:!0});var f=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),c=n(3),s=r(c),l=n(0),p=r(l),d=n(12),h=["XX00000XXX","XX10000XXX","XX20000XXX","XXX00000XX","XXXX00000X","XXXXX00005","XXXXX00006","XXXXX00007","XXXXX00008","XXXXX00009"],y=[["EEEOOO","OOOEEE"],["EEOEOO","OOEOEE"],["EEOOEO","OOEEOE"],["EEOOOE","OOEEEO"],["EOEEOO","OEOOEE"],["EOOEEO","OEEOOE"],["EOOOEE","OEEEOO"],["EOEOEO","OEOEOE"],["EOEOOE","OEOEEO"],["EOOEOE","OEEOEO"]],b=function(t){function e(t,n){o(this,e);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));if(r.isValid=!1,-1!==t.search(/^[0-9]{6}$/))r.middleDigits=t,r.upcA=a(t,"0"),r.text=n.text||""+r.upcA[0]+t+r.upcA[r.upcA.length-1],r.isValid=!0;else{if(-1===t.search(/^[01][0-9]{7}$/))return i(r);if(r.middleDigits=t.substring(1,t.length-1),r.upcA=a(r.middleDigits,t[0]),r.upcA[r.upcA.length-1]!==t[t.length-1])return i(r);r.isValid=!0}return r.displayValue=n.displayValue,n.fontSize>10*n.width?r.fontSize=10*n.width:r.fontSize=n.fontSize,r.guardHeight=n.height+r.fontSize/2+n.textMargin,r}return u(e,t),f(e,[{key:"valid",value:function(){return this.isValid}},{key:"encode",value:function(){return this.options.flat?this.flatEncoding():this.guardedEncoding()}},{key:"flatEncoding",value:function(){var t="";return t+="101",t+=this.encodeMiddleDigits(),t+="010101",{data:t,text:this.text}}},{key:"guardedEncoding",value:function(){var t=[];return this.displayValue&&t.push({data:"00000000",text:this.text[0],options:{textAlign:"left",fontSize:this.fontSize}}),t.push({data:"101",options:{height:this.guardHeight}}),t.push({data:this.encodeMiddleDigits(),text:this.text.substring(1,7),options:{fontSize:this.fontSize}}),t.push({data:"010101",options:{height:this.guardHeight}}),this.displayValue&&t.push({data:"00000000",text:this.text[7],options:{textAlign:"right",fontSize:this.fontSize}}),t}},{key:"encodeMiddleDigits",value:function(){var t=this.upcA[0],e=this.upcA[this.upcA.length-1],n=y[parseInt(e)][parseInt(t)];return(0,s.default)(this.middleDigits,n)}}]),e}(p.default);e.default=b},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}Object.defineProperty(e,"__esModule",{value:!0}),e.UPCE=e.UPC=e.EAN2=e.EAN5=e.EAN8=e.EAN13=void 0;var o=n(28),i=r(o),u=n(31),a=r(u),f=n(30),c=r(f),s=n(29),l=r(s),p=n(12),d=r(p),h=n(32),y=r(h);e.EAN13=i.default,e.EAN8=a.default,e.EAN5=c.default,e.EAN2=l.default,e.UPC=d.default,e.UPCE=y.default},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0}),e.GenericBarcode=void 0;var u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=n(0),f=function(t){return t&&t.__esModule?t:{default:t}}(a),c=function(t){function e(t,n){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n))}return i(e,t),u(e,[{key:"encode",value:function(){return{data:"10101010101010101010101010101010101010101",text:this.text}}},{key:"valid",value:function(){return!0}}]),e}(f.default);e.GenericBarcode=c},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=n(13),f=function(t){return t&&t.__esModule?t:{default:t}}(a),c=function(t){var e=t.substr(0,13).split("").map(function(t){return parseInt(t,10)}).reduce(function(t,e,n){return t+e*(3-n%2*2)},0);return 10*Math.ceil(e/10)-e},s=function(t){function e(t,n){return r(this,e),-1!==t.search(/^[0-9]{13}$/)&&(t+=c(t)),o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n))}return i(e,t),u(e,[{key:"valid",value:function(){return-1!==this.data.search(/^[0-9]{14}$/)&&+this.data[13]===c(this.data)}}]),e}(f.default);e.default=s},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});e.START_BIN="1010",e.END_BIN="11101",e.BINARIES=["00110","10001","01001","11000","00101","10100","01100","00011","10010","01010"]},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}Object.defineProperty(e,"__esModule",{value:!0}),e.ITF14=e.ITF=void 0;var o=n(13),i=r(o),u=n(35),a=r(u);e.ITF=i.default,e.ITF14=a.default},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var u=n(4),a=function(t){return t&&t.__esModule?t:{default:t}}(u),f=n(7),c=function(t){function e(t,n){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t+(0,f.mod10)(t),n))}return i(e,t),e}(a.default);e.default=c},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var u=n(4),a=function(t){return t&&t.__esModule?t:{default:t}}(u),f=n(7),c=function(t){function e(t,n){return r(this,e),t+=(0,f.mod10)(t),t+=(0,f.mod10)(t),o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n))}return i(e,t),e}(a.default);e.default=c},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var u=n(4),a=function(t){return t&&t.__esModule?t:{default:t}}(u),f=n(7),c=function(t){function e(t,n){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t+(0,f.mod11)(t),n))}return i(e,t),e}(a.default);e.default=c},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var u=n(4),a=function(t){return t&&t.__esModule?t:{default:t}}(u),f=n(7),c=function(t){function e(t,n){return r(this,e),t+=(0,f.mod11)(t),t+=(0,f.mod10)(t),o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n))}return i(e,t),e}(a.default);e.default=c},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}Object.defineProperty(e,"__esModule",{value:!0}),e.MSI1110=e.MSI1010=e.MSI11=e.MSI10=e.MSI=void 0;var o=n(4),i=r(o),u=n(38),a=r(u),f=n(40),c=r(f),s=n(39),l=r(s),p=n(41),d=r(p);e.MSI=i.default,e.MSI10=a.default,e.MSI11=c.default,e.MSI1010=l.default,e.MSI1110=d.default},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0}),e.codabar=void 0;var u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=n(0),f=function(t){return t&&t.__esModule?t:{default:t}}(a),c=function(t){function e(t,n){r(this,e),0===t.search(/^[0-9\-\$\:\.\+\/]+$/)&&(t="A"+t+"A");var i=o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t.toUpperCase(),n));return i.text=i.options.text||i.text.replace(/[A-D]/g,""),i}return i(e,t),u(e,[{key:"valid",value:function(){return-1!==this.data.search(/^[A-D][0-9\-\$\:\.\+\/]+[A-D]$/)}},{key:"encode",value:function(){for(var t=[],e=this.getEncodings(),n=0;n<this.data.length;n++)t.push(e[this.data.charAt(n)]),n!==this.data.length-1&&t.push("0");return{text:this.text,data:t.join("")}}},{key:"getEncodings",value:function(){return{0:"101010011",1:"101011001",2:"101001011",3:"110010101",4:"101101001",5:"110101001",6:"100101011",7:"100101101",8:"100110101",9:"110100101","-":"101001101",$:"101100101",":":"1101011011","/":"1101101011",".":"1101101101","+":"101100110011",A:"1011001001",B:"1001001011",C:"1010010011",D:"1010011001"}}}]),e}(f.default);e.codabar=c},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0}),e.pharmacode=void 0;var u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=n(0),f=function(t){return t&&t.__esModule?t:{default:t}}(a),c=function(t){function e(t,n){r(this,e);var i=o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return i.number=parseInt(t,10),i}return i(e,t),u(e,[{key:"encode",value:function(){for(var t=this.number,e="";!isNaN(t)&&0!=t;)t%2==0?(e="11100"+e,t=(t-2)/2):(e="100"+e,t=(t-1)/2);return e=e.slice(0,-2),{data:e,text:this.text}}},{key:"valid",value:function(){return this.number>=3&&this.number<=131070}}]),e}(f.default);e.pharmacode=c},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t){var e={};for(var n in f.default)f.default.hasOwnProperty(n)&&(t.hasAttribute("jsbarcode-"+n.toLowerCase())&&(e[n]=t.getAttribute("jsbarcode-"+n.toLowerCase())),t.hasAttribute("data-"+n.toLowerCase())&&(e[n]=t.getAttribute("data-"+n.toLowerCase())));return e.value=t.getAttribute("jsbarcode-value")||t.getAttribute("data-value"),e=(0,u.default)(e)}Object.defineProperty(e,"__esModule",{value:!0});var i=n(9),u=r(i),a=n(10),f=r(a);e.default=o},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var o=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),i=n(5),u=function(t){return t&&t.__esModule?t:{default:t}}(i),a=n(14),f=function(){function t(e,n,o){r(this,t),this.canvas=e,this.encodings=n,this.options=o}return o(t,[{key:"render",value:function(){if(!this.canvas.getContext)throw new Error("The browser does not support canvas.");this.prepareCanvas();for(var t=0;t<this.encodings.length;t++){var e=(0,u.default)(this.options,this.encodings[t].options);this.drawCanvasBarcode(e,this.encodings[t]),this.drawCanvasText(e,this.encodings[t]),this.moveCanvasDrawing(this.encodings[t])}this.restoreCanvas()}},{key:"prepareCanvas",value:function(){var t=this.canvas.getContext("2d");t.save(),(0,a.calculateEncodingAttributes)(this.encodings,this.options,t);var e=(0,a.getTotalWidthOfEncodings)(this.encodings),n=(0,a.getMaximumHeightOfEncodings)(this.encodings);this.canvas.width=e+this.options.marginLeft+this.options.marginRight,this.canvas.height=n,t.clearRect(0,0,this.canvas.width,this.canvas.height),this.options.background&&(t.fillStyle=this.options.background,t.fillRect(0,0,this.canvas.width,this.canvas.height)),t.translate(this.options.marginLeft,0)}},{key:"drawCanvasBarcode",value:function(t,e){var n,r=this.canvas.getContext("2d"),o=e.data;n="top"==t.textPosition?t.marginTop+t.fontSize+t.textMargin:t.marginTop,r.fillStyle=t.lineColor;for(var i=0;i<o.length;i++){var u=i*t.width+e.barcodePadding;"1"===o[i]?r.fillRect(u,n,t.width,t.height):o[i]&&r.fillRect(u,n,t.width,t.height*o[i])}}},{key:"drawCanvasText",value:function(t,e){var n=this.canvas.getContext("2d"),r=t.fontOptions+" "+t.fontSize+"px "+t.font;if(t.displayValue){var o,i;i="top"==t.textPosition?t.marginTop+t.fontSize-t.textMargin:t.height+t.textMargin+t.marginTop+t.fontSize,n.font=r,"left"==t.textAlign||e.barcodePadding>0?(o=0,n.textAlign="left"):"right"==t.textAlign?(o=e.width-1,n.textAlign="right"):(o=e.width/2,n.textAlign="center"),n.fillText(e.text,o,i)}}},{key:"moveCanvasDrawing",value:function(t){this.canvas.getContext("2d").translate(t.width,0)}},{key:"restoreCanvas",value:function(){this.canvas.getContext("2d").restore()}}]),t}();e.default=f},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}Object.defineProperty(e,"__esModule",{value:!0});var o=n(46),i=r(o),u=n(49),a=r(u),f=n(48),c=r(f);e.default={CanvasRenderer:i.default,SVGRenderer:a.default,ObjectRenderer:c.default}},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var o=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),i=function(){function t(e,n,o){r(this,t),this.object=e,this.encodings=n,this.options=o}return o(t,[{key:"render",value:function(){this.object.encodings=this.encodings}}]),t}();e.default=i},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var o=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),i=n(5),u=function(t){return t&&t.__esModule?t:{default:t}}(i),a=n(14),f="http://www.w3.org/2000/svg",c=function(){function t(e,n,o){r(this,t),this.svg=e,this.encodings=n,this.options=o,this.document=o.xmlDocument||document}return o(t,[{key:"render",value:function(){var t=this.options.marginLeft;this.prepareSVG();for(var e=0;e<this.encodings.length;e++){var n=this.encodings[e],r=(0,u.default)(this.options,n.options),o=this.createGroup(t,r.marginTop,this.svg);this.setGroupOptions(o,r),this.drawSvgBarcode(o,r,n),this.drawSVGText(o,r,n),t+=n.width}}},{key:"prepareSVG",value:function(){for(;this.svg.firstChild;)this.svg.removeChild(this.svg.firstChild);(0,a.calculateEncodingAttributes)(this.encodings,this.options);var t=(0,a.getTotalWidthOfEncodings)(this.encodings),e=(0,a.getMaximumHeightOfEncodings)(this.encodings),n=t+this.options.marginLeft+this.options.marginRight;this.setSvgAttributes(n,e),this.options.background&&this.drawRect(0,0,n,e,this.svg).setAttribute("style","fill:"+this.options.background+";")}},{key:"drawSvgBarcode",value:function(t,e,n){var r,o=n.data;r="top"==e.textPosition?e.fontSize+e.textMargin:0;for(var i=0,u=0,a=0;a<o.length;a++)u=a*e.width+n.barcodePadding,"1"===o[a]?i++:i>0&&(this.drawRect(u-e.width*i,r,e.width*i,e.height,t),i=0);i>0&&this.drawRect(u-e.width*(i-1),r,e.width*i,e.height,t)}},{key:"drawSVGText",value:function(t,e,n){var r=this.document.createElementNS(f,"text");if(e.displayValue){var o,i;r.setAttribute("style","font:"+e.fontOptions+" "+e.fontSize+"px "+e.font),i="top"==e.textPosition?e.fontSize-e.textMargin:e.height+e.textMargin+e.fontSize,"left"==e.textAlign||n.barcodePadding>0?(o=0,r.setAttribute("text-anchor","start")):"right"==e.textAlign?(o=n.width-1,r.setAttribute("text-anchor","end")):(o=n.width/2,r.setAttribute("text-anchor","middle")),r.setAttribute("x",o),r.setAttribute("y",i),r.appendChild(this.document.createTextNode(n.text)),t.appendChild(r)}}},{key:"setSvgAttributes",value:function(t,e){var n=this.svg;n.setAttribute("width",t+"px"),n.setAttribute("height",e+"px"),n.setAttribute("x","0px"),n.setAttribute("y","0px"),n.setAttribute("viewBox","0 0 "+t+" "+e),n.setAttribute("xmlns",f),n.setAttribute("version","1.1"),n.setAttribute("style","transform: translate(0,0)")}},{key:"createGroup",value:function(t,e,n){var r=this.document.createElementNS(f,"g");return r.setAttribute("transform","translate("+t+", "+e+")"),n.appendChild(r),r}},{key:"setGroupOptions",value:function(t,e){t.setAttribute("style","fill:"+e.lineColor+";")}},{key:"drawRect",value:function(t,e,n,r,o){var i=this.document.createElementNS(f,"rect");return i.setAttribute("x",t),i.setAttribute("y",e),i.setAttribute("width",n),i.setAttribute("height",r),o.appendChild(i),i}}]),t}();e.default=c}]);
\ No newline at end of file